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
..
..
@@ -540,33 +537,37 @@
540
537
 //		menu.add("-");
541
538
 		duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
542
539
 		duplicateItem.addActionListener(this);
543
-		cloneItem = menu.add(new MenuItem("Clone"));
540
+                
541
+		cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
544
542
 		cloneItem.addActionListener(this);
545
-        if (Globals.ADVANCED)
543
+        //if (Globals.ADVANCED)
546
544
         {
547
545
 		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
548
546
 		cloneSupportItem.addActionListener(this);
549
547
         }
548
+                oe.jTree.popup.addSeparator();
550
549
 		menu.add("-");
551
-		cutItem = menu.add(new MenuItem("Cut"));
550
+		cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
552
551
 		cutItem.addActionListener(this);
553
-		copyItem = menu.add(new MenuItem("Copy"));
552
+		copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
554
553
 		copyItem.addActionListener(this);
555
554
 		pasteItem = menu.add(new MenuItem("Paste"));
556
555
 		pasteItem.addActionListener(this);
557
556
                 
558
-		menu.add("-");
559
-		pasteIntoItem = menu.add(new MenuItem("Paste into"));
557
+                oe.jTree.popup.addSeparator();
558
+		//menu.add("-");
559
+		pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
560
560
 		pasteIntoItem.addActionListener(this);
561
-		pasteLinkItem = menu.add(new MenuItem("Paste link"));
561
+		pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
562
562
 		pasteLinkItem.addActionListener(this);
563
-		pasteCloneItem = menu.add(new MenuItem("Paste clone"));
563
+		pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
564
564
 		pasteCloneItem.addActionListener(this);
565
-//		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
566
-//		pasteExpandItem.addActionListener(this);
567
-		menu.add("-");
568
-		deleteItem = menu.add(new MenuItem("Delete"));
569
-		deleteItem.addActionListener(this);
565
+// CRASH
566
+                pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
567
+//		
568
+                pasteExpandItem.addActionListener(this);
569
+		//menu.add("-");
570
+                oe.jTree.popup.addSeparator();
570
571
                 
571
572
         if (Globals.ADVANCED)
572
573
         {
..
..
@@ -701,9 +702,8 @@
701
702
 		setMasterItem.addActionListener(this);
702
703
         }
703
704
                 
704
-		oe.menuBar.add(menu = new Menu("Group"));
705
-//		grabItem = menu.add(new MenuItem("Grab"));
706
-//		grabItem.addActionListener(this);
705
+		oe.menuBar.add(menu = new Menu("Order"));
706
+                
707
707
 		backItem = menu.add(new MenuItem("Back"));
708
708
 		backItem.addActionListener(this);
709
709
 		frontItem = menu.add(new MenuItem("Front"));
..
..
@@ -711,13 +711,21 @@
711
711
 //		compositeItem = menu.add(new MenuItem("Composite"));
712
712
 //		compositeItem.addActionListener(this);
713
713
                 
714
+		grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
715
+		grabItem.addActionListener(this);
716
+                
714
717
         if (Globals.ADVANCED)
715
718
         {
716
719
 		hideItem = menu.add(new MenuItem("Hidden Group"));
717
720
 		hideItem.addActionListener(this);
718
721
         }
719
-		ungroupItem = menu.add(new MenuItem("Ungroup"));
722
+		ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
720
723
 		ungroupItem.addActionListener(this);
724
+                
725
+                oe.jTree.popup.addSeparator();
726
+                
727
+		deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
728
+		deleteItem.addActionListener(this);
721
729
                 
722
730
 //		menu.add("-");
723
731
 //                
..
..
@@ -754,9 +762,9 @@
754
762
 		shadowYItem.addActionListener(this);
755
763
                 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
756
764
 		shadowZItem.addActionListener(this);
765
+                
757
766
 		attributeItem = menu.add(new MenuItem("Attribute"));
758
767
 		attributeItem.addActionListener(this);
759
-                
760
768
         if (Globals.ADVANCED)
761
769
         {
762
770
 		menu.add("-");
..
..
@@ -768,11 +776,18 @@
768
776
 		pointflowItem.addActionListener(this);
769
777
         }
770
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("-");
771
786
 		resetTransformItem = menu.add(new MenuItem("Reset Transform"));
772
787
 		resetTransformItem.addActionListener(this);
773
788
 		resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
774
789
 		resetCentroidItem.addActionListener(this);
775
-		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
790
+		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
776
791
 		resetCentroidXZItem.addActionListener(this);
777
792
 		transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
778
793
 		transformGeometryItem.addActionListener(this);
..
..
@@ -788,7 +803,7 @@
788
803
 		genNormalsCADItem.addActionListener(this);
789
804
 		genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
790
805
 		genNormalsMESHItem.addActionListener(this);
