Figure panel.

Normand Briere

2019-09-02 21ac57b36a9e3b909853c7d64ac29b7ad72490a3

 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)
..
..
@@ -569,9 +561,6 @@
569
561
 //		pasteExpandItem.addActionListener(this);
570
562
 		//menu.add("-");
571
563
                 oe.jTree.popup.addSeparator();
572
-                
573
-		deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
574
-		deleteItem.addActionListener(this);
575
564
                 
576
565
         if (Globals.ADVANCED)
577
566
         {
..
..
@@ -706,15 +695,17 @@
706
695
 		setMasterItem.addActionListener(this);
707
696
         }
708
697
                 
709
-		oe.menuBar.add(menu = new Menu("Group"));
710
-//		grabItem = menu.add(new MenuItem("Grab"));
711
-//		grabItem.addActionListener(this);
698
+		oe.menuBar.add(menu = new Menu("Order"));
699
+                
712
700
 		backItem = menu.add(new MenuItem("Back"));
713
701
 		backItem.addActionListener(this);
714
702
 		frontItem = menu.add(new MenuItem("Front"));
715
703
 		frontItem.addActionListener(this);
716
704
 //		compositeItem = menu.add(new MenuItem("Composite"));
717
705
 //		compositeItem.addActionListener(this);
706
+                
707
+		grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
708
+		grabItem.addActionListener(this);
718
709
                 
719
710
         if (Globals.ADVANCED)
720
711
         {
..
..
@@ -723,6 +714,11 @@
723
714
         }
724
715
 		ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
725
716
 		ungroupItem.addActionListener(this);
717
+                
718
+                oe.jTree.popup.addSeparator();
719
+                
720
+		deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
721
+		deleteItem.addActionListener(this);
726
722
                 
727
723
 //		menu.add("-");
728
724
 //                
..
..
@@ -759,9 +755,9 @@
759
755
 		shadowYItem.addActionListener(this);
760
756
                 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
761
757
 		shadowZItem.addActionListener(this);
758
+                
762
759
 		attributeItem = menu.add(new MenuItem("Attribute"));
763
760
 		attributeItem.addActionListener(this);
764
-                
765
761
         if (Globals.ADVANCED)
766
762
         {
767
763
 		menu.add("-");
..
..
@@ -773,11 +769,18 @@
773
769
 		pointflowItem.addActionListener(this);
774
770
         }
775
771
 		menu.add("-");
772
+		textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
773
+		textureRatioRItem.addActionListener(this);
774
+		textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
775
+		textureRatioGItem.addActionListener(this);
776
+		textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
777
+		textureRatioBItem.addActionListener(this);
778
+		menu.add("-");
776
779
 		resetTransformItem = menu.add(new MenuItem("Reset Transform"));
777
780
 		resetTransformItem.addActionListener(this);
778
781
 		resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
779
782
 		resetCentroidItem.addActionListener(this);
780
-		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
783
+		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
781
784
 		resetCentroidXZItem.addActionListener(this);
782
785
 		transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
783
786
 		transformGeometryItem.addActionListener(this);
..
..
@@ -829,6 +832,8 @@
829
832
         }
830
833
 
831
834
                 oe.menuBar.add(menu = new Menu("Attributes"));
835
+		clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
836
+		clearVersionsItem.addActionListener(this);
832
837
 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
833
838
 		clearMaterialsItem.addActionListener(this);
834
839
                 resetAllItem = menu.add(new MenuItem("Reset All"));
..
..
@@ -851,9 +856,9 @@
851
856
 		hideleavesItem.addActionListener(this);
852
857
 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
853
858
 		showleavesItem.addActionListener(this);
854
-		markleavesItem = menu.add(new MenuItem("Mark Leaves"));
859
+		markleavesItem = menu.add(new MenuItem("Anim Leaves"));
855
860
 		markleavesItem.addActionListener(this);
856
-		unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
861
+		unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
857
862
 		unmarkleavesItem.addActionListener(this);
858
863
 		rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
859
864
 		rewindleavesItem.addActionListener(this);
..
..
@@ -930,6 +935,8 @@
930
935
         cGridBag currenttab;
931
936
         //boolean added; // patch for jar
932
937
                 
