File tree Expand file tree Collapse file tree 7 files changed +69
-100
lines changed
ManipulationHandler/Scripts
Extensions/HandPhysicsService/Examples Expand file tree Collapse file tree 7 files changed +69
-100
lines changed Original file line number Diff line number Diff line change @@ -69,7 +69,7 @@ public static void SaveSettings(string spatializer)
69
69
{
70
70
if ( string . IsNullOrWhiteSpace ( spatializer ) )
71
71
{
72
- Debug . LogWarning ( "No spatializer was specified. The application will not support Spatial Sound." ) ;
72
+ Debug . Log ( "No spatializer was specified. The application will not support Spatial Sound." ) ;
73
73
}
74
74
else if ( ! InstalledSpatializers . Contains ( spatializer ) )
75
75
{
Original file line number Diff line number Diff line change @@ -170,13 +170,21 @@ public static GltfObject GetGltfObjectFromJson(string jsonString)
170
170
171
171
if ( gltfObject . extensionsRequired ? . Length > 0 )
172
172
{
173
- Debug . LogError ( $ "Required Extension Unsupported: { gltfObject . extensionsRequired [ 0 ] } ") ;
173
+ Debug . LogError ( "One or more unsupported glTF extensions required. Unable to load the model." ) ;
174
+ for ( int i = 0 ; i < gltfObject . extensionsRequired . Length ; ++ i )
175
+ {
176
+ Debug . Log ( $ "Extension: { gltfObject . extensionsRequired [ i ] } ") ;
177
+ }
174
178
return null ;
175
179
}
176
180
177
- for ( int i = 0 ; i < gltfObject . extensionsUsed ? . Length ; i ++ )
181
+ if ( gltfObject . extensionsUsed ? . Length > 0 )
178
182
{
179
- Debug . LogWarning ( $ "Unsupported Extension: { gltfObject . extensionsUsed [ i ] } ") ;
183
+ Debug . Log ( "One or more unsupported glTF extensions in use, ignoring them." ) ;
184
+ for ( int i = 0 ; i < gltfObject . extensionsUsed . Length ; ++ i )
185
+ {
186
+ Debug . Log ( $ "Extension: { gltfObject . extensionsUsed [ i ] } ") ;
187
+ }
180
188
}
181
189
182
190
var meshPrimitiveAttributes = GetGltfMeshPrimitiveAttributes ( jsonString ) ;
@@ -452,4 +460,4 @@ private class StringIntKeyValueArray
452
460
}
453
461
454
462
}
455
- }
463
+ }
Original file line number Diff line number Diff line change @@ -64,6 +64,7 @@ private IEnumerator Sequence()
64
64
bbox = cube . AddComponent < BoundingBox > ( ) ;
65
65
bbox . HideElementsInInspector = false ;
66
66
bbox . BoundingBoxActivation = BoundingBox . BoundingBoxActivationType . ActivateOnStart ;
67
+ var cm = cube . AddComponent < ConstraintManager > ( ) ;
67
68
var om = cube . AddComponent < ObjectManipulator > ( ) ;
68
69
yield return WaitForSpeechCommand ( ) ;
69
70
@@ -197,6 +198,7 @@ private IEnumerator Sequence()
197
198
bbox . BoundingBoxActivation = BoundingBox . BoundingBoxActivationType . ActivateOnStart ;
198
199
bbox . HideElementsInInspector = false ;
199
200
bbox . WireframeEdgeRadius = .05f ;
201
+ multiRoot . AddComponent < ConstraintManager > ( ) ;
200
202
multiRoot . AddComponent < ObjectManipulator > ( ) ;
201
203
202
204
SetStatus ( "Randomize Child Scale for skewing" ) ;
Original file line number Diff line number Diff line change @@ -68,6 +68,7 @@ private IEnumerator Sequence()
68
68
boundsControl = cube . AddComponent < BoundsControl > ( ) ;
69
69
boundsControl . HideElementsInInspector = false ;
70
70
boundsControl . BoundsControlActivation = BoundsControlActivationType . ActivateOnStart ;
71
+ var cm = cube . AddComponent < ConstraintManager > ( ) ;
71
72
var om = cube . AddComponent < ObjectManipulator > ( ) ;
72
73
yield return WaitForSpeechCommand ( ) ;
73
74
@@ -200,6 +201,7 @@ private IEnumerator Sequence()
200
201
boundsControl . BoundsControlActivation = BoundsControlActivationType . ActivateOnStart ;
201
202
boundsControl . HideElementsInInspector = false ;
202
203
boundsControl . LinksConfig . WireframeEdgeRadius = .05f ;
204
+ multiRoot . AddComponent < ConstraintManager > ( ) ;
203
205
multiRoot . AddComponent < ObjectManipulator > ( ) ;
204
206
205
207
SetStatus ( "Randomize Child Scale for skewing" ) ;
Original file line number Diff line number Diff line change @@ -38,6 +38,7 @@ public void TryStopManipulation()
38
38
return ;
39
39
}
40
40
41
+ manipulatedObject . GetComponent < ConstraintManager > ( ) ;
41
42
var manipulationHandler = manipulatedObject . GetComponent < ManipulationHandler > ( ) ;
42
43
var objectManipulator = manipulatedObject . GetComponent < ObjectManipulator > ( ) ;
43
44
if ( manipulationHandler != null || objectManipulator != null )
You can’t perform that action at this time.
0 commit comments