791
-        if (Globals.ADVANCED)
806
+        //if (Globals.ADVANCED)
792
807
         {
793
808
 		genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
794
809
 		genNormalsMINEItem.addActionListener(this);
..
..
@@ -824,6 +839,8 @@
824
839
         }
825
840
 
826
841
                 oe.menuBar.add(menu = new Menu("Attributes"));
842
+		clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
843
+		clearVersionsItem.addActionListener(this);
827
844
 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
828
845
 		clearMaterialsItem.addActionListener(this);
829
846
                 resetAllItem = menu.add(new MenuItem("Reset All"));
..
..
@@ -846,9 +863,9 @@
846
863
 		hideleavesItem.addActionListener(this);
847
864
 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
848
865
 		showleavesItem.addActionListener(this);
849
-		markleavesItem = menu.add(new MenuItem("Mark Leaves"));
866
+		markleavesItem = menu.add(new MenuItem("Anim Leaves"));
850
867
 		markleavesItem.addActionListener(this);
851
-		unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
868
+		unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
852
869
 		unmarkleavesItem.addActionListener(this);
853
870
 		rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
854
871
 		rewindleavesItem.addActionListener(this);
..
..
@@ -923,8 +940,10 @@
923
940
 	
924
941
         JTabbedPane resourcecontainer;
925
942
         cGridBag currenttab;
926
-        boolean added; // patch for jar
943
+        //boolean added; // patch for jar
927
944
                 
945
+        int totalcount = 0;
946
+        
928
947
         int tabcount = 0;
929
948
         int colcount = 0;
930
949
         int rowcount = 0;
..
..
@@ -940,28 +959,35 @@
940
959
 //        System.out.println();
941
960
         
942
961
         if (//rowcount == 0 ||
943
-                path.length == 1)
962
+                path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
944
963
         {
945
964
             currenttab = new cGridBag();
946
-            added = false;
947
965
             String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
948
966
             currenttab.setName(tabname);
967
+            //added = false;
968
+            resourcecontainer.add(currenttab);
969
+            resourcecontainer.setToolTipTextAt(tabcount++, "Texture " + tabname);
949
970
             rowcount = 1;
950
971
             colcount = 0;
951
972
             texturecount = 0;
952
973
         }
953
974
         
954
-        if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
975
+        if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
955
976
         {
956
-            if (!added)
977
+            //if (!added)
957
978
             {
958
-                added = true;
959
-                resourcecontainer.add(currenttab);
979
+                //added = true;
960
980
                 String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
961
-                resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
981
+                currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
962
982
             }
963
983
             
964
-            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++;
965
991
             
966
992
             if (++colcount >= columns)
967
993
             {
..
..
@@ -987,6 +1013,8 @@
987
1013
             container.add(resourcecontainer);
988
1014
             
989
1015
             Grafreed.ParseResources("textures", this);
1016
+            
1017
+            // 935. System.out.println("Total = " + totalcount);
990
1018
         }
991
1019
         
992
1020
 	void SetupUI2(ObjEditor oe)
..
..
@@ -1026,9 +1054,9 @@
1026
1054
         oe.radioPanel.add(dummyButton);
1027
1055
         oe.buttonGroup.add(dummyButton);
1028
1056
          */
1029
-                cGridBag copyOptionsPanel = new cGridBag();
1057
+                cGridBag versionManagerPanel = new cGridBag();
1030
1058
                                         
1031
-                copyOptionsPanel.preferredHeight = 2;
1059
+                versionManagerPanel.preferredHeight = 4;
1032
1060
                 
1033
1061
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1034
1062
                 
..
..
@@ -1055,25 +1083,29 @@
1055
1083
 //                        }
1056
1084
 //                });
1057
1085
                 
1058
-		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);
1059
1091
                 collapseButton.setToolTipText("Collapse toolbar");
1060
1092
 		collapseButton.addActionListener(this);
1061
1093
                 
1062
-		oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1063
-                maximize3DButton.setToolTipText("Maximize 3D view");
1064
-		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);
1065
1097
                 
1066
-		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);
1067
1099
                 twoButton.setToolTipText("Show 3D view only");
1068
1100
 		twoButton.addActionListener(this);
1069
1101
                 this.fullscreenLayout = twoButton;
1070
1102
                 
1071
-		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);
1072
1104
                 threeButton.setToolTipText("Show controls and 3D view");
1073
1105
 		threeButton.addActionListener(this);
1074
1106
                 if (Globals.ADVANCED)
1075
1107
                 {
1076
-		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);
1077
1109
                 sixButton.setToolTipText("Show 3D view and controls");
1078
1110
 		sixButton.addActionListener(this);
1079
1111
                 }
..
..
@@ -1082,50 +1114,47 @@
1082
1114
 //		sevenButton.addActionListener(this);
1083
1115
                 //
1084
1116
                 
1085
-		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1086
-                fullButton.setToolTipText("Full-screen window");
1087
-		fullButton.addActionListener(this);
1088
-                
1089
-		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);
1090
1118
                 screenfitButton.setToolTipText("Screen fit");
