Fix rotation issue - each group needs unique toString/__repr__

lidavidm · Apr 9, 2012 · 66b2387 · 66b2387
1 parent cbe559d
commit 66b2387
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/examples/resources/classy.js b/examples/resources/classy.js
@@ -13,7 +13,8 @@
     CLASSY_VERSION = '1.4',
     context = this,
     old = context.Class,
-    disable_constructor = false;
+    disable_constructor = false,
+    object_id = 0;
 
   /* we check if $super is in use by a class if we can.  But first we have to
      check if the JavaScript interpreter supports that.  This also matches
@@ -123,6 +124,8 @@
       if (disable_constructor)
         return;
       var proper_this = context === this ? cheapNew(arguments.callee) : this;
+      proper_this.$objectId = object_id;
+      object_id++;
       proper_this.$class = rv;
       if (proper_this.__init__)
         proper_this.__init__.apply(proper_this, arguments);

diff --git a/examples/rotation.js b/examples/rotation.js
@@ -21,6 +21,10 @@ require(["jsglet/core"], function(jsglet) {
         unset: function() {
             this.camera.popModel();
             this.camera.apply();
+        },
+
+        __repr__: function() {
+            return "RotationGroup " + this.parent + " " + this.$objectId;
         }
     });
 

diff --git a/jsglet/context.js b/jsglet/context.js
@@ -115,7 +115,6 @@ define(
             },
 
             identityModel: function() {
-                this.modelMatrix = mat4.create();
                 mat4.identity(this.modelMatrix);
             },