Better navigation.

Normand Briere

2019-09-20 cbe4e90105d07d7d3fecabffaa01342403aa2ae3

 GroupEditor.java
..
..
@@ -29,7 +29,7 @@
29
29
     {
30
30
         cButton skyboxButton;
31
31
         final String path = "cubemaps/" + f + "-skyboxes/" + s;
32
-        row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
32
+        row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
33
33
         //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
34
34
         skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
35
35
         skyboxButton.addActionListener(new ActionListener()
..
..
@@ -46,7 +46,7 @@
46
46
     {
47
47
         cButton textureButton;
48
48
         final String path = "textures/" + f + "/" + c + "/"; // + t;
49
-        row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
49
+        row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
50
50
         textureButton.setToolTipText(c + count);
51
51
         textureButton.addActionListener(new ActionListener()
52
52
         {
..
..
@@ -347,7 +347,7 @@
347
347
 
348
348
     public void CreateSkyboxPanel(cGridBag skyboxPanel)
349
349
     {
350
-        JTabbedPane skyboxpane = new JTabbedPane();
350
+        JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
351
351
         
352
352
         AddSkyboxTab0(skyboxpane);
353
353
         AddSkyboxTab1(skyboxpane);
..
..
@@ -366,16 +366,6 @@
366
366
         }
367
367
        
368
368
         refreshContents();
369
-    }
370
-
371
-    public void Show3DView()
372
-    {
373
-        // bug
374
-        //gridPanel.setDividerLocation(1.0);
375
-        //bigPanel.setDividerLocation(0.0);
376
-        bigThree.ClearUI();
377
-        bigThree.add(centralPanel);
378
-        bigThree.FlushUI();
379
369
     }
380
370
 
381
371
     //ObjEditor objEditor;
..
..
@@ -415,13 +405,15 @@
415
405
 		this.copy = this.group = group;
416
406
 		//selectees = this.group.selectees;
417
407
 		
418
-        if (copy.versionlist == null)
419
-        {
420
-            copy.versionlist = new Object3D[100];
421
-            copy.versionindex = -1;
422
-            
423
-            Save(true);
424
-        }
408
+                assert(false);
409
+                
410
+//        if (copy.versionlist == null)
411
+//        {
412
+//            copy.versionlist = new Object3D[100];
413
+//            copy.versionindex = -1;
414
+//            
415
+//            //Save(true);
416
+//        }
425
417
         
426
418
 		if(ui)
427
419
                     SetupUI(objEditor);
..
..
@@ -444,13 +436,13 @@
444
436
                 
445
437
                 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
446
438
                 
447
-        if (copy.versionlist == null)
448
-        {
449
-            copy.versionlist = new Object3D[100];
450
-            copy.versionindex = -1;
451
-            
452
-            Save(true);
453
-        }
439
+//        if (copy.versionlist == null)
440
+//        {
441
+//            copy.versionlist = new Object3D[100];
442
+//            copy.versionindex = -1;
443
+//            
444
+//            //Save(true);
445
+//        }
454
446
 	}
455
447
 
456
448
     void CloneSelection(boolean supports)
..
..
@@ -491,11 +483,16 @@
491
483
         
492
484
         Object3D parent = obj.parent;
493
485
         obj.parent = null;
486
+        
494
487
         //               Object3D support = obj.support;
495
488
         //               obj.support = null;
496
489
         if (!supports)
497
490
             obj.SaveSupports();
491
+        
498
492
         Object3D clone = (Object3D)Grafreed.clone(obj);
493
+        
494
+        clone.ResetUUIDs();
495
+        
499
496
         obj.parent = parent;
500
497
         //               obj.support = support;
501
498
         //               clone.support = support; // aout 2013
..
..
@@ -565,13 +562,12 @@
565
562
 		pasteLinkItem.addActionListener(this);
566
563
 		pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
567
564
 		pasteCloneItem.addActionListener(this);
568
-// CRASH	pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
569
-//		pasteExpandItem.addActionListener(this);
565
+// CRASH
566
+                pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
567
+//		
568
+                pasteExpandItem.addActionListener(this);
570
569
 		//menu.add("-");
571
570
                 oe.jTree.popup.addSeparator();
572
-                
573
-		deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
574
-		deleteItem.addActionListener(this);
575
571
                 
576
572
         if (Globals.ADVANCED)
577
573
         {
..
..
@@ -706,15 +702,17 @@
706
702
 		setMasterItem.addActionListener(this);
707
703
         }
708
704
                 
709
-		oe.menuBar.add(menu = new Menu("Group"));
710
-//		grabItem = menu.add(new MenuItem("Grab"));
711
-//		grabItem.addActionListener(this);
705
+		oe.menuBar.add(menu = new Menu("Order"));
706
+                
712
707
 		backItem = menu.add(new MenuItem("Back"));
713
708
 		backItem.addActionListener(this);
714
709
 		frontItem = menu.add(new MenuItem("Front"));
715
710
 		frontItem.addActionListener(this);
716
711
 //		compositeItem = menu.add(new MenuItem("Composite"));
717
712
 //		compositeItem.addActionListener(this);
713
+                
714
+		grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
715
+		grabItem.addActionListener(this);
718
716
                 
719
717
         if (Globals.ADVANCED)
720
718
         {
..
..
@@ -723,6 +721,11 @@
723
721
         }
724
722
 		ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
725
723
 		ungroupItem.addActionListener(this);
724
+                
725
+                oe.jTree.popup.addSeparator();
726
+                
727
+		deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
728
+		deleteItem.addActionListener(this);
726
729
                 
727
730
 //		menu.add("-");
728
731
 //                
..
..
@@ -759,9 +762,9 @@
759
762
 		shadowYItem.addActionListener(this);
760
763
                 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
761
764
 		shadowZItem.addActionListener(this);
765
+                
762
766
 		attributeItem = menu.add(new MenuItem("Attribute"));
763
767
 		attributeItem.addActionListener(this);
764
-                
765
768
         if (Globals.ADVANCED)
766
769
         {
767
770
 		menu.add("-");
..
..
@@ -773,11 +776,18 @@
773
776
 		pointflowItem.addActionListener(this);
774
777
         }
775
778
 		menu.add("-");
779
+		textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
780
+		textureRatioRItem.addActionListener(this);
781
+		textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
782
+		textureRatioGItem.addActionListener(this);
783
+		textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
784
+		textureRatioBItem.addActionListener(this);
785
+		menu.add("-");
776
786
 		resetTransformItem = menu.add(new MenuItem("Reset Transform"));
777
787
 		resetTransformItem.addActionListener(this);
778
788
 		resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
779
789
 		resetCentroidItem.addActionListener(this);
780
-		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
790
+		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
781
791
 		resetCentroidXZItem.addActionListener(this);
782
792
 		transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
783
793
 		transformGeometryItem.addActionListener(this);
..
..
@@ -793,7 +803,7 @@
793
803
 		genNormalsCADItem.addActionListener(this);
794
804
 		genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
795
805
 		genNormalsMESHItem.addActionListener(this);
796
-        if (Globals.ADVANCED)
806
+        //if (Globals.ADVANCED)
797
807
         {
798
808
 		genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
799
809
 		genNormalsMINEItem.addActionListener(this);
..
..
@@ -829,6 +839,8 @@
829
839
         }
830
840
 
831
841
                 oe.menuBar.add(menu = new Menu("Attributes"));
842
+		clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
843
+		clearVersionsItem.addActionListener(this);
832
844
 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
833
845
 		clearMaterialsItem.addActionListener(this);
834
846
                 resetAllItem = menu.add(new MenuItem("Reset All"));
..
..
@@ -851,9 +863,9 @@
851
863
 		hideleavesItem.addActionListener(this);
852
864
 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
853
865
 		showleavesItem.addActionListener(this);
854
-		markleavesItem = menu.add(new MenuItem("Mark Leaves"));
866
+		markleavesItem = menu.add(new MenuItem("Anim Leaves"));
855
867
 		markleavesItem.addActionListener(this);
856
-		unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
868
+		unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
857
869
 		unmarkleavesItem.addActionListener(this);
858
870
 		rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
859
871
 		rewindleavesItem.addActionListener(this);
..
..
@@ -928,8 +940,10 @@
928
940
 	
929
941
         JTabbedPane resourcecontainer;
930
942
         cGridBag currenttab;
931
-        boolean added; // patch for jar
943
+        //boolean added; // patch for jar
932
944
                 
945
+        int totalcount = 0;
946
+        
933
947
         int tabcount = 0;
934
948
         int colcount = 0;
935
949
         int rowcount = 0;
..
..
@@ -940,33 +954,40 @@
940
954
         
941
955
     public void ResourceCallBack(String[] path)
942
956
     {
943
-        for (int i = 0; i < path.length; i++)
944
-            System.out.print(path[i] + "/");
945
-        System.out.println();
957
+//        for (int i = 0; i < path.length; i++)
958
+//            System.out.print(path[i] + "/");
959
+//        System.out.println();
946
960
         
947
961
         if (//rowcount == 0 ||
948
-                path.length == 1)
962
+                path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
949
963
         {
950
964
             currenttab = new cGridBag();
951
-            added = false;
952
965
             String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
953
966
             currenttab.setName(tabname);
967
+            //added = false;
968
+            resourcecontainer.add(currenttab);
969
+            resourcecontainer.setToolTipTextAt(tabcount++, "Texture " + tabname);
954
970
             rowcount = 1;
955
971
             colcount = 0;
956
972
             texturecount = 0;
957
973
         }
958
974
         
959
-        if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
975
+        if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
960
976
         {
961
-            if (!added)
977
+            //if (!added)
962
978
             {
963
-                added = true;
964
-                resourcecontainer.add(currenttab);
979
+                //added = true;
965
980
                 String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
966
-                resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
981
+                currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
967
982
             }
968
983
             
969
-            AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
984
+        columns = 5;
985
+        
986
+        if (path[0].contains("D&R") || path[0].contains("Paint"))
987
+            columns = 4;
988
+        
989
+            AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
990
+            totalcount++;
970
991
             
971
992
             if (++colcount >= columns)
972
993
             {
..
..
@@ -992,6 +1013,8 @@
992
1013
             container.add(resourcecontainer);
993
1014
             
994
1015
             Grafreed.ParseResources("textures", this);
1016
+            
1017
+            // 935. System.out.println("Total = " + totalcount);
995
1018
         }
996
1019
         
997
1020
 	void SetupUI2(ObjEditor oe)
..
..
@@ -1031,9 +1054,9 @@
1031
1054
         oe.radioPanel.add(dummyButton);
1032
1055
         oe.buttonGroup.add(dummyButton);
1033
1056
          */
1034
-                cGridBag copyOptionsPanel = new cGridBag();
1057
+                cGridBag versionManagerPanel = new cGridBag();
1035
1058
                                         
1036
-                copyOptionsPanel.preferredHeight = 2;
1059
+                versionManagerPanel.preferredHeight = 4;
1037
1060
                 
1038
1061
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1039
1062
                 
..
..
@@ -1060,25 +1083,29 @@
1060
1083
 //                        }
1061
1084
 //                });
1062
1085
                 
1063
-		oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1086
+		oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1087
+                fullScreenButton.setToolTipText("Full-screen window");
1088
+		fullScreenButton.addActionListener(this);
1089
+                
1090
+		oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1064
1091
                 collapseButton.setToolTipText("Collapse toolbar");
1065
1092
 		collapseButton.addActionListener(this);
1066
1093
                 
1067
-		oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1068
-                maximize3DButton.setToolTipText("Maximize 3D view");
1069
-		maximize3DButton.addActionListener(this);
1094
+//		oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1095
+//                maximize3DButton.setToolTipText("Maximize 3D view");
1096
+//		maximize3DButton.addActionListener(this);
1070
1097
                 
1071
-		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1098
+		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1072
1099
                 twoButton.setToolTipText("Show 3D view only");
1073
1100
 		twoButton.addActionListener(this);
1074
1101
                 this.fullscreenLayout = twoButton;
1075
1102
                 
1076
-		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1103
+		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1077
1104
                 threeButton.setToolTipText("Show controls and 3D view");
1078
1105
 		threeButton.addActionListener(this);
1079
1106
                 if (Globals.ADVANCED)
1080
1107
                 {
1081
-		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1108
+		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1082
1109
                 sixButton.setToolTipText("Show 3D view and controls");
1083
1110
 		sixButton.addActionListener(this);
1084
1111
                 }
..
..
@@ -1087,50 +1114,47 @@
1087
1114
 //		sevenButton.addActionListener(this);
1088
1115
                 //
1089
1116
                 
1090
-		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1091
-                fullButton.setToolTipText("Full-screen window");
1092
-		fullButton.addActionListener(this);
1093
-                
1094
-		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1117
+		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1095
1118
                 screenfitButton.setToolTipText("Screen fit");
1096
1119
 		screenfitButton.addActionListener(this);
1097
1120
 
1098
-		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1121
+		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1099
1122
                 restoreCameraButton.setToolTipText("Restore viewpoint");
1100
1123
 		restoreCameraButton.addActionListener(this);
1101
1124
                 
1102
-		copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1125
+		versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1103
1126
                 saveVersionButton.setToolTipText("Duplicate current version");
1104
1127
 		saveVersionButton.addActionListener(this);
1105
1128
                                                 
1106
-		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1129
+		versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1107
1130
                 deleteVersionButton.setToolTipText("Delete current version");
1108
1131
 		deleteVersionButton.addActionListener(this);
1132
+                deleteVersionButton.setEnabled(false);
1109
1133
                                                 
1110
-		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1134
+		versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1111
1135
                 previousVersionButton.setToolTipText("Previous version");
1112
1136
 		previousVersionButton.addActionListener(this);
1113
1137
                 previousVersionButton.setEnabled(false);
1114
1138
                 
1115
1139
                 cGridBag updown = new cGridBag().setVertical(true);
1116
-		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1140
+		updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1117
1141
                 restoreButton.setToolTipText("Undo (restore current version)");
1118
1142
 		restoreButton.addActionListener(this);
1119
-                //restoreButton.setEnabled(false);
1143
+                restoreButton.setEnabled(false);
1120
1144
                 
1121
-		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1145
+		updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1122
1146
                 replaceButton.setToolTipText("Save (replace current version)");
1123
1147
 		replaceButton.addActionListener(this);
1124
-                //replaceButton.setEnabled(false);
1148
+                replaceButton.setEnabled(false);
1125
1149
                 
1126
-                copyOptionsPanel.add(updown);
1150
+                versionManagerPanel.add(updown);
1127
1151
                 
1128
-		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1152
+		versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1129
1153
                 nextVersionButton.setToolTipText("Next version");
1130
1154
 		nextVersionButton.addActionListener(this);
1131
1155
                 nextVersionButton.setEnabled(false);
1132
1156
                 
1133
-		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1157
+		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1134
1158
                 oneStepButton.setToolTipText("Animate one step forward");
1135
1159
 		oneStepButton.addActionListener(this);
1136
1160
                 
..
..
@@ -1153,11 +1177,11 @@
1153
1177
 
1154
1178
                 if (Globals.ADVANCED)
1155
1179
                 {
1156
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1180
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1157
1181
                         snapobjectButton.addActionListener(this);
1158
1182
                         snapobjectButton.setToolTipText("Snap Object");
1159
1183
                         
1160
-		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1184
+		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1161
1185
 		fourButton.addActionListener(this);
1162
1186
                 fourButton.setToolTipText("Show control panel only");
1163
1187
                 }
..
..
@@ -1165,83 +1189,85 @@
1165
1189
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1166
1190
                 
1167
1191
 
1168
-		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1192
+		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1169
1193
                 rootButton.setToolTipText("Open selection in new tab");
1170
1194
 		rootButton.addActionListener(this);
1171
1195
 
1172
-                oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1196
+                oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1173
1197
                 closeButton.setToolTipText("Close tab");
1174
1198
 		closeButton.addActionListener(this);
1175
1199
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
1176
1200
 		//clearButton.addActionListener(this);
1177
1201
 
1178
1202
                 cGridBag row1 = new cGridBag();
1203
+                row1.preferredHeight = 8;
1179
1204
                 
1180
1205
                 // INSERT
1181
-                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1206
+                row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1182
1207
                 gridButton.setToolTipText("Create ground");
1183
1208
                                 gridButton.addActionListener(this);
1184
1209
 
1185
-                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1210
+                row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1186
1211
                 boxButton.setToolTipText("Create box");
1187
1212
                                 boxButton.addActionListener(this);
1188
1213
 
1189
-                row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1190
-                sphereButton.setToolTipText("Create sphere");
1191
-                                sphereButton.addActionListener(this);
1192
-
1193
-                row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1194
-                coneButton.setToolTipText("Create cone");
1195
-                                coneButton.addActionListener(this);
1196
-
1197
-                row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1198
-                torusButton.setToolTipText("Create torus");
1199
-                                torusButton.addActionListener(this);
1200
-
1201
-                row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1214
+                row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1202
1215
                 superButton.setToolTipText("Create superellipsoid");
1203
1216
                                 superButton.addActionListener(this);
1204
1217
 
1205
-                if (Globals.ADVANCED)
1218
+                row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1219
+                sphereButton.setToolTipText("Create sphere");
1220
+                                sphereButton.addActionListener(this);
1221
+
1222
+                row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1223
+                coneButton.setToolTipText("Create cone");
1224
+                                coneButton.addActionListener(this);
1225
+
1226
+                row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1227
+                torusButton.setToolTipText("Create torus");
1228
+                                torusButton.addActionListener(this);
1229
+
1230
+                if (false) //Globals.ADVANCED)
1206
1231
                 {
1207
-                    oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1232
+                    oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1208
1233
                     kleinButton.setToolTipText("Create Klein bottle");
1209
1234
                                     kleinButton.addActionListener(this);
1210
1235
                 }
1211
1236
                 
1212
-                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1237
+                row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1213
1238
                 particlesButton.setToolTipText("Create particle system");
1214
1239
                                particlesButton.addActionListener(this);
1215
1240
 
1216
1241
                 oe.toolboxPanel.add(row1);
1217
1242
                 
1218
1243
                 cGridBag row2 = new cGridBag();
1244
+                row2.preferredHeight = 8;
1219
1245
                 
1220
-                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1246
+                row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1221
1247
                 groupButton.setToolTipText("Create group");
1222
1248
                                groupButton.addActionListener(this);
1223
1249
 
1224
-                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1250
+                row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1225
1251
                 compositeButton.setToolTipText("Create composite");
1226
1252
                                compositeButton.addActionListener(this);
1227
1253
 
1228
-                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1254
+                row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1229
1255
                 switchButton.setToolTipText("Create item switcher");
1230
1256
                                switchButton.addActionListener(this);
1231
1257
 
1232
-                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1258
+                row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1233
1259
                 loopButton.setToolTipText("Create loop");
1234
1260
                                loopButton.addActionListener(this);
1235
1261
 
1236
-                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1262
+                row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1237
1263
                 textureButton.setToolTipText("Create texture");
1238
1264
                                textureButton.addActionListener(this);
1239
1265
 
1240
-                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1266
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1241
1267
                 overlayButton.setToolTipText("Create overlay");
1242
1268
                                overlayButton.addActionListener(this);
1243
1269
 
1244
-                row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1270
+                row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1245
1271
                 lightButton.setToolTipText("Create light");
1246
1272
                                lightButton.addActionListener(this);
1247
1273
 
..
..
@@ -1251,6 +1277,11 @@
1251
1277
                 
1252
1278
                 CreateTexturePanel(textures);
1253
1279
                 
1280
+                int tabCount = resourcecontainer.getTabCount();
1281
+                
1282
+                if (tabCount > 0)
1283
+                    resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1284
+                
1254
1285
                 oe.toolboxPanel.add(textures);
1255
1286
                 
1256
1287
                 textures.preferredHeight = 100;
..
..
@@ -1258,11 +1289,11 @@
1258
1289
                 CreateSkyboxPanel(oe.skyboxPanel);
1259
1290
                 
1260
1291
                 // EDIT panel
1261
-		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1292
+		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1262
1293
                 editButton.setToolTipText("Pin selection controls");
1263
1294
 		editButton.addActionListener(this);
1264
1295
 
1265
-		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1296
+		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1266
1297
                 uneditButton.setToolTipText("Unpin and remove selection controls");
1267
1298
 		uneditButton.addActionListener(this);
1268
1299
 
..
..
@@ -1270,7 +1301,7 @@
1270
1301
                 allParamsButton.setToolTipText("Show all controls");
1271
1302
 		allParamsButton.addActionListener(this);
1272
1303
 
1273
-		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1304
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1274
1305
                 clearPanelButton.setToolTipText("Clear all controls");
1275
1306
 		clearPanelButton.addActionListener(this);
1276
1307
 
..
..
@@ -1278,7 +1309,7 @@
1278
1309
                 //unselectButton.setToolTipText("Unselect");
1279
1310
 		//unselectButton.addActionListener(this);
1280
1311
 
1281
-		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1312
+		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1282
1313
                 flashSelectionButton.setToolTipText("Highlight selection");
1283
1314
 		flashSelectionButton.addActionListener(this);
1284
1315
                 
..
..
@@ -1301,6 +1332,8 @@
1301
1332
                 
1302
1333
                 cGridBag jSPPanel = new cGridBag();
1303
1334
 
1335
+            jSPPanel.preferredHeight = 20;
1336
+            
1304
1337
                 JScrollPane jSP;
1305
1338
 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1306
1339
 		jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..
..
@@ -1309,11 +1342,12 @@
1309
1342
                 oe.treePanel.add(jSPPanel);
1310
1343
                 oe.treePanel.Return();
1311
1344
 
1312
-                oe.treePanel.add(copyOptionsPanel);
1345
+                oe.treePanel.add(versionManagerPanel);
1313
1346
                 oe.treePanel.Return();
1314
-        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1315
-            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1316
-            sliderPane.preferredHeight = 1;
1347
+                
1348
+        versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1349
+            versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1350
+            versionSliderPane.preferredHeight = 3;
1317
1351
                 
1318
1352
 //        mainPanel.setDividerLocation(0.1); //1.0);
1319
1353
         mainPanel.setResizeWeight(0.4);
..
..
@@ -1370,7 +1404,7 @@
1370
1404
 //                supportCB.setToolTipText("Enable rigging");
1371
1405
 //                                supportCB.addItemListener(this);
1372
1406
 
1373
-                panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
1407
+                panel.add(freezeCB = new cCheckBox("Fast cam", Globals.FREEZEONMOVE)); //, constraints);
1374
1408
                 freezeCB.setToolTipText("Fast moving camera");
1375
1409
                                 freezeCB.addItemListener(this);
1376
1410
 
..
..
@@ -1379,9 +1413,12 @@
1379
1413
 
1380
1414
                 panel.Return();
1381
1415
                 
1416
+            if (Globals.ADVANCED)
1417
+            {
1382
1418
                 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
1383
1419
                 crowdCB.setToolTipText("Used for crowds");
1384
1420
                                 crowdCB.addItemListener(this);
1421
+            }
1385
1422
 
1386
1423
                 panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
1387
1424
                 smoothCB.setToolTipText("Snapping delay");
..
..
@@ -1394,30 +1431,26 @@
1394
1431
                 minshaderCB.setToolTipText("Minimal fast shader");
1395
1432
                                 minshaderCB.addItemListener(this);
1396
1433
                                 
1397
-//        	constraints.gridy += 1;
1398
1434
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
1399
1435
 //                                speakerMocapCB.addItemListener(this);
1400
1436
 
1401
-                panel.Return();
1402
-                
1403
1437
             if (false)
1404
1438
             {
1405
1439
                 // handled in scripts
1406
-        	//constraints.gridy += 1;
1407
1440
                 panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
1408
1441
                                 speakerCameraCB.addItemListener(this);
1409
1442
 
1410
-        	//constraints.gridy += 1;
1411
1443
                 panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
1412
1444
                                 speakerFocusCB.addItemListener(this);
1413
1445
 
1414
-        	//constraints.gridy += 1;
1415
-                panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
1416
-                                smoothfocusCB.addItemListener(this);
1417
1446
                 panel.Return();
1418
1447
             }
1419
1448
 
1420
-//constraints.gridx += 1;
1449
+                panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
1450
+                                smoothfocusCB.addItemListener(this);
1451
+                                
1452
+                panel.Return();
1453
+                
1421
1454
 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
1422
1455
 //                debugCB.addItemListener(this);
1423
1456
 
..
..
@@ -1471,7 +1504,7 @@
1471
1504
 	
1472
1505
         void EditObject(Object3D obj)
1473
1506
         {
1474
-            assert(obj instanceof Composite);
1507
+            //assert(obj instanceof Composite);
1475
1508
             
1476
1509
 //            if (obj.versionlist == null)
1477
1510
 //            {
..
..
@@ -1503,6 +1536,7 @@
1503
1536
                     
1504
1537
             oe.SetupViews();
1505
1538
             
1539
+        if (Globals.DEBUG)
1506
1540
 		System.out.println("SetupViews");
1507
1541
             DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1508
1542
                   oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..
..
@@ -2055,7 +2089,7 @@
2055
2089
             Object3D obj = (Object3D)group.selection.elementAt(0);
2056
2090
             objEditor.ScreenFit(obj, false);
2057
2091
             
2058
-            cameraView.pingthread.StepToTarget(true);
2092
+            cameraView.pingthread.StepToTarget(); //true);
2059
2093
             refreshContents();
2060
2094
         }
2061
2095
 
..
..
@@ -2092,7 +2126,7 @@
2092
2126
                 obj.parent.TransformToWorld(maxima); //, maxima);
2093
2127
             }
2094
2128
             
2095
-            Object3D shadow = new Object3D("Shadow " + obj.name);
2129
+            Object3D shadow = new Object3D("Shadow" + obj.name);
2096
2130
             
2097
2131
             shadow.toParent = LA.newMatrix();
2098
2132
             shadow.fromParent = LA.newMatrix();
..
..
@@ -2106,24 +2140,24 @@
2106
2140
             switch(axis)
2107
2141
             {
2108
2142
                 case 0 :
2109
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2110
-                    vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
2111
-                    vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2112
-                    vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
2143
+                    vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
2144
+                    vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
2145
+                    vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
2146
+                    vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
2113
2147
                     norm = cVector.X;
2114
2148
                     break;
2115
2149
                 case 1 :
2116
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2117
-                    vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2118
-                    vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2119
-                    vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
2150
+                    vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
2151
+                    vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
2152
+                    vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
2153
+                    vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
2120
2154
                     norm = cVector.Y;
2121
2155
                     break;
2122
2156
                 case 2 :
2123
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2124
-                    vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2125
-                    vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
2126
-                    vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
2157
+                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
2158
+                    vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
2159
+                    vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
2160
+                    vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
2127
2161
                     norm = cVector.Z;
2128
2162
                     break;
2129
2163
             }
..
..
@@ -2164,7 +2198,11 @@
2164
2198
             shadow.material = new cMaterial(obj.material);
2165
2199
             shadow.material.diffuse = 0.0001f;
2166
2200
             shadow.material.specular = 0.0001f;
2167
-            //shadow.projectedVertices[1].x = 300;
2201
+            shadow.material.opacity = 0.75f;
2202
+            
2203
+            AllocProjectedVertices(shadow);
2204
+        
2205
+            shadow.projectedVertices[1].x = 300;
2168
2206
             
2169
2207
             makeSomething(shadow);
2170
2208
         }
..
..
@@ -2688,11 +2726,11 @@
2688
2726
                     if (!group.selection.isEmpty())
2689
2727
                     {
2690
2728
                         Composite csg = new GroupLeaf();
2729
+			group(csg);
2691
2730
                         csg.count = 5;
2692
2731
                         Composite child = new cGroup("Branch");
2693
2732
                         csg.addChild(child);
2694
2733
                         child.addChild(csg);
2695
-			group(csg);
2696
2734
                     }
2697
2735
 		} else
2698
2736
 		if (source == doubleItem)
..
..
@@ -2700,6 +2738,7 @@
2700
2738
                     if (!group.selection.isEmpty())
2701
2739
                     {
2702
2740
                         Composite csg = new GroupLeaf("Fork");
2741
+			group(csg);
2703
2742
                         csg.count = 5;
2704
2743
                         Composite child = new cGroup("Branch A");
2705
2744
                         csg.addChild(child);
..
..
@@ -2707,7 +2746,6 @@
2707
2746
                         child = new cGroup("Branch B");
2708
2747
                         csg.addChild(child);
2709
2748
                         child.addChild(csg);
2710
-			group(csg);
2711
2749
                     }
2712
2750
 		} else
2713
2751
 		if (source == tripleItem)
..
..
@@ -2773,7 +2811,7 @@
2773
2811
 		{
2774
2812
 			Maximize();
2775
2813
 		} else
2776
-		if (source == fullButton)
2814
+		if (source == fullScreenButton)
2777
2815
 		{
2778
2816
 			ToggleFullScreen();
2779
2817
 		} else
..
..
@@ -2782,13 +2820,13 @@
2782
2820
                         this.expandedLayout = radio.layout;
2783
2821
 			CollapseToolbar();
2784
2822
 		} else