1091
1119
 		screenfitButton.addActionListener(this);
1092
1120
 
1093
-		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);
1094
1122
                 restoreCameraButton.setToolTipText("Restore viewpoint");
1095
1123
 		restoreCameraButton.addActionListener(this);
1096
1124
                 
1097
-		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);
1098
1126
                 saveVersionButton.setToolTipText("Duplicate current version");
1099
1127
 		saveVersionButton.addActionListener(this);
1100
1128
                                                 
1101
-		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1129
+		versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1102
1130
                 deleteVersionButton.setToolTipText("Delete current version");
1103
1131
 		deleteVersionButton.addActionListener(this);
1132
+                deleteVersionButton.setEnabled(false);
1104
1133
                                                 
1105
-		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1134
+		versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1106
1135
                 previousVersionButton.setToolTipText("Previous version");
1107
1136
 		previousVersionButton.addActionListener(this);
1108
1137
                 previousVersionButton.setEnabled(false);
1109
1138
                 
1110
1139
                 cGridBag updown = new cGridBag().setVertical(true);
1111
-		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1140
+		updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1112
1141
                 restoreButton.setToolTipText("Undo (restore current version)");
1113
1142
 		restoreButton.addActionListener(this);
1114
-                //restoreButton.setEnabled(false);
1143
+                restoreButton.setEnabled(false);
1115
1144
                 
1116
-		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1145
+		updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1117
1146
                 replaceButton.setToolTipText("Save (replace current version)");
1118
1147
 		replaceButton.addActionListener(this);
1119
-                //replaceButton.setEnabled(false);
1148
+                replaceButton.setEnabled(false);
1120
1149
                 
1121
-                copyOptionsPanel.add(updown);
1150
+                versionManagerPanel.add(updown);
1122
1151
                 
1123
-		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1152
+		versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1124
1153
                 nextVersionButton.setToolTipText("Next version");
1125
1154
 		nextVersionButton.addActionListener(this);
1126
1155
                 nextVersionButton.setEnabled(false);
1127
1156
                 
1128
-		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);
1129
1158
                 oneStepButton.setToolTipText("Animate one step forward");
1130
1159
 		oneStepButton.addActionListener(this);
1131
1160
                 
..
..
@@ -1148,11 +1177,11 @@
1148
1177
 
1149
1178
                 if (Globals.ADVANCED)
1150
1179
                 {
1151
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1180
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1152
1181
                         snapobjectButton.addActionListener(this);
1153
1182
                         snapobjectButton.setToolTipText("Snap Object");
1154
1183
                         
1155
-		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);
1156
1185
 		fourButton.addActionListener(this);
1157
1186
                 fourButton.setToolTipText("Show control panel only");
1158
1187
                 }
..
..
@@ -1160,83 +1189,85 @@
1160
1189
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1161
1190
                 
1162
1191
 
1163
-		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);
1164
1193
                 rootButton.setToolTipText("Open selection in new tab");
1165
1194
 		rootButton.addActionListener(this);
1166
1195
 
1167
-                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);
1168
1197
                 closeButton.setToolTipText("Close tab");
1169
1198
 		closeButton.addActionListener(this);
1170
1199
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
1171
1200
 		//clearButton.addActionListener(this);
1172
1201
 
1173
1202
                 cGridBag row1 = new cGridBag();
1203
+                row1.preferredHeight = 8;
1174
1204
                 
1175
1205
                 // INSERT
1176
-                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1206
+                row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1177
1207
                 gridButton.setToolTipText("Create ground");
1178
1208
                                 gridButton.addActionListener(this);
1179
1209
 
1180
-                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1210
+                row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1181
1211
                 boxButton.setToolTipText("Create box");
1182
1212
                                 boxButton.addActionListener(this);
1183
1213
 
1184
-                row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1185
-                sphereButton.setToolTipText("Create sphere");
1186
-                                sphereButton.addActionListener(this);
1187
-
1188
-                row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1189
-                coneButton.setToolTipText("Create cone");
1190
-                                coneButton.addActionListener(this);
1191
-
1192
-                row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1193
-                torusButton.setToolTipText("Create torus");
1194
-                                torusButton.addActionListener(this);
1195
-
1196
-                row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1214
+                row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1197
1215
                 superButton.setToolTipText("Create superellipsoid");
1198
1216
                                 superButton.addActionListener(this);
1199
1217
 
1200
-                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)
1201
1231
                 {
1202
-                    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);
1203
1233
                     kleinButton.setToolTipText("Create Klein bottle");
1204
1234
                                     kleinButton.addActionListener(this);
1205
1235
                 }
1206
1236
                 
1207
-                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1237
+                row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1208
1238
                 particlesButton.setToolTipText("Create particle system");