938
+        int totalcount = 0;
939
+        
933
940
         int tabcount = 0;
934
941
         int colcount = 0;
935
942
         int rowcount = 0;
..
..
@@ -958,7 +965,7 @@
958
965
             texturecount = 0;
959
966
         }
960
967
         
961
-        if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
968
+        if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
962
969
         {
963
970
             //if (!added)
964
971
             {
..
..
@@ -967,7 +974,8 @@
967
974
                 currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
968
975
             }
969
976
             
970
-            AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
977
+            AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
978
+            totalcount++;
971
979
             
972
980
             if (++colcount >= columns)
973
981
             {
..
..
@@ -993,6 +1001,8 @@
993
1001
             container.add(resourcecontainer);
994
1002
             
995
1003
             Grafreed.ParseResources("textures", this);
1004
+            
1005
+            // 935. System.out.println("Total = " + totalcount);
996
1006
         }
997
1007
         
998
1008
 	void SetupUI2(ObjEditor oe)
..
..
@@ -1032,9 +1042,9 @@
1032
1042
         oe.radioPanel.add(dummyButton);
1033
1043
         oe.buttonGroup.add(dummyButton);
1034
1044
          */
1035
-                cGridBag copyOptionsPanel = new cGridBag();
1045
+                cGridBag versionManagerPanel = new cGridBag();
1036
1046
                                         
1037
-                copyOptionsPanel.preferredHeight = 2;
1047
+                versionManagerPanel.preferredHeight = 4;
1038
1048
                 
1039
1049
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1040
1050
                 
..
..
@@ -1061,25 +1071,29 @@
1061
1071
 //                        }
1062
1072
 //                });
1063
1073
                 
1064
-		oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1074
+		oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1075
+                fullScreenButton.setToolTipText("Full-screen window");
1076
+		fullScreenButton.addActionListener(this);
1077
+                
1078
+		oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1065
1079
                 collapseButton.setToolTipText("Collapse toolbar");
1066
1080
 		collapseButton.addActionListener(this);
1067
1081
                 
1068
-		oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1069
-                maximize3DButton.setToolTipText("Maximize 3D view");
1070
-		maximize3DButton.addActionListener(this);
1082
+//		oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1083
+//                maximize3DButton.setToolTipText("Maximize 3D view");
1084
+//		maximize3DButton.addActionListener(this);
1071
1085
                 
1072
-		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1086
+		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1073
1087
                 twoButton.setToolTipText("Show 3D view only");
1074
1088
 		twoButton.addActionListener(this);
1075
1089
                 this.fullscreenLayout = twoButton;
1076
1090
                 
1077
-		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1091
+		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1078
1092
                 threeButton.setToolTipText("Show controls and 3D view");
1079
1093
 		threeButton.addActionListener(this);
1080
1094
                 if (Globals.ADVANCED)
1081
1095
                 {
1082
-		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1096
+		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1083
1097
                 sixButton.setToolTipText("Show 3D view and controls");
1084
1098
 		sixButton.addActionListener(this);
1085
1099
                 }
..
..
@@ -1088,50 +1102,47 @@
1088
1102
 //		sevenButton.addActionListener(this);
1089
1103
                 //
1090
1104
                 
1091
-		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1092
-                fullButton.setToolTipText("Full-screen window");
1093
-		fullButton.addActionListener(this);
1094
-                
1095
-		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1105
+		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1096
1106
                 screenfitButton.setToolTipText("Screen fit");
1097
1107
 		screenfitButton.addActionListener(this);
1098
1108
 
1099
-		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1109
+		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1100
1110
                 restoreCameraButton.setToolTipText("Restore viewpoint");
1101
1111
 		restoreCameraButton.addActionListener(this);
1102
1112
                 
1103
-		copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1113
+		versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1104
1114
                 saveVersionButton.setToolTipText("Duplicate current version");
1105
1115
 		saveVersionButton.addActionListener(this);
1106
1116
                                                 
1107
-		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1117
+		versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1108
1118
                 deleteVersionButton.setToolTipText("Delete current version");
1109
1119
 		deleteVersionButton.addActionListener(this);
1120
+                deleteVersionButton.setEnabled(false);
1110
1121
                                                 
1111
-		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1122
+		versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1112
1123
                 previousVersionButton.setToolTipText("Previous version");
1113
1124
 		previousVersionButton.addActionListener(this);
1114
1125
                 previousVersionButton.setEnabled(false);
1115
1126
                 
1116
1127
                 cGridBag updown = new cGridBag().setVertical(true);
1117
-		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1128
+		updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1118
1129
                 restoreButton.setToolTipText("Undo (restore current version)");
1119
1130
 		restoreButton.addActionListener(this);
1120
-                //restoreButton.setEnabled(false);
1131
+                restoreButton.setEnabled(false);
1121
1132
                 
1122
-		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1133
+		updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1123
1134
                 replaceButton.setToolTipText("Save (replace current version)");
1124
1135
 		replaceButton.addActionListener(this);
1125
-                //replaceButton.setEnabled(false);
1136
+                replaceButton.setEnabled(false);
1126
1137
                 
1127
-                copyOptionsPanel.add(updown);
1138
+                versionManagerPanel.add(updown);
1128
1139
                 
1129
-		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1140
+		versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1130
1141
                 nextVersionButton.setToolTipText("Next version");
1131
1142
 		nextVersionButton.addActionListener(this);
1132
1143
                 nextVersionButton.setEnabled(false);
1133
1144
                 
1134
-		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1145
+		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1135
1146
                 oneStepButton.setToolTipText("Animate one step forward");
1136
1147
 		oneStepButton.addActionListener(this);
1137
1148
                 
..
..
@@ -1154,11 +1165,11 @@
1154
1165
 
1155
1166
                 if (Globals.ADVANCED)
1156
1167
                 {
1157
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1168
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1158
1169
                         snapobjectButton.addActionListener(this);
1159
1170
                         snapobjectButton.setToolTipText("Snap Object");
1160
1171
                         
1161
-		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1172
+		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1162
1173
 		fourButton.addActionListener(this);
1163
1174
                 fourButton.setToolTipText("Show control panel only");
1164
1175
                 }
..
..
@@ -1166,11 +1177,11 @@
1166
1177
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1167
1178
                 
1168
1179
 
1169
-		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1180
+		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1170
1181
                 rootButton.setToolTipText("Open selection in new tab");
1171
1182
 		rootButton.addActionListener(this);
1172
1183
 
1173
-                oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1184
+                oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1174
1185
                 closeButton.setToolTipText("Close tab");
1175
1186
 		closeButton.addActionListener(this);
1176
1187
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..
..
@@ -1179,38 +1190,38 @@
1179
1190
                 cGridBag row1 = new cGridBag();
1180
1191
                 
1181
1192
                 // INSERT
1182
-                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1193
+                row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1183
1194
                 gridButton.setToolTipText("Create ground");
1184
1195
                                 gridButton.addActionListener(this);
1185
1196
 
1186
-                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1197
+                row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1187
1198
                 boxButton.setToolTipText("Create box");
1188
1199
                                 boxButton.addActionListener(this);
1189
1200
 
1190
-                row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1201
+                row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1191
1202
                 superButton.setToolTipText("Create superellipsoid");
1192
1203
                                 superButton.addActionListener(this);
1193
1204
 
1194
-                row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1205
+                row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1195
1206
                 sphereButton.setToolTipText("Create sphere");
1196
1207
                                 sphereButton.addActionListener(this);
1197
1208
 
1198
-                row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1209
+                row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1199
1210
                 coneButton.setToolTipText("Create cone");
1200
1211
                                 coneButton.addActionListener(this);
1201
1212
 
1202
-                row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1213
+                row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1203
1214
                 torusButton.setToolTipText("Create torus");
1204
1215
                                 torusButton.addActionListener(this);
1205
1216
 
1206
-                if (Globals.ADVANCED)
1217
+                if (false) //Globals.ADVANCED)
1207
1218
                 {
1208
-                    oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1219
+                    oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1209
1220
                     kleinButton.setToolTipText("Create Klein bottle");
1210
1221
                                     kleinButton.addActionListener(this);
1211
1222
                 }
1212
1223
                 
1213
-                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1224
+                row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1214
1225
                 particlesButton.setToolTipText("Create particle system");
1215
1226
                                particlesButton.addActionListener(this);
1216
1227
 
..
..
@@ -1218,31 +1229,31 @@
1218
1229
                 
1219
1230
                 cGridBag row2 = new cGridBag();
1220
1231
                 
1221
-                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1232
+                row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1222
1233
                 groupButton.setToolTipText("Create group");
1223
1234
                                groupButton.addActionListener(this);
1224
1235
 
1225
-                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1236
+                row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1226
1237
                 compositeButton.setToolTipText("Create composite");
1227
1238
                                compositeButton.addActionListener(this);
1228
1239
 
1229
-                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1240
+                row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1230
1241
                 switchButton.setToolTipText("Create item switcher");
1231
1242
                                switchButton.addActionListener(this);
1232
1243
 
1233
-                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1244
+                row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1234
1245
                 loopButton.setToolTipText("Create loop");
1235
1246
                                loopButton.addActionListener(this);
1236
1247
 
1237
-                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1248
+                row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1238
1249
                 textureButton.setToolTipText("Create texture");
1239
1250
                                textureButton.addActionListener(this);
1240
1251
 
1241
-                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1252
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1242
1253
                 overlayButton.setToolTipText("Create overlay");
1243
1254
                                overlayButton.addActionListener(this);
1244
1255
 
1245
-                row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1256
+                row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1246
1257
                 lightButton.setToolTipText("Create light");
1247
1258
                                lightButton.addActionListener(this);
1248
1259
 
..
..
@@ -1252,6 +1263,11 @@
1252
1263
                 
1253
1264
                 CreateTexturePanel(textures);
1254
1265
                 
1266
+                int tabCount = resourcecontainer.getTabCount();
1267
+                
1268
+                if (tabCount > 0)
1269
+                    resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1270
+                
1255
1271
                 oe.toolboxPanel.add(textures);
1256
1272
                 
1257
1273
                 textures.preferredHeight = 100;
..
..
@@ -1259,11 +1275,11 @@
1259
1275
                 CreateSkyboxPanel(oe.skyboxPanel);
1260
1276
                 
1261
1277
                 // EDIT panel
1262
-		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1278
+		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1263
1279
                 editButton.setToolTipText("Pin selection controls");
1264
1280
 		editButton.addActionListener(this);
1265
1281
 
1266
-		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1282
+		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1267
1283
                 uneditButton.setToolTipText("Unpin and remove selection controls");
1268
1284
 		uneditButton.addActionListener(this);
1269
1285
 
..
..
@@ -1271,7 +1287,7 @@
1271
1287
                 allParamsButton.setToolTipText("Show all controls");
1272
1288
 		allParamsButton.addActionListener(this);
1273
1289
 
1274
-		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1290
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1275
1291
                 clearPanelButton.setToolTipText("Clear all controls");
1276
1292
 		clearPanelButton.addActionListener(this);
1277
1293
 
..
..
@@ -1279,7 +1295,7 @@
1279
1295
                 //unselectButton.setToolTipText("Unselect");
1280
1296
 		//unselectButton.addActionListener(this);
1281
1297
 
1282
-		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1298
+		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1283
1299
                 flashSelectionButton.setToolTipText("Highlight selection");
1284
1300
 		flashSelectionButton.addActionListener(this);
1285
1301
                 
..
..
@@ -1302,6 +1318,8 @@
1302
1318
                 
1303
1319
                 cGridBag jSPPanel = new cGridBag();
1304
1320
 
1321
+            jSPPanel.preferredHeight = 20;
1322
+            
1305
1323
                 JScrollPane jSP;
1306
1324
 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1307
1325
 		jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..
..
@@ -1310,11 +1328,11 @@
1310
1328
                 oe.treePanel.add(jSPPanel);
1311
1329
                 oe.treePanel.Return();
1312
1330
 
1313
-                oe.treePanel.add(copyOptionsPanel);
1331
+                oe.treePanel.add(versionManagerPanel);
1314
1332
                 oe.treePanel.Return();
1315
-        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1316
-            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1317
-            sliderPane.preferredHeight = 1;
1333
+        versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1334
+            versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1335
+            versionSliderPane.preferredHeight = 3;
1318
1336
                 
1319
1337
 //        mainPanel.setDividerLocation(0.1); //1.0);
1320
1338
         mainPanel.setResizeWeight(0.4);
..
..
@@ -1472,7 +1490,7 @@
1472
1490
 	
1473
1491
         void EditObject(Object3D obj)
1474
1492
         {
1475
-            assert(obj instanceof Composite);
1493
+            //assert(obj instanceof Composite);
1476
1494
             
1477
1495
 //            if (obj.versionlist == null)
1478
1496
 //            {
..
..
@@ -1504,6 +1522,7 @@
1504
1522
                     
1505
1523
             oe.SetupViews();
1506
1524
             
1525
+        if (Globals.DEBUG)
1507
1526
 		System.out.println("SetupViews");
1508
1527
             DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1509
1528
                   oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..
..
@@ -2107,24 +2126,24 @@
2107
2126
             switch(axis)
2108
2127
             {
2109
2128
                 case 0 :
2110
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2111
-                    vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
2112
-                    vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2113
-                    vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
2129
+                    vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
2130
+                    vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
2131
+                    vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
2132
+                    vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
2114
2133
                     norm = cVector.X;
2115
2134
                     break;
2116
2135
                 case 1 :
2117
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2118
-                    vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2119
-                    vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2120
-                    vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
2136
+                    vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
2137
+                    vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
2138
+                    vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
2139
+                    vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
2121
2140
                     norm = cVector.Y;
2122
2141
                     break;
2123
2142
                 case 2 :
2124
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2125
-                    vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2126
-                    vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
2127
-                    vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
2143
+                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
2144
+                    vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
2145
+                    vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
2146
+                    vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
2128
2147
                     norm = cVector.Z;
2129
2148
                     break;
2130
2149
             }
..
..
@@ -2693,11 +2712,11 @@
2693
2712
                     if (!group.selection.isEmpty())
2694
2713
                     {
2695
2714
                         Composite csg = new GroupLeaf();
2715
+			group(csg);
2696
2716
                         csg.count = 5;
2697
2717
                         Composite child = new cGroup("Branch");
2698
2718
                         csg.addChild(child);
2699
2719
                         child.addChild(csg);
2700
-			group(csg);
2701
2720
                     }
2702
2721
 		} else
2703
2722
 		if (source == doubleItem)
..
..
@@ -2705,6 +2724,7 @@
2705
2724
                     if (!group.selection.isEmpty())
2706
2725
                     {
2707
2726
                         Composite csg = new GroupLeaf("Fork");
2727
+			group(csg);
2708
2728
                         csg.count = 5;
2709
2729
                         Composite child = new cGroup("Branch A");
2710
2730
                         csg.addChild(child);
..
..
@@ -2712,7 +2732,6 @@
2712
2732
                         child = new cGroup("Branch B");
2713
2733
                         csg.addChild(child);
2714
2734
                         child.addChild(csg);
2715
-			group(csg);
2716
2735
                     }
2717
2736
 		} else
