New 3ds loader.

Normand Briere

2019-07-06 77633b188d01228383ced79c26b41ebb2989624c

 GroupEditor.java
..
..
@@ -380,6 +380,7 @@
380
380
 		shadowYItem.addActionListener(this);
381
381
                 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382
382
 		shadowZItem.addActionListener(this);
383
+                
383
384
         if (Globals.ADVANCED)
384
385
         {
385
386
 		menu.add("-");
..
..
@@ -590,14 +591,21 @@
590
591
                 //minButton.setToolTipText("Minimize window");
591
592
 		//minButton.addActionListener(this);
592
593
                 
593
-		oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594
-                maxButton.setToolTipText("Maximize window");
595
-		maxButton.addActionListener(this);
594
+                if (Globals.ADVANCED)
595
+                {
596
+                    oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597
+                    maxButton.setToolTipText("Maximize window");
598
+                    maxButton.addActionListener(this);
599
+                }
596
600
                 
597
601
 		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598
602
                 fullButton.setToolTipText("Full-screen window");
599
603
 		fullButton.addActionListener(this);
600
604
                 
605
+		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606
+                screenfitButton.setToolTipText("Screen fit");
607
+		screenfitButton.addActionListener(this);
608
+
601
609
 		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602
610
                 restoreCameraButton.setToolTipText("Restore viewpoint");
603
611
 		restoreCameraButton.addActionListener(this);
..
..
@@ -630,10 +638,6 @@
630
638
                                 
631
639
                 //oe.toolboxPanel.Return();
632
640
                 
633
-		copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634
-                screenfitButton.setToolTipText("Screen fit");
635
-		screenfitButton.addActionListener(this);
636
-
637
641
 //                copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
638
642
 //                trackCB.setToolTipText("Enable tracking");
639
643
 //                                trackCB.addItemListener(this);
..
..
@@ -1211,8 +1215,6 @@
1211
1215
                         }
1212
1216
                     }
1213
1217
                     
1214
-                    String string = (String) object;
1215
-                    
1216
1218
                     System.out.println("Transfer = " + object + "; drop : " + target);
1217
1219
 //                    if( object instanceof java.io.File[])
1218
1220
 //                    {
..
..
@@ -1220,6 +1222,8 @@
1220
1222
 //                        objEditor.DropFile((java.io.File[]) object, true);
1221
1223
 //                        return;
1222
1224
 //                    }
1225
+                    
1226
+                    String string = (String) object;
1223
1227
                     
1224
1228
                     // File path for Mac and Windows
1225
1229
                     if (string.charAt(0) == '/' || string.charAt(1) == ':')
..
..
@@ -1468,6 +1472,9 @@
1468
1472
 		menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1469
1473
 		animationItem.addItemListener(this);
1470
1474
                 animationItem.setState(Globals.ANIMATION);
1475
+                
1476
+		menu.add(archiveItem = new MenuItem("Archive3D..."));
1477
+		archiveItem.addActionListener(this);
1471
1478
                 
1472
1479
 		menu.add("-");
1473
1480
 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
..
..
@@ -2213,7 +2220,8 @@
2213
2220
 		} else
2214
2221
 		if (source == undoButton)
2215
2222
 		{
2216
-			Undo();
2223
+			if (!Undo())
2224
+                            java.awt.Toolkit.getDefaultToolkit().beep();
2217
2225
 		} else
2218
2226
 		if (source == redoButton)
2219
2227
 		{
..
..
@@ -2221,7 +2229,8 @@
2221
2229
 		} else
2222
2230
 		if (source == saveButton)
2223
2231
 		{
2224
-			Save();
2232
+			if (!Save(true))
2233
+                            java.awt.Toolkit.getDefaultToolkit().beep();
2225
2234
 		} else
2226
2235
 		if (source == oneStepButton)
2227
2236
 		{
..
..
@@ -2230,17 +2239,14 @@
2230
2239
 		} else
2231
2240
 		if (source == screenfitButton)
2232
2241
 		{
2233
-			//Reload(lastConverter, lastFilename, true);
2234
2242
                     ScreenFit();
2235
2243
 		} else
2236
2244
 		if (source == screenfitpointButton)
2237
2245
 		{
2238
-			//Reload(lastConverter, lastFilename, true);
2239
2246
                     ScreenFitPoint();
2240
2247
 		} else
2241
2248
 		if (source == snapobjectButton)
2242
2249
 		{
2243
-			//Reload(lastConverter, lastFilename, true);
2244
2250
                     SnapObject();
2245
2251
 		} else
2246
2252
 //		if (event.getSource() == recompileButton)
..
..
@@ -4728,7 +4734,7 @@
4728
4734
         void refreshContents(boolean cp)
4729
4735
         {
4730
4736
             if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4731
-            if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4737
+            if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4732
4738
             {
4733
4739
                 objEditor.ClearInfo(); // .GetMaterial());
4734
4740