1209
1239
                                particlesButton.addActionListener(this);
1210
1240
 
1211
1241
                 oe.toolboxPanel.add(row1);
1212
1242
                 
1213
1243
                 cGridBag row2 = new cGridBag();
1244
+                row2.preferredHeight = 8;
1214
1245
                 
1215
-                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1246
+                row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1216
1247
                 groupButton.setToolTipText("Create group");
1217
1248
                                groupButton.addActionListener(this);
1218
1249
 
1219
-                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1250
+                row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1220
1251
                 compositeButton.setToolTipText("Create composite");
1221
1252
                                compositeButton.addActionListener(this);
1222
1253
 
1223
-                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1254
+                row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1224
1255
                 switchButton.setToolTipText("Create item switcher");
1225
1256
                                switchButton.addActionListener(this);
1226
1257
 
1227
-                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1258
+                row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1228
1259
                 loopButton.setToolTipText("Create loop");
1229
1260
                                loopButton.addActionListener(this);
1230
1261
 
1231
-                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1262
+                row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1232
1263
                 textureButton.setToolTipText("Create texture");
1233
1264
                                textureButton.addActionListener(this);
1234
1265
 
1235
-                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1266
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1236
1267
                 overlayButton.setToolTipText("Create overlay");
1237
1268
                                overlayButton.addActionListener(this);
1238
1269
 
1239
-                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);
1240
1271
                 lightButton.setToolTipText("Create light");
1241
1272
                                lightButton.addActionListener(this);
1242
1273
 
..
..
@@ -1246,6 +1277,11 @@
1246
1277
                 
1247
1278
                 CreateTexturePanel(textures);
1248
1279
                 
1280
+                int tabCount = resourcecontainer.getTabCount();
1281
+                
1282
+                if (tabCount > 0)
1283
+                    resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1284
+                
1249
1285
                 oe.toolboxPanel.add(textures);
1250
1286
                 
1251
1287
                 textures.preferredHeight = 100;
..
..
@@ -1253,11 +1289,11 @@
1253
1289
                 CreateSkyboxPanel(oe.skyboxPanel);
1254
1290
                 
1255
1291
                 // EDIT panel
1256
-		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1292
+		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1257
1293
                 editButton.setToolTipText("Pin selection controls");
1258
1294
 		editButton.addActionListener(this);
1259
1295
 
1260
-		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1296
+		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1261
1297
                 uneditButton.setToolTipText("Unpin and remove selection controls");
1262
1298
 		uneditButton.addActionListener(this);
1263
1299
 
..
..
@@ -1265,7 +1301,7 @@
1265
1301
                 allParamsButton.setToolTipText("Show all controls");
1266
1302
 		allParamsButton.addActionListener(this);
1267
1303
 
1268
-		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1304
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1269
1305
                 clearPanelButton.setToolTipText("Clear all controls");
1270
1306
 		clearPanelButton.addActionListener(this);
1271
1307
 
..
..
@@ -1273,7 +1309,7 @@
1273
1309
                 //unselectButton.setToolTipText("Unselect");
1274
1310
 		//unselectButton.addActionListener(this);
1275
1311
 
1276
-		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);
1277
1313
                 flashSelectionButton.setToolTipText("Highlight selection");
1278
1314
 		flashSelectionButton.addActionListener(this);
1279
1315
                 
..
..
@@ -1296,6 +1332,8 @@
1296
1332
                 
1297
1333
                 cGridBag jSPPanel = new cGridBag();
1298
1334
 
1335
+            jSPPanel.preferredHeight = 20;
1336
+            
1299
1337
                 JScrollPane jSP;
1300
1338
 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1301
1339
 		jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..
..
@@ -1304,11 +1342,12 @@
1304
1342
                 oe.treePanel.add(jSPPanel);
1305
1343
                 oe.treePanel.Return();
1306
1344
 
1307
-                oe.treePanel.add(copyOptionsPanel);
1345
+                oe.treePanel.add(versionManagerPanel);
1308
1346
                 oe.treePanel.Return();
1309
-        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1310
-            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1311
-            sliderPane.preferredHeight = 1;
1347
+                
1348
+        versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1349
+            versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1350
+            versionSliderPane.preferredHeight = 3;
1312
1351
                 
1313
1352
 //        mainPanel.setDividerLocation(0.1); //1.0);
1314
1353
         mainPanel.setResizeWeight(0.4);
..
..
@@ -1365,7 +1404,7 @@
1365
1404
 //                supportCB.setToolTipText("Enable rigging");
1366
1405
 //                                supportCB.addItemListener(this);
1367
1406
 
1368
-                panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
1407
+                panel.add(freezeCB = new cCheckBox("Fast cam", Globals.FREEZEONMOVE)); //, constraints);
1369
1408
                 freezeCB.setToolTipText("Fast moving camera");
1370
1409
                                 freezeCB.addItemListener(this);