2785
-		if (source == maximize3DButton)
2786
-		{
2787
-                        this.expandedLayout = radio.layout;
2788
-                        radio.layout = twoButton;
2789
-                        Show3DView();
2790
-			CollapseToolbar();
2791
-		} else
2823
+//		if (source == maximize3DButton)
2824
+//		{
2825
+//                        this.expandedLayout = radio.layout;
2826
+//                        radio.layout = twoButton;
2827
+//			CollapseToolbar();
2828
+//                        Show3DView();
2829
+//		} else
2792
2830
 		if (source == previousVersionButton)
2793
2831
 		{
2794
2832
                         // Go to previous version
..
..
@@ -2816,7 +2854,7 @@
2816
2854
 		if (source == saveVersionButton)
2817
2855
 		{
2818
2856
                         // Save a new version
2819
-			if (!Save(true))
2857
+			if (!DuplicateVersion()) //true))
2820
2858
                             java.awt.Toolkit.getDefaultToolkit().beep();
2821
2859
 		} else
2822
2860
 		if (source == deleteVersionButton)
..
..
@@ -3441,6 +3479,10 @@
3441
3479
                 {
3442
3480
 			ClearMaterials();
3443
3481
 		} else
3482
+		if (source == clearVersionsItem)
3483
+                {
3484
+			ClearVersions();
3485
+		} else
3444
3486
 		if (source == liveleavesItem)
3445
3487
                 {
3446
3488
 			LiveLeaves(true);
..
..
@@ -3580,6 +3622,18 @@
3580
3622
 		if (source == transformChildrenItem)
3581
3623
 		{
3582
3624
                         TransformChildren();
3625
+		} else
3626
+		if (source == textureRatioRItem)
3627
+		{
3628
+                        TextureRatio(0);
3629
+		} else
3630
+		if (source == textureRatioGItem)
3631
+		{
3632
+                        TextureRatio(1);
3633
+		} else
3634
+		if (source == textureRatioBItem)
3635
+		{
3636
+                        TextureRatio(2);
3583
3637
 		} else
3584
3638
 		if (source == resetTransformItem)
3585
3639
 		{
..
..
@@ -3953,6 +4007,9 @@
3953
4007
 		if (source == closeButton)
3954
4008
 		{
3955
4009
 //System.out.println("CLOSE: " + buttonGroup.getSelection());
4010
+                    if (copy.versionlist != null)
4011
+                        Replace();
4012
+                    
3956
4013
                     cRadio ab;
3957
4014
                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3958
4015
                     {
..
..
@@ -4051,6 +4108,9 @@
4051
4108
 		} else
4052
4109
                 if(source instanceof cRadio)
4053
4110
 		{
4111
+                    if (copy.versionlist != null)
4112
+                        Replace();
4113
+                    
4054
4114
                     group.parent = keepparent;
4055
4115
                         group.attributes = 0;
4056
4116
                     //group.editWindow = null;
..
..
@@ -4102,14 +4162,28 @@
4102
4162
                      */
4103
4163
                     radio.layout.doClick();
4104
4164
                     
4105
-                    assert(copy instanceof Composite);
4165
+                    //assert(copy instanceof Composite);
4106
4166
                     
4107
4167
         if (copy.versionlist == null)
4108
4168
         {
4109
-            copy.versionlist = new Object3D[100];
4110
4169
             copy.versionindex = -1;
4111
4170
             
4112
-            Save(true);
4171
+            // Cannot work with loops
4172
+            // To fix this issue, we first mark all nodes above the root,
4173
+            // and check if any of these nodes are reachable below the root.
4174
+            Grafreed.grafreed.universe.TagObjects(copy, true);
4175
+            
4176
+            if (copy instanceof Composite && !copy.HasTags())
4177
+            {
4178
+                if (copy.versionlist == null)
4179
+                    copy.versionlist = new Object3D[100];
4180
+                
4181
+                //Save(true);
4182
+            }
4183
+            else
4184
+                copy.versionindex = -2;
4185
+            
4186
+            Grafreed.grafreed.universe.TagObjects(copy, false);
4113
4187
         }
4114
4188
         
4115
4189
                     SetVersionStates();
..
..
@@ -4227,9 +4301,46 @@
4227
4301
             refreshContents();
4228
4302
         }
4229
4303
         
4304
+        void TextureRatio(int axis)
4305
+        {
4306
+            Object3D obj;
4307
+            for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
4308
+            {
4309
+                    obj = (Object3D)e.nextElement();
4310
+                    obj.TextureRatio(axis);
4311
+            }
4312
+
4313
+            refreshContents();
4314
+        }
4315
+        
4230
4316
         void ResetTransform()
4231
4317
         {
4232
4318
             ResetTransform(-1);
4319
+        }
4320
+        
4321
+        void ScaleSelection(int scale)
4322
+        {
4323
+            Object3D obj;
4324
+            for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
4325
+            {
4326
+                    obj = (Object3D)e.nextElement();
4327
+                    
4328
+                    if (obj.toParent == null)
4329
+                        continue;
4330
+                    
4331
+                    obj.Scale(scale);
4332
+                    
4333
+                    if (obj.parent == null)
4334
+                    {
4335
+                        System.out.println("NULL PARENT!");
4336
+                    //    new Exception().printStackTrace();
4337
+                    }
4338
+                    else
4339
+                        TouchTransform(obj);
4340
+                        //obj.parent.Touch();
4341
+            }
4342
+
4343
+            refreshContents();
4233
4344
         }
4234
4345
         
4235
4346
         void ResetTransform(int mask)
..
..
@@ -4242,42 +4353,8 @@
4242
4353
                     if (obj.toParent == null)
4243
4354
                         continue;
4244
4355
                     
4245
-                    if (mask == -1)
4246
-                    {
4247
-                        if (obj instanceof Camera) // jan 2014
4248
-                        {
4249
-                            LA.matIdentity(obj.toParent);
4250
-                            LA.matIdentity(obj.fromParent);
4251
-                        }
4252
-                        else
4253
-                        {
4254
-                            obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
4255
-                            obj.fromParent = null; // LA.matIdentity(obj.fromParent);
4256
-                        }
4257
-                        TouchTransform(obj);
4258
-                        continue;
4259
-                    }
4260
-                    if ((mask&2) != 0) // Scale
4261
-                    {
4262
-                        obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4263
-                        obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
4264
-                        obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
4265
-                        obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4266
-                        obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4267
-                        obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4268
-                    }
4269
-                    if ((mask&4) != 0) // Rotation
4270
-                    {
4271
-                        // ?
4272
-                    }
4273
-                    if ((mask&1) != 0) // Translation
4274
-                    {
4275
-                        if (obj.toParent != null)
4276
-                        {
4277
-                            obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
4278
-                            obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
4279
-                        }
4280
-                    }
4356
+                    obj.ResetTransform(mask);
4357
+                    
4281
4358
                     if (obj.parent == null)
4282
4359
                     {
4283
4360
                         System.out.println("NULL PARENT!");
..
..
@@ -4786,10 +4863,17 @@
4786
4863
             {
4787
4864
 		Object3D obj = group.selection.get(i);
4788
4865
                 
4866
+                if (obj.toParent == null)
4867
+                {
4868
+                    obj.toParent = LA.newMatrix();
4869
+                    obj.fromParent = LA.newMatrix();
4870
+                }
4871
+                
4789
4872
                 LA.matTranslate(obj.toParent, i * scale, 0, 0);
4790
4873
                 LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4791
4874
             }
4792
4875
             
4876
+            Globals.lighttouched = true;
4793
4877
             refreshContents();
4794
4878
 	}
4795
4879
 	
..
..
@@ -5077,6 +5161,12 @@
5077
5161
 		refreshContents();
5078
5162
 	}
5079
5163
 	
5164
+	void ClearVersions()
5165
+	{
5166
+		group.selection.ClearVersions();
5167
+		refreshContents();
5168
+	}
5169
+	
5080
5170
 	void FlipV(boolean flip)
5081
5171
 	{
5082
5172
 		group.selection.FlipV(flip);
..
..
@@ -5315,10 +5405,10 @@
5315
5405
 			if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
5316
5406
                             // a camera
5317
5407
                         {
5318
-                            if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
5408
+                            if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
5319
5409
                             {
5320
5410
                                 CameraPane.camerachangeframe = 0; // don't refuse it
5321
-                                Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
5411
+                                Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent(), true);
5322
5412
                             }
5323
5413
                          //   Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
5324
5414
                          //   Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
..
..
@@ -5354,18 +5444,20 @@
5354
5444
             if (group.selection != null)
5355
5445
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5356
5446
             {
5357
-                    if (!(e.nextElement() instanceof Composite))
5447
+                    Object next = e.nextElement();
5448
+                    if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5358
5449
                     {
5359
5450
                         allComposites = false;
5360
5451
                         break;
5361
5452
                     }
5362
5453
             }
5363
5454
             
5364
-            rootButton.setEnabled(allComposites);
5455
+            rootButton.setEnabled(true); // allComposites);
5365
5456
         }
5366
5457
 
5367
5458
         void refreshContents(boolean cp)
5368
5459
         {
5460
+            if (Globals.SHOWINFO)
5369
5461
             //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5370
5462
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5371
5463
             {
..
..
@@ -6316,6 +6408,7 @@
6316
6408
 	private MenuItem clipMeshItem;
6317
6409
 	private MenuItem smoothMeshItem;
6318
6410
 	private MenuItem clearMaterialsItem;
6411
+	private MenuItem clearVersionsItem;
6319
6412
         
6320
6413
 	private MenuItem liveleavesItem;
6321
6414
 	private MenuItem unliveleavesItem;
..
..
@@ -6339,13 +6432,16 @@
6339
6432
 	private MenuItem maxTexturesItem;
6340
6433
 	private MenuItem panoTexturesItem;
6341
6434
         
6435
+	private MenuItem textureRatioRItem;
6436
+	private MenuItem textureRatioGItem;
6437
+	private MenuItem textureRatioBItem;
6342
6438
 	private MenuItem resetCentroidItem;
6343
6439
 	private MenuItem resetCentroidXZItem;
6344
6440
 	private MenuItem resetTransformItem;
6345
6441
 	private MenuItem transformGeometryItem;
6346
6442
 	private MenuItem transformChildrenItem;
6347
6443
 	private MenuItem hideItem;
6348
-	private MenuItem grabItem;
6444
+	private JMenuItem grabItem;
6349
6445
 	private MenuItem backItem;
6350
6446
 	private MenuItem frontItem;
6351
6447
 	private MenuItem cameraItem;