2718
2737
 		if (source == tripleItem)
..
..
@@ -2778,7 +2797,7 @@
2778
2797
 		{
2779
2798
 			Maximize();
2780
2799
 		} else
2781
-		if (source == fullButton)
2800
+		if (source == fullScreenButton)
2782
2801
 		{
2783
2802
 			ToggleFullScreen();
2784
2803
 		} else
..
..
@@ -2787,13 +2806,13 @@
2787
2806
                         this.expandedLayout = radio.layout;
2788
2807
 			CollapseToolbar();
2789
2808
 		} else
2790
-		if (source == maximize3DButton)
2791
-		{
2792
-                        this.expandedLayout = radio.layout;
2793
-                        radio.layout = twoButton;
2794
-                        Show3DView();
2795
-			CollapseToolbar();
2796
-		} else
2809
+//		if (source == maximize3DButton)
2810
+//		{
2811
+//                        this.expandedLayout = radio.layout;
2812
+//                        radio.layout = twoButton;
2813
+//			CollapseToolbar();
2814
+//                        Show3DView();
2815
+//		} else
2797
2816
 		if (source == previousVersionButton)
2798
2817
 		{
2799
2818
                         // Go to previous version
..
..
@@ -3446,6 +3465,10 @@
3446
3465
                 {
3447
3466
 			ClearMaterials();
3448
3467
 		} else
3468
+		if (source == clearVersionsItem)
3469
+                {
3470
+			ClearVersions();
3471
+		} else
3449
3472
 		if (source == liveleavesItem)
3450
3473
                 {
3451
3474
 			LiveLeaves(true);
..
..
@@ -3585,6 +3608,18 @@
3585
3608
 		if (source == transformChildrenItem)
3586
3609
 		{
3587
3610
                         TransformChildren();
3611
+		} else
3612
+		if (source == textureRatioRItem)
3613
+		{
3614
+                        TextureRatio(0);
3615
+		} else
3616
+		if (source == textureRatioGItem)
3617
+		{
3618
+                        TextureRatio(1);
3619
+		} else
3620
+		if (source == textureRatioBItem)
3621
+		{
3622
+                        TextureRatio(2);
3588
3623
 		} else
3589
3624
 		if (source == resetTransformItem)
3590
3625
 		{
..
..
@@ -3958,6 +3993,9 @@
3958
3993
 		if (source == closeButton)
3959
3994
 		{
3960
3995
 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3996
+                    if (copy.versionlist != null)
3997
+                        Replace();
3998
+                    
3961
3999
                     cRadio ab;
3962
4000
                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3963
4001
                     {
..
..
@@ -4056,6 +4094,9 @@
4056
4094
 		} else
4057
4095
                 if(source instanceof cRadio)
4058
4096
 		{
4097
+                    if (copy.versionlist != null)
4098
+                        Replace();
4099
+                    
4059
4100
                     group.parent = keepparent;
4060
4101
                         group.attributes = 0;
4061
4102
                     //group.editWindow = null;
..
..
@@ -4107,14 +4148,28 @@
4107
4148
                      */
4108
4149
                     radio.layout.doClick();
4109
4150
                     
4110
-                    assert(copy instanceof Composite);
4151
+                    //assert(copy instanceof Composite);
4111
4152
                     
4112
4153
         if (copy.versionlist == null)
4113
4154
         {
4114
-            copy.versionlist = new Object3D[100];
4115
4155
             copy.versionindex = -1;
4116
4156
             
4117
-            Save(true);
4157
+            // Cannot work with loops
4158
+            // To fix this issue, we first mark all nodes above the root,
4159
+            // and check if any of these nodes are reachable below the root.
4160
+            Grafreed.grafreed.universe.TagObjects(copy, true);
4161
+            
4162
+            if (copy instanceof Composite && !copy.HasTags())
4163
+            {
4164
+                if (copy.versionlist == null)
4165
+                    copy.versionlist = new Object3D[100];
4166
+                
4167
+                //Save(true);
4168
+            }
4169
+            else
4170
+                copy.versionindex = -2;
4171
+            
4172
+            Grafreed.grafreed.universe.TagObjects(copy, false);
4118
4173
         }
4119
4174
         
4120
4175
                     SetVersionStates();
..
..
@@ -4232,6 +4287,18 @@
4232
4287
             refreshContents();
4233
4288
         }
4234
4289
         
4290
+        void TextureRatio(int axis)
4291
+        {
4292
+            Object3D obj;
4293
+            for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
4294
+            {
4295
+                    obj = (Object3D)e.nextElement();
4296
+                    obj.TextureRatio(axis);
4297
+            }
4298
+
4299
+            refreshContents();
4300
+        }
4301
+        
4235
4302
         void ResetTransform()
4236
4303
         {
4237
4304
             ResetTransform(-1);
..
..
@@ -4247,42 +4314,8 @@
4247
4314
                     if (obj.toParent == null)
4248
4315
                         continue;
4249
4316
                     
4250
-                    if (mask == -1)
4251
-                    {
4252
-                        if (obj instanceof Camera) // jan 2014
4253
-                        {
4254
-                            LA.matIdentity(obj.toParent);
4255
-                            LA.matIdentity(obj.fromParent);
4256
-                        }
4257
-                        else
4258
-                        {
4259
-                            obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
4260
-                            obj.fromParent = null; // LA.matIdentity(obj.fromParent);
4261
-                        }
4262
-                        TouchTransform(obj);
4263
-                        continue;
4264
-                    }
4265
-                    if ((mask&2) != 0) // Scale
4266
-                    {
4267
-                        obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4268
-                        obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
4269
-                        obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
4270
-                        obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4271
-                        obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4272
-                        obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4273
-                    }
4274
-                    if ((mask&4) != 0) // Rotation
4275
-                    {
4276
-                        // ?
4277
-                    }
4278
-                    if ((mask&1) != 0) // Translation
4279
-                    {
4280
-                        if (obj.toParent != null)
4281
-                        {
4282
-                            obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
4283
-                            obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
4284
-                        }
4285
-                    }
4317
+                    obj.ResetTransform(mask);
4318
+                    
4286
4319
                     if (obj.parent == null)
4287
4320
                     {
4288
4321
                         System.out.println("NULL PARENT!");
..
..
@@ -4791,6 +4824,12 @@
4791
4824
             {
4792
4825
 		Object3D obj = group.selection.get(i);
4793
4826
                 
4827
+                if (obj.toParent == null)
4828
+                {
4829
+                    obj.toParent = LA.newMatrix();
4830
+                    obj.fromParent = LA.newMatrix();
4831
+                }
4832
+                
4794
4833
                 LA.matTranslate(obj.toParent, i * scale, 0, 0);
4795
4834
                 LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4796
4835
             }
..
..
@@ -5082,6 +5121,12 @@
5082
5121
 		refreshContents();
5083
5122
 	}
5084
5123
 	
5124
+	void ClearVersions()
5125
+	{
5126
+		group.selection.ClearVersions();
5127
+		refreshContents();
5128
+	}
5129
+	
5085
5130
 	void FlipV(boolean flip)
5086
5131
 	{
5087
5132
 		group.selection.FlipV(flip);
..
..
@@ -5320,7 +5365,7 @@
5320
5365
 			if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
5321
5366
                             // a camera
5322
5367
                         {
5323
-                            if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
5368
+                            if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
5324
5369
                             {
5325
5370
                                 CameraPane.camerachangeframe = 0; // don't refuse it
5326
5371
                                 Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..
..
@@ -5359,18 +5404,20 @@
5359
5404
             if (group.selection != null)
5360
5405
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5361
5406
             {
5362
-                    if (!(e.nextElement() instanceof Composite))
5407
+                    Object next = e.nextElement();
5408
+                    if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5363
5409
                     {
5364
5410
                         allComposites = false;
5365
5411
                         break;
5366
5412
                     }
5367
5413
             }
5368
5414
             
5369
-            rootButton.setEnabled(allComposites);
5415
+            rootButton.setEnabled(true); // allComposites);
5370
5416
         }
5371
5417
 
5372
5418
         void refreshContents(boolean cp)
5373
5419
         {
5420
+            if (Globals.SHOWINFO)
5374
5421
             //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5375
5422
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5376
5423
             {
..
..
@@ -6321,6 +6368,7 @@
6321
6368
 	private MenuItem clipMeshItem;
6322
6369
 	private MenuItem smoothMeshItem;
6323
6370
 	private MenuItem clearMaterialsItem;
6371
+	private MenuItem clearVersionsItem;
6324
6372
         
6325
6373
 	private MenuItem liveleavesItem;
6326
6374
 	private MenuItem unliveleavesItem;
..
..
@@ -6344,13 +6392,16 @@
6344
6392
 	private MenuItem maxTexturesItem;
6345
6393
 	private MenuItem panoTexturesItem;
6346
6394
         
6395
+	private MenuItem textureRatioRItem;
6396
+	private MenuItem textureRatioGItem;
6397
+	private MenuItem textureRatioBItem;
6347
6398
 	private MenuItem resetCentroidItem;
6348
6399
 	private MenuItem resetCentroidXZItem;
6349
6400
 	private MenuItem resetTransformItem;
6350
6401
 	private MenuItem transformGeometryItem;
6351
6402
 	private MenuItem transformChildrenItem;
6352
6403
 	private MenuItem hideItem;
6353
-	private MenuItem grabItem;
6404
+	private JMenuItem grabItem;
6354
6405
 	private MenuItem backItem;
6355
6406
 	private MenuItem frontItem;
6356
6407
 	private MenuItem cameraItem;