1371
1410
 
..
..
@@ -1374,9 +1413,12 @@
1374
1413
 
1375
1414
                 panel.Return();
1376
1415
                 
1416
+            if (Globals.ADVANCED)
1417
+            {
1377
1418
                 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
1378
1419
                 crowdCB.setToolTipText("Used for crowds");
1379
1420
                                 crowdCB.addItemListener(this);
1421
+            }
1380
1422
 
1381
1423
                 panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
1382
1424
                 smoothCB.setToolTipText("Snapping delay");
..
..
@@ -1389,30 +1431,26 @@
1389
1431
                 minshaderCB.setToolTipText("Minimal fast shader");
1390
1432
                                 minshaderCB.addItemListener(this);
1391
1433
                                 
1392
-//        	constraints.gridy += 1;
1393
1434
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
1394
1435
 //                                speakerMocapCB.addItemListener(this);
1395
1436
 
1396
-                panel.Return();
1397
-                
1398
1437
             if (false)
1399
1438
             {
1400
1439
                 // handled in scripts
1401
-        	//constraints.gridy += 1;
1402
1440
                 panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
1403
1441
                                 speakerCameraCB.addItemListener(this);
1404
1442
 
1405
-        	//constraints.gridy += 1;
1406
1443
                 panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
1407
1444
                                 speakerFocusCB.addItemListener(this);
1408
1445
 
1409
-        	//constraints.gridy += 1;
1410
-                panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
1411
-                                smoothfocusCB.addItemListener(this);
1412
1446
                 panel.Return();
1413
1447
             }
1414
1448
 
1415
-//constraints.gridx += 1;
1449
+                panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
1450
+                                smoothfocusCB.addItemListener(this);
1451
+                                
1452
+                panel.Return();
1453
+                
1416
1454
 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
1417
1455
 //                debugCB.addItemListener(this);
1418
1456
 
..
..
@@ -1466,7 +1504,7 @@
1466
1504
 	
1467
1505
         void EditObject(Object3D obj)
1468
1506
         {
1469
-            assert(obj instanceof Composite);
1507
+            //assert(obj instanceof Composite);
1470
1508
             
1471
1509
 //            if (obj.versionlist == null)
1472
1510
 //            {
..
..
@@ -1498,6 +1536,7 @@
1498
1536
                     
1499
1537
             oe.SetupViews();
1500
1538
             
1539
+        if (Globals.DEBUG)
1501
1540
 		System.out.println("SetupViews");
1502
1541
             DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1503
1542
                   oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..
..
@@ -2050,7 +2089,7 @@
2050
2089
             Object3D obj = (Object3D)group.selection.elementAt(0);
2051
2090
             objEditor.ScreenFit(obj, false);
2052
2091
             
2053
-            cameraView.pingthread.StepToTarget(true);
2092
+            cameraView.pingthread.StepToTarget(); //true);
2054
2093
             refreshContents();
2055
2094
         }
2056
2095
 
..
..
@@ -2087,7 +2126,7 @@
2087
2126
                 obj.parent.TransformToWorld(maxima); //, maxima);
2088
2127
             }
2089
2128
             
2090
-            Object3D shadow = new Object3D("Shadow " + obj.name);
2129
+            Object3D shadow = new Object3D("Shadow" + obj.name);
2091
2130
             
2092
2131
             shadow.toParent = LA.newMatrix();
2093
2132
             shadow.fromParent = LA.newMatrix();
..
..
@@ -2101,24 +2140,24 @@
2101
2140
             switch(axis)
2102
2141
             {
2103
2142
                 case 0 :
2104
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2105
-                    vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
2106
-                    vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2107
-                    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;
2108
2147
                     norm = cVector.X;
2109
2148
                     break;
2110
2149
                 case 1 :
2111
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2112
-                    vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2113
-                    vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2114
-                    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;
2115
2154
                     norm = cVector.Y;
2116
2155
                     break;
2117
2156
                 case 2 :
2118
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2119
-                    vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2120
-                    vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
2121
-                    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;
2122
2161
                     norm = cVector.Z;
2123
2162
                     break;
2124
2163
             }
..
..
@@ -2159,7 +2198,11 @@
2159
2198
             shadow.material = new cMaterial(obj.material);
2160
2199
             shadow.material.diffuse = 0.0001f;
2161
2200
             shadow.material.specular = 0.0001f;
2162
-            //shadow.projectedVertices[1].x = 300;
2201
+            shadow.material.opacity = 0.75f;
2202
+            
2203
+            AllocProjectedVertices(shadow);
2204
+        
2205
+            shadow.projectedVertices[1].x = 300;
2163
2206
             
2164
2207
             makeSomething(shadow);
2165
2208
         }
..
..
@@ -2680,27 +2723,35 @@
2680
2723
 		} else
2681
2724
 		if (source == loopItem || source == loopButton)
