Преглед на файлове

Update webVRController.ts

Model is disposed (since it is not needed anymore), but on reenter it is not loaded again (since it was disposed, but is not null).
Raanan Weber преди 6 години
родител
ревизия
d93e576896
променени са 1 файла, в които са добавени 4 реда и са изтрити 2 реда
  1. 4 2
      src/Gamepads/Controllers/webVRController.ts

+ 4 - 2
src/Gamepads/Controllers/webVRController.ts

@@ -12,7 +12,7 @@ export abstract class WebVRController extends PoseEnabledController {
     /**
     /**
      * Internal, the default controller model for the controller
      * Internal, the default controller model for the controller
      */
      */
-    protected _defaultModel: AbstractMesh;
+    protected _defaultModel: Nullable<AbstractMesh>;
 
 
     // Observables
     // Observables
     /**
     /**
@@ -64,7 +64,7 @@ export abstract class WebVRController extends PoseEnabledController {
     /**
     /**
      * The default controller model for the controller
      * The default controller model for the controller
      */
      */
-    public get defaultModel(): AbstractMesh {
+    public get defaultModel(): Nullable<AbstractMesh> {
         return this._defaultModel;
         return this._defaultModel;
     }
     }
 
 
@@ -154,6 +154,8 @@ export abstract class WebVRController extends PoseEnabledController {
      */
      */
     public dispose(): void {
     public dispose(): void {
         super.dispose();
         super.dispose();
+        
+        this._defaultModel = null;
 
 
         this.onTriggerStateChangedObservable.clear();
         this.onTriggerStateChangedObservable.clear();
         this.onMainButtonStateChangedObservable.clear();
         this.onMainButtonStateChangedObservable.clear();