blame | history | patch | commit | commitdiff
Normand Briere
2019-08-26 6266c8a4b2485b29a7d5bcb217460d7aad3e1c4a 
 ObjEditor.java
....@@ -316,6 +316,8 @@
316316         objEditor.ctrlPanel.remove(setupPanel2);
317317         objEditor.ctrlPanel.remove(objectCommandsPanel);
318318         objEditor.ctrlPanel.remove(pushPanel);
319
+        if (versionPanel != null)
320
+            objEditor.ctrlPanel.remove(versionPanel);
319321         //objEditor.ctrlPanel.remove(fillPanel);
320322         
321323         //Remove(normalpushField);
....@@ -1163,6 +1165,7 @@
11631165     cGridBag setupPanel2;
11641166     cGridBag objectCommandsPanel;
11651167     cGridBag pushPanel;
1168
+    cGridBag versionPanel;
11661169     cGridBag fillPanel;
11671170 
11681171     JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
....@@ -1409,9 +1412,14 @@
14091412         oe.ctrlPanel.add(objectCommandsPanel);
14101413         oe.ctrlPanel.Return();
14111414 
1412
-    pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1415
+    pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH * 100, 1.1); // To have the buttons
14131416     normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1414
-    //Return();
1417
+    if (false && copy.versionlist != null && copy.versionindex != -1)
1418
+    {
1419
+        oe.ctrlPanel.Return();
1420
+        versionPanel = AddSlider(oe.ctrlPanel, "Version", 0, copy.VersionCount() - 1, copy.versionindex);
1421
+        versionField = (cNumberSlider)versionPanel.getComponent(1);
1422
+    }
14151423 
14161424         oe.ctrlPanel.Return();
14171425             
....@@ -2421,7 +2429,7 @@
24212429                 cameraField.setFloat(0.001);
24222430                 specularField.setFloat(0.001);
24232431                 fakedepthField.setFloat(0.001);
2424
-                opacityField.setFloat(0.6);
2432
+                opacityField.setFloat(0.4);
24252433 
24262434                 materialtouched = true;
24272435                 applySelf();
....@@ -4067,6 +4075,7 @@
40674075         } else if (event.getSource() == link2masterCB)
40684076         {
40694077             copy.link2master ^= true;
4078
+            objEditor.refreshContents();
40704079             return;
40714080         }
40724081         if (event.getSource() == randomCB)
....@@ -4457,7 +4466,7 @@
44574466             copy.versionindex -= 1;
44584467         
44594468         if (copy.versionindex != -1)
4460
-            CopyChanged();
4469
+            CopyChanged(copy);
44614470         
44624471         SetVersionStates();
44634472     }
....@@ -4539,20 +4548,20 @@
45394548     {
45404549         Object3D selection = new Object3D();
45414550         
4542
-        for (int i = 0; i < copy.selection.size(); i++)
4551
+        for (int i = 0; i < objEditor.copy.selection.size(); i++)
45434552         {
4544
-            Object3D elem = copy.selection.elementAt(i);
4553
+            Object3D elem = objEditor.copy.selection.elementAt(i);
45454554             
4546
-            Object3D obj = copy.GetObject(elem.GetUUID());
4555
+            Object3D obj = objEditor.copy.GetObject(elem.GetUUID());
45474556             
45484557             if (obj == null)
45494558             {
4550
-                copy.selection.remove(i--);
4559
+                objEditor.copy.selection.remove(i--);
45514560             }
45524561             else
45534562             {
45544563                 selection.add(obj);
4555
-                copy.selection.setElementAt(obj, i);
4564
+                objEditor.copy.selection.setElementAt(obj, i);
45564565             }
45574566         }
45584567         
....@@ -4565,44 +4574,43 @@
45654574         //refreshContents(false);
45664575     }
45674576 
4568
-    void CopyChanged()
4577
+    void CopyChanged(Object3D changed)
45694578     {
4570
-        Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4571
-        
4572
-        SetVersionStates();
4579
+        Object3D obj = (Object3D)Grafreed.clone(changed.versionlist[copy.versionindex]);
45734580         
45744581         boolean temp = CameraPane.SWITCH;
45754582         CameraPane.SWITCH = false;
45764583         
4577
-        copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4584
+        changed.ExtractBigData(Grafreed.grafreed.universe.versiontable);
45784585         
4579
-        copy.clear();
4586
+        changed.clear();
45804587         
4581
-        copy.skyboxname = obj.skyboxname;
4582
-        copy.skyboxext = obj.skyboxext;
4588
+        changed.skyboxname = obj.skyboxname;
4589
+        changed.skyboxext = obj.skyboxext;
45834590                 
45844591         for (int i=0; i<obj.Size(); i++)
45854592         {
4586
-            copy.add(obj.get(i));
4593
+            changed.add(obj.get(i));
45874594         }
45884595         
4589
-        copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4596
+        changed.RestoreBigData(Grafreed.grafreed.universe.versiontable);
45904597         
45914598         CameraPane.SWITCH = temp;
45924599         
4593
-        RefreshSelection();
4600
+        if (objEditor == this)
4601
+            RefreshSelection();
45944602         //assert(hashtable.isEmpty());
45954603         
4596
-        copy.Touch();
4604
+        objEditor.copy.Touch();
45974605         
45984606         ResetModel();
4599
-        copy.HardTouch(); // recompile?
4607
+        objEditor.copy.HardTouch(); // recompile?
46004608         
46014609         cRadio ab;
4602
-        for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
4610
+        for (java.util.Enumeration e = objEditor.buttonGroup.getElements(); e.hasMoreElements();)
46034611         {
46044612             ab = (cRadio)e.nextElement();
4605
-            Object3D test = copy.GetObject(ab.object.GetUUID());
4613
+            Object3D test = objEditor.copy.GetObject(ab.object.GetUUID());
46064614             //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
46074615             if (test != null)
46084616             {
....@@ -4611,7 +4619,7 @@
46114619             }
46124620         }
46134621         
4614
-        refreshContents(true);
4622
+        objEditor.refreshContents(true);
46154623     }
46164624     
46174625     cButton previousVersionButton;
....@@ -4625,15 +4633,7 @@
46254633     
46264634     int VersionCount()
46274635     {
4628
-        int count = 0;
4629
-        
4630
-        for (int i = copy.versionlist.length; --i >= 0;)
4631
-        {
4632
-            if (copy.versionlist[i] != null)
4633
-                count++;
4634
-        }
4635
-        
4636
-        return count;
4636
+        return copy.VersionCount();
46374637     }
46384638     
46394639     public cGridBag versionSliderPane;
....@@ -4707,7 +4707,9 @@
47074707 
47084708         copy.versionindex -= 1;
47094709 
4710
-        CopyChanged();
4710
+        CopyChanged(copy);
4711
+        
4712
+        SetVersionStates();
47114713         
47124714         return true;
47134715     }
....@@ -4725,7 +4727,9 @@
47254727         }
47264728 
47274729         //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4728
-        CopyChanged();
4730
+        CopyChanged(copy);
4731
+        
4732
+        SetVersionStates();
47294733         
47304734         return true;
47314735     }
....@@ -4762,10 +4766,12 @@
47624766 
47634767         copy.versionindex += 1;
47644768 
4765
-        CopyChanged();
4769
+        CopyChanged(copy);
47664770         
47674771         //if (!tab.user[tab.versionindex])
47684772         //    tab.graphs[tab.versionindex] = null;
4773
+        
4774
+        SetVersionStates();        
47694775     }
47704776 
47714777         void ImportGFD()
....@@ -5094,6 +5100,7 @@
50945100     }
50955101 
50965102     cNumberSlider versionSlider;
5103
+    cNumberSlider versionField;
50975104     
50985105     public void stateChanged(ChangeEvent e)
50995106     {
....@@ -5110,12 +5117,26 @@
51105117             if (version != -1 && copy.versionlist[version] != null)
51115118             {
51125119                 copy.versionindex = version;
5113
-                CopyChanged();
5120
+                CopyChanged(copy);
5121
+                SetVersionStates();
51145122             }
51155123             
51165124             return;
51175125         }
51185126 
5127
+        if (e.getSource() == versionField)
5128
+        {
5129
+            int version = versionField.getInteger();
5130
+            
5131
+            if (version != -1 && copy.versionindex != version && copy.versionlist[version] != null)
5132
+            {
5133
+                copy.versionindex = version;
5134
+                CopyChanged(copy);
5135
+            }
5136
+            
5137
+            return;
5138
+        }
5139
+        
51195140         if (freezematerial)
51205141         {
51215142             return;
....@@ -5205,7 +5226,7 @@
52055226         }
52065227         
52075228         if (normalpushField != null)
5208
-                copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
5229
+                copy.NORMALPUSH = (float)normalpushField.getFloat() / 100;
52095230     }
52105231 
52115232         void SnapObject()
....@@ -5579,7 +5600,7 @@
55795600     void ResetModel()
55805601     {
55815602         //assert(copy instanceof Composite);
5582
-        Object3D /*Composite*/ group = (Object3D /*Composite*/) copy;
5603
+        Object3D /*Composite*/ group = (Object3D /*Composite*/) objEditor.copy;
55835604 
55845605 // necessary?		group.selection = new Object3D(); // java.util.Vector();
55855606 
....@@ -5590,14 +5611,14 @@
55905611         //group.refreshEditWindow();
55915612         //refreshContents();
55925613 
5593
-        if (copy.selection == null)
5614
+        if (objEditor.copy.selection == null)
55945615         {
5595
-            copy.selection = new Object3D();
5616
+            objEditor.copy.selection = new Object3D();
55965617         }
55975618 
5598
-        for (int j = 0; j < copy.selection.size(); j++)
5619
+        for (int j = 0; j < objEditor.copy.selection.size(); j++)
55995620         {
5600
-            Object3D item = copy.selection.get(j);
5621
+            Object3D item = objEditor.copy.selection.get(j);
56015622 
56025623             if (item instanceof cGroup && ((cGroup) item).transientlink)
56035624             {
....@@ -5606,15 +5627,15 @@
56065627 
56075628             if (item.count <= 1) // ??? == 0)
56085629             {
5609
-                copy.selection.remove(item);
5630
+                objEditor.copy.selection.remove(item);
56105631             }
56115632         }
56125633 
56135634         boolean first = true;
56145635 
5615
-        for (int i = copy.selection.size(); --i >= 0;)
5636
+        for (int i = objEditor.copy.selection.size(); --i >= 0;)
56165637         {
5617
-            Object3D item = copy.selection.get(i);
5638
+            Object3D item = objEditor.copy.selection.get(i);
56185639 
56195640             if (item instanceof cGroup && ((cGroup) item).transientlink)
56205641             {