2682
2725
 		{
2726
+                    if (!group.selection.isEmpty())
2727
+                    {
2683
2728
                         Composite csg = new GroupLeaf();
2684
-                        csg.count = 5;
2685
2729
 			group(csg);
2730
+                        csg.count = 5;
2686
2731
                         Composite child = new cGroup("Branch");
2687
2732
                         csg.addChild(child);
2688
2733
                         child.addChild(csg);
2734
+                    }
2689
2735
 		} else
2690
2736
 		if (source == doubleItem)
2691
2737
 		{
2738
+                    if (!group.selection.isEmpty())
2739
+                    {
2692
2740
                         Composite csg = new GroupLeaf("Fork");
2693
-                        csg.count = 5;
2694
2741
 			group(csg);
2742
+                        csg.count = 5;
2695
2743
                         Composite child = new cGroup("Branch A");
2696
2744
                         csg.addChild(child);
2697
2745
                         child.addChild(csg);
2698
2746
                         child = new cGroup("Branch B");
2699
2747
                         csg.addChild(child);
2700
2748
                         child.addChild(csg);
2749
+                    }
2701
2750
 		} else
2702
2751
 		if (source == tripleItem)
2703
2752
 		{
2753
+                    if (!group.selection.isEmpty())
2754
+                    {
2704
2755
                         Composite csg = new GroupLeaf("Trident");
2705
2756
                         csg.count = 4;
2706
2757
 			group(csg);
..
..
@@ -2713,6 +2764,7 @@
2713
2764
                         child = new cGroup();
2714
2765
                         csg.addChild(child);
2715
2766
                         child.addChild(csg);
2767
+                    }
2716
2768
 		} else
2717
2769
 		if (source == computeAOItem)
2718
2770
 		{
..
..
@@ -2759,7 +2811,7 @@
2759
2811
 		{
2760
2812
 			Maximize();
2761
2813
 		} else
2762
-		if (source == fullButton)
2814
+		if (source == fullScreenButton)
2763
2815
 		{
2764
2816
 			ToggleFullScreen();
2765
2817
 		} else
..
..
@@ -2768,13 +2820,13 @@
2768
2820
                         this.expandedLayout = radio.layout;
2769
2821
 			CollapseToolbar();
2770
2822
 		} else
2771
-		if (source == maximize3DButton)
2772
-		{
2773
-                        this.expandedLayout = radio.layout;
2774
-                        radio.layout = twoButton;
2775
-                        Show3DView();
2776
-			CollapseToolbar();
2777
-		} else
2823
+//		if (source == maximize3DButton)
2824
+//		{
2825
+//                        this.expandedLayout = radio.layout;
2826
+//                        radio.layout = twoButton;
2827
+//			CollapseToolbar();
2828
+//                        Show3DView();
2829
+//		} else
2778
2830
 		if (source == previousVersionButton)
2779
2831
 		{
2780
2832
                         // Go to previous version
..
..
@@ -2802,7 +2854,7 @@
2802
2854
 		if (source == saveVersionButton)
2803
2855
 		{
2804
2856
                         // Save a new version
2805
-			if (!Save(true))
2857
+			if (!DuplicateVersion()) //true))
2806
2858
                             java.awt.Toolkit.getDefaultToolkit().beep();
2807
2859
 		} else
2808
2860
 		if (source == deleteVersionButton)
..
..
@@ -3348,22 +3400,34 @@
3348
3400
 		} else
3349
3401
 		if (source == ungroupItem || source == ungroupButton)
