Merge pull request #400 from NVlabs/SampleModelsUpdate

Add cylinder to targetmodels renamed sample
NVlabs · Nov 30, 2022 · 7a73733 · 7a73733
2 parents b787b50 + 02d74c0
commit 7a73733
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/data-files/samples/spheres.Experiment.Any → ...files/samples/targetmodels.Experiment.Any b/data-files/samples/spheres.Experiment.Any → ...files/samples/targetmodels.Experiment.Any
@@ -1,5 +1,5 @@
 { 
-    description = "spheres"; 
+    description = "targetmodels"; 
     frameRate = 120; 
     showHUD = true;
     renderWeaponStatus = true;
@@ -56,14 +56,25 @@
                 } 
             ); 
 
+        }, 
+        { 
+            id = "cylinder"; 
+            description = "cylinder"; 
+            trials = ( 
+                { 
+                    count = 20; 
+                    ids = ( "cylinder", "cylinder"); 
+                } 
+            ); 
+
         }, 
         { 
             id = "mixedtypes"; 
             description = "mixed types"; 
             trials = ( 
                 { 
                     count = 20; 
-                    ids = ( "ico", "low", "mid", "high");
+                    ids = ( "ico", "low", "mid", "high", "cylinder");
                 }, 
             ); 
 
@@ -108,6 +119,15 @@
             //     filename = "model/target/high_poly_sphere.obj";
             // };
         }, 
+        {
+            id = "cylinder"; 
+            destSpace = "player"; 
+            speed = ( 0, 0 ); 
+            visualSize = ( 0.05, 0.05 ); 
+            modelSpec = ArticulatedModel::Specification{
+                filename = "model/target/cylinder.obj";
+            },
+        }, 
     ); 
 
 } 
diff --git a/data-files/samples/spheres.Status.Any → data-files/samples/targetmodels.Status.Any b/data-files/samples/spheres.Status.Any → data-files/samples/targetmodels.Status.Any
@@ -1,11 +1,11 @@
 { 
     currentUser = "Sample User"; 
-    sessions = ( "mixedtypes", "icosohedron", "lowpoly", "midpoly", "highpoly"); 
+    sessions = ( "mixedtypes", "icosohedron", "lowpoly", "midpoly", "highpoly", "cylinder"); 
     settingsVersion = 1; 
     users = ( 
         { 
             id = "Sample User"; 
-            sessions = ( "mixedtypes", "icosohedron", "lowpoly", "midpoly", "highpoly"); 
+            sessions = ( "mixedtypes", "icosohedron", "lowpoly", "midpoly", "highpoly", "cylinder"); 
         } ); 
 
 }