Fix cameras and new.

Normand Briere

2019-09-05 f2460bf93a1ff85a36407da2c599808e9e7a7091

Fix cameras and new.

 CameraPane.java
..
..
@@ -224,7 +224,7 @@
224
224
         SetCamera(cam);
225
225
 
226
226
         // Warning: not used.
227
-        SetLight(new Camera(new cVector(15, 10, -20)));
227
+        //SetLight(new Camera(new cVector(15, 10, -20)));
228
228
 
229
229
         object = o;
230
230
 
 Composite.java
..
..
@@ -286,6 +286,8 @@
286
286
         for (int i = 0; i < Children().size(); i++)
287
287
         {
288
288
             Object3D obj = (Object3D) Children().reserve(i);
289
+            if (obj == null)
290
+                continue;
289
291
             compo.addChild(obj.copyExpand());
290
292
             Children().release(i);
291
293
         }
 Grafreed.java
..
..
@@ -1027,13 +1027,13 @@
1027
1027
         grafreed.universe = new cGroup();
1028
1028
         grafreed.universe.name = "Grafreed";
1029
1029
         grafreed.universe.material = new cMaterial();
1030
-        grafreed.universe.skyboxname = "cubemaps/penguins-skyboxes/yonder";
1031
-        grafreed.universe.skyboxext = "jpg";
1032
1030
         
1033
1031
         //   theApplet3D.universe.textures = CameraPane.DEFAULT_TEXTURE;
1034
1032
 
1035
1033
         grafreed.universe.root = true;
1036
1034
         grafreed.universe.openEditWindow(null, true); //, true);
1035
+        grafreed.universe.editWindow.New();
1036
+        
1037
1037
         //mon.stop();
1038
1038
         //System.out.println(mon);
1039
1039
         //timeflow.app.TimeflowAppLauncher.GetTimeFlow();
 ObjEditor.java
..
..
@@ -4386,6 +4386,12 @@
4386
4386
 
4387
4387
     void New()
4388
4388
     {
4389
+        copy.skyboxname = "cubemaps/penguins-skyboxes/yonder";
4390
+        copy.skyboxext = "jpg";
4391
+        
4392
+        copy.versionlist = null;
4393
+        copy.versionindex = -1;
4394
+        
4389
4395
         while (copy.Size() > 0)
4390
4396
         {
4391
4397
             copy.remove(0);
..
..
@@ -4397,8 +4403,11 @@
4397
4403
         {
4398
4404
             CreateCameras();
4399
4405
             cameraView.SetCamera(GetCamera(copy, 0));
4406
+            cameraView.SetLight(GetCamera(copy, 4));
4400
4407
         }
4408
+        
4401
4409
         ResetModel();
4410
+        this.SetVersionStates();
4402
4411
         objEditor.refreshContents();
4403
4412
     }
4404
4413
     
..
..
@@ -4739,7 +4748,7 @@
4739
4748
             replaceButton.setEnabled(copy.versionindex != -1);
4740
4749
 
4741
4750
             previousVersionButton.setEnabled(copy.versionindex > 0);
4742
-            nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4751
+            nextVersionButton.setEnabled(copy.versionlist != null && copy.versionlist[copy.versionindex + 1] != null);
4743
4752
 
4744
4753
             deleteVersionButton.setEnabled(copy.versionindex != -1);
4745
4754
                                             //copy.versionlist[copy.versionindex + 1] != null);
..
..
@@ -4862,7 +4871,7 @@
4862
4871
     {
4863
4872
         if (copy == Grafreed.grafreed.universe)
4864
4873
         {
4865
-            Camera neweye = (Camera)copy.GetObject(cameraView.cameras[0].GetUUID());
4874
+            Camera neweye = (Camera)copy.GetObject(cameraView.cameras[cameraView.cameracount^1].GetUUID());
4866
4875
             Camera newlight = (Camera)copy.GetObject(cameraView.LightCamera().GetUUID());
4867
4876
 
4868
4877
             cameraView.SetCamera(neweye);
 Object3D.java
..
..
@@ -116,11 +116,12 @@
116
116
     {
117
117
         int count = 0;
118
118
         
119
-        for (int i = versionlist.length; --i >= 0;)
120
-        {
121
-            if (versionlist[i] != null)
122
-                count++;
123
-        }
119
+        if (versionlist != null)
120
+            for (int i = versionlist.length; --i >= 0;)
121
+            {
122
+                if (versionlist[i] != null)
123
+                    count++;
124
+            }
124
125
         
125
126
         return count;
126
127
     }
..
..
@@ -6463,16 +6464,16 @@
6463
6464
                 
6464
6465
                 assert (!(this instanceof Composite));
6465
6466
                 {
6466
-                    for (int i = 0; i < size(); i++)
6467
-                    {
6468
-                        Object3D child = (Object3D) reserve(i);
6469
-                        if (child == null)
6470
-                            continue;
6471
-
6472
-                        child.draw(display, root, selected, blocked);
6473
-
6474
-                        release(i);
6475
-                    }
6467
+// CRASH MOCAP!!                   for (int i = 0; i < size(); i++)
6468
+//                    {
6469
+//                        Object3D child = (Object3D) reserve(i);
6470
+//                        if (child == null)
6471
+//                            continue;
6472
+//
6473
+//                        child.draw(display, root, selected, blocked);
6474
+//
6475
+//                        release(i);
6476
+//                    }
6476
6477
                 }
6477
6478
             }
6478
6479
 
..
..
@@ -8285,7 +8286,7 @@
8285
8286
 //        if (!Globals.ADVANCED)
8286
8287
 //            return objname;
8287
8288
         
8288
-        return objname; // + " " + System.identityHashCode(this); // + GetUUID()
8289
+        return objname; // + " " + System.identityHashCode(this) + " " + GetUUID();
8289
8290
     }
8290
8291
 
8291
8292
     public int hashCode()