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)
6969 {
7070 if ( string . IsNullOrWhiteSpace ( spatializer ) )
7171 {
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." ) ;
7373 }
7474 else if ( ! InstalledSpatializers . Contains ( spatializer ) )
7575 {
Original file line number Diff line number Diff line change @@ -170,13 +170,21 @@ public static GltfObject GetGltfObjectFromJson(string jsonString)
170170
171171 if ( gltfObject . extensionsRequired ? . Length > 0 )
172172 {
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+ }
174178 return null ;
175179 }
176180
177- for ( int i = 0 ; i < gltfObject . extensionsUsed ? . Length ; i ++ )
181+ if ( gltfObject . extensionsUsed ? . Length > 0 )
178182 {
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+ }
180188 }
181189
182190 var meshPrimitiveAttributes = GetGltfMeshPrimitiveAttributes ( jsonString ) ;
@@ -452,4 +460,4 @@ private class StringIntKeyValueArray
452460 }
453461
454462 }
455- }
463+ }
Original file line number Diff line number Diff line change @@ -64,6 +64,7 @@ private IEnumerator Sequence()
6464 bbox = cube . AddComponent < BoundingBox > ( ) ;
6565 bbox . HideElementsInInspector = false ;
6666 bbox . BoundingBoxActivation = BoundingBox . BoundingBoxActivationType . ActivateOnStart ;
67+ var cm = cube . AddComponent < ConstraintManager > ( ) ;
6768 var om = cube . AddComponent < ObjectManipulator > ( ) ;
6869 yield return WaitForSpeechCommand ( ) ;
6970
@@ -197,6 +198,7 @@ private IEnumerator Sequence()
197198 bbox . BoundingBoxActivation = BoundingBox . BoundingBoxActivationType . ActivateOnStart ;
198199 bbox . HideElementsInInspector = false ;
199200 bbox . WireframeEdgeRadius = .05f ;
201+ multiRoot . AddComponent < ConstraintManager > ( ) ;
200202 multiRoot . AddComponent < ObjectManipulator > ( ) ;
201203
202204 SetStatus ( "Randomize Child Scale for skewing" ) ;
Original file line number Diff line number Diff line change @@ -68,6 +68,7 @@ private IEnumerator Sequence()
6868 boundsControl = cube . AddComponent < BoundsControl > ( ) ;
6969 boundsControl . HideElementsInInspector = false ;
7070 boundsControl . BoundsControlActivation = BoundsControlActivationType . ActivateOnStart ;
71+ var cm = cube . AddComponent < ConstraintManager > ( ) ;
7172 var om = cube . AddComponent < ObjectManipulator > ( ) ;
7273 yield return WaitForSpeechCommand ( ) ;
7374
@@ -200,6 +201,7 @@ private IEnumerator Sequence()
200201 boundsControl . BoundsControlActivation = BoundsControlActivationType . ActivateOnStart ;
201202 boundsControl . HideElementsInInspector = false ;
202203 boundsControl . LinksConfig . WireframeEdgeRadius = .05f ;
204+ multiRoot . AddComponent < ConstraintManager > ( ) ;
203205 multiRoot . AddComponent < ObjectManipulator > ( ) ;
204206
205207 SetStatus ( "Randomize Child Scale for skewing" ) ;
Original file line number Diff line number Diff line change @@ -38,6 +38,7 @@ public void TryStopManipulation()
3838 return ;
3939 }
4040
41+ manipulatedObject . GetComponent < ConstraintManager > ( ) ;
4142 var manipulationHandler = manipulatedObject . GetComponent < ManipulationHandler > ( ) ;
4243 var objectManipulator = manipulatedObject . GetComponent < ObjectManipulator > ( ) ;
4344 if ( manipulationHandler != null || objectManipulator != null )
You can’t perform that action at this time.
0 commit comments