3350
3402
 		{
3351
-                    boolean hasRoot = false;
3403
+                    boolean canUngroup = true;
3352
3404
                     
3353
3405
                     for (int i=0; i<group.selection.size(); i++)
3354
3406
                     {
3355
-                        if (group.selection.get(i) == group)
3407
+                        Object3D selectedItem = group.selection.get(i);
3408
+                        
3409
+                        if (selectedItem.Size() == 0)
3356
3410
                         {
3357
-                            hasRoot = true;
3411
+                            // Cannot ungroup leaves
3412
+                            canUngroup = false;
3413
+                            break;
3414
+                        }
3415
+                                
3416
+                        if (selectedItem == group)
3417
+                        {
3418
+                            // Cannot ungroup root
3419
+                            canUngroup = false;
3358
3420
                             break;
3359
3421
                         }
3360
3422
                     }
3361
3423
 
3362
-                    if (!hasRoot)
3424
+                    if (canUngroup)
3363
3425
                     {
3364
3426
                         for (int i=0; i<group.selection.size(); i++)
3365
3427
                         {
3366
-                            Ungroup(group.selection.get(i));
3428
+                            Object3D selectedItem = group.selection.get(i);
3429
+                            
3430
+                            Ungroup(selectedItem);
3367
3431
                         }
3368
3432
 
3369
3433
                         ClearSelection(false);
..
..
@@ -3414,6 +3478,10 @@
3414
3478
 		if (source == clearMaterialsItem)
3415
3479
                 {
3416
3480
 			ClearMaterials();
3481
+		} else
3482
+		if (source == clearVersionsItem)
3483
+                {
3484
+			ClearVersions();
3417
3485
 		} else
3418
3486
 		if (source == liveleavesItem)
3419
3487
                 {
..
..
@@ -3554,6 +3622,18 @@
3554
3622
 		if (source == transformChildrenItem)
3555
3623
 		{
3556
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);
3557
3637
 		} else
3558
3638
 		if (source == resetTransformItem)
3559
3639
 		{
..
..
@@ -3927,6 +4007,9 @@
3927
4007
 		if (source == closeButton)
3928
4008
 		{
3929
4009
 //System.out.println("CLOSE: " + buttonGroup.getSelection());
4010
+                    if (copy.versionlist != null)
4011
+                        Replace();
4012
+                    
3930
4013
                     cRadio ab;
3931
4014
                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3932
4015
                     {
..
..
@@ -4025,6 +4108,9 @@
4025
4108
 		} else
4026
4109
                 if(source instanceof cRadio)
4027
4110
 		{
4111
+                    if (copy.versionlist != null)
4112
+                        Replace();
4113
+                    
4028
4114
                     group.parent = keepparent;
4029
4115
                         group.attributes = 0;
4030
4116
                     //group.editWindow = null;
..
..
@@ -4076,14 +4162,28 @@
4076
4162
                      */
4077
4163
                     radio.layout.doClick();
4078
4164
                     
4079
-                    assert(copy instanceof Composite);
4165
+                    //assert(copy instanceof Composite);
4080
4166
                     
4081
4167
         if (copy.versionlist == null)
4082
4168
         {
4083
-            copy.versionlist = new Object3D[100];
4084
4169
             copy.versionindex = -1;
4085
4170
             
4086
-            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);
4087
4187
         }
4088
4188
         
4089
4189
                     SetVersionStates();
..
..
@@ -4201,9 +4301,46 @@
4201
4301
             refreshContents();
4202
4302
         }
4203
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
+        
4204
4316
         void ResetTransform()
4205
4317
         {
4206
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();
4207
4344
         }
4208
4345
         
4209
4346
         void ResetTransform(int mask)
..
..
@@ -4216,42 +4353,8 @@
4216
4353
                     if (obj.toParent == null)
4217
4354
                         continue;
4218
4355
                     
4219
-                    if (mask == -1)
4220
-                    {
4221
-                        if (obj instanceof Camera) // jan 2014
4222
-                        {
4223
-                            LA.matIdentity(obj.toParent);
4224
-                            LA.matIdentity(obj.fromParent);
4225
-                        }
4226
-                        else
4227
-                        {
4228
-                            obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
4229
-                            obj.fromParent = null; // LA.matIdentity(obj.fromParent);
4230
-                        }
4231
-                        TouchTransform(obj);
4232
-                        continue;
4233
-                    }
4234
-                    if ((mask&2) != 0) // Scale
4235
-                    {
4236
-                        obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4237
-                        obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
4238
-                        obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
4239
-                        obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4240
-                        obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4241
-                        obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4242
-                    }
4243
-                    if ((mask&4) != 0) // Rotation
4244
-                    {
4245
-                        // ?
4246
-                    }
4247
-                    if ((mask&1) != 0) // Translation
4248
-                    {
4249
-                        if (obj.toParent != null)
4250
-                        {
4251
-                            obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
4252
-                            obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
4253
-                        }
4254
-                    }
4356
+                    obj.ResetTransform(mask);
4357
+                    
4255
4358
                     if (obj.parent == null)
4256
4359
                     {
4257
4360
                         System.out.println("NULL PARENT!");
..
..
@@ -4760,10 +4863,17 @@
4760
4863
             {
4761
4864
 		Object3D obj = group.selection.get(i);
4762
4865
                 
4866
+                if (obj.toParent == null)
4867
+                {
4868
+                    obj.toParent = LA.newMatrix();
4869
+                    obj.fromParent = LA.newMatrix();
4870
+                }
4871
+                
4763
4872
                 LA.matTranslate(obj.toParent, i * scale, 0, 0);
4764
4873
                 LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4765
4874
             }
4766
4875
             
4876
+            Globals.lighttouched = true;
4767
4877
             refreshContents();
4768
4878
 	}
4769
4879
 	
..
..
@@ -5051,6 +5161,12 @@
5051
5161
 		refreshContents();
5052
5162
 	}
5053
5163
 	
5164
+	void ClearVersions()
5165
+	{
5166
+		group.selection.ClearVersions();
5167
+		refreshContents();
5168
+	}
5169
+	
5054
5170
 	void FlipV(boolean flip)
5055
5171
 	{
5056
5172
 		group.selection.FlipV(flip);
..
..
@@ -5289,10 +5405,10 @@
5289
5405
 			if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
5290
5406
                             // a camera
5291
5407
                         {
5292
-                            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
5293
5409
                             {
5294
5410
                                 CameraPane.camerachangeframe = 0; // don't refuse it
5295
-                                Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
5411
+                                Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent(), true);
5296
5412
                             }
5297
5413
                          //   Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
5298
5414
                          //   Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
..
..
@@ -5328,18 +5444,20 @@
5328
5444
             if (group.selection != null)
5329
5445
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5330
5446
             {
5331
-                    if (!(e.nextElement() instanceof Composite))
5447
+                    Object next = e.nextElement();
5448
+                    if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5332
5449
                     {
5333
5450
                         allComposites = false;
5334
5451
                         break;
5335
5452
                     }
5336
5453
             }
5337
5454
             
5338
-            rootButton.setEnabled(allComposites);
5455
+            rootButton.setEnabled(true); // allComposites);
5339
5456
         }
5340
5457
 
5341
5458
         void refreshContents(boolean cp)
5342
5459
         {
5460
+            if (Globals.SHOWINFO)
5343
5461
             //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5344
5462
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5345
5463
             {
..
..
@@ -6233,11 +6351,11 @@
6233
6351
 	private MenuItem lookAtItem;
6234
6352
 	private MenuItem lookFromItem;
6235
6353
 	private MenuItem switchViewItem;
6236
-	private MenuItem cutItem;
6354
+	private JMenuItem cutItem;
6237
6355
 	private MenuItem undoItem;
6238
6356
 	private MenuItem redoItem;
6239
6357
 	private JMenuItem duplicateItem;
6240
-	private MenuItem cloneItem;
6358
+	private JMenuItem cloneItem;
6241
6359
 	private MenuItem cloneSupportItem;
6242
6360
 	private MenuItem overwriteGeoItem;
6243
6361
 	private MenuItem overwriteMatItem;
..
..
@@ -6258,13 +6376,13 @@
6258
6376
 	private MenuItem cloneGeometriesItem;
6259
6377
 	private MenuItem shareGeometriesItem;
6260
6378
 	private MenuItem mergeGeometriesItem;
6261
-	private MenuItem copyItem;
6379
+	private JMenuItem copyItem;
6262
6380
 	private MenuItem pasteItem;
6263
-	private MenuItem pasteIntoItem;
6264
-	private MenuItem pasteLinkItem;
6265
-	private MenuItem pasteCloneItem;
6266
-	private MenuItem pasteExpandItem;
6267
-	private MenuItem deleteItem;
6381
+	private JMenuItem pasteIntoItem;
6382
+	private JMenuItem pasteLinkItem;
6383
+	private JMenuItem pasteCloneItem;
6384
+	private JMenuItem pasteExpandItem;
6385
+	private JMenuItem deleteItem;
6268
6386
 	private MenuItem clearAllItem;
6269
6387
 	private MenuItem genUVItem;
6270
6388
 	private MenuItem genNormalsMESHItem;
..
..
@@ -6290,6 +6408,7 @@
6290
6408
 	private MenuItem clipMeshItem;
6291
6409
 	private MenuItem smoothMeshItem;
6292
6410
 	private MenuItem clearMaterialsItem;
6411
+	private MenuItem clearVersionsItem;
6293
6412
         
6294
6413
 	private MenuItem liveleavesItem;
6295
6414
 	private MenuItem unliveleavesItem;
..
..
@@ -6313,13 +6432,16 @@
6313
6432
 	private MenuItem maxTexturesItem;
6314
6433
 	private MenuItem panoTexturesItem;
6315
6434
         
6435
+	private MenuItem textureRatioRItem;
6436
+	private MenuItem textureRatioGItem;
6437
+	private MenuItem textureRatioBItem;
6316
6438
 	private MenuItem resetCentroidItem;
6317
6439
 	private MenuItem resetCentroidXZItem;
6318
6440
 	private MenuItem resetTransformItem;
6319
6441
 	private MenuItem transformGeometryItem;
6320
6442
 	private MenuItem transformChildrenItem;
6321
6443
 	private MenuItem hideItem;
6322
-	private MenuItem grabItem;
6444
+	private JMenuItem grabItem;
6323
6445
 	private MenuItem backItem;
6324
6446
 	private MenuItem frontItem;
6325
6447
 	private MenuItem cameraItem;
..
..
@@ -6332,7 +6454,7 @@
6332
6454
 	private MenuItem switchTransfoItem;
6333
6455
 	private MenuItem morphItem;
6334
6456
 	private MenuItem linkerItem;
6335
-	private MenuItem ungroupItem;
6457
+	private JMenuItem ungroupItem;
6336
6458
 	private MenuItem editItem;
6337
6459
 	private MenuItem openWindowItem;
6338
6460
 	private MenuItem editLeafItem;