blame | history | patch | commit | commitdiff
Normand Briere
2019-06-09 989407a46041b80c71fd906bff6b97528e6f3350 
 ObjEditor.java
....@@ -309,44 +309,61 @@
309309         //normalLensItem.addActionListener(this);
310310         cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
311311         revertCameraItem.addActionListener(this);
312
-        cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
313
-        toggleTimelineItem.addItemListener(this);
312
+        
314313         cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
315314         toggleFullScreenItem.addItemListener(this);
316315         toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
317316         cameraMenu.add("-");
317
+        
318318         cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
319319         toggleTextureItem.addItemListener(this);
320320         toggleTextureItem.setState(CameraPane.textureon);
321
-        cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
322
-        toggleLiveItem.addItemListener(this);
323
-        toggleLiveItem.setState(Globals.isLIVE());
324
-        cameraMenu.add(stepItem = new MenuItem("Step"));
325
-        stepItem.addActionListener(this);
326
-//		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
327
-//		toggleDLItem.addItemListener(this);
328
-//                toggleDLItem.setState(false);
329
-        cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
330
-        toggleRenderItem.addItemListener(this);
331
-        toggleRenderItem.setState(!CameraPane.frozen);
332
-        cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
333
-        toggleDebugItem.addItemListener(this);
334
-        toggleDebugItem.setState(CameraPane.DEBUG);
335
-        cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
336
-        toggleFrustumItem.addItemListener(this);
337
-        toggleFrustumItem.setState(CameraPane.FRUSTUM);
338
-        cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
339
-        toggleFootContactItem.addItemListener(this);
340
-        toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
341
-        cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
342
-        toggleRandomItem.addItemListener(this);
343
-        toggleRandomItem.setState(CameraPane.RANDOM);
321
+        
322
+        cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
323
+        toggleSwitchItem.addItemListener(this);
324
+        toggleSwitchItem.setState(CameraPane.SWITCH);
325
+        
344326         cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
345327         toggleHandleItem.addItemListener(this);
346328         toggleHandleItem.setState(CameraPane.HANDLES);
329
+        
347330         cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
348331         togglePaintItem.addItemListener(this);
349332         togglePaintItem.setState(CameraPane.PAINTMODE);
333
+        
334
+        if (Globals.ADVANCED)
335
+        {
336
+        cameraMenu.add("-");
337
+                cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
338
+                toggleLiveItem.addItemListener(this);
339
+                toggleLiveItem.setState(Globals.isLIVE());
340
+
341
+                cameraMenu.add(stepItem = new MenuItem("Step"));
342
+                stepItem.addActionListener(this);
343
+        //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
344
+        //		toggleDLItem.addItemListener(this);
345
+        //                toggleDLItem.setState(false);
346
+
347
+                cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
348
+                toggleRenderItem.addItemListener(this);
349
+                toggleRenderItem.setState(!CameraPane.frozen);
350
+
351
+                cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
352
+                toggleDebugItem.addItemListener(this);
353
+                toggleDebugItem.setState(CameraPane.DEBUG);
354
+
355
+                cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
356
+                toggleFrustumItem.addItemListener(this);
357
+                toggleFrustumItem.setState(CameraPane.FRUSTUM);
358
+
359
+                cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
360
+                toggleFootContactItem.addItemListener(this);
361
+                toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
362
+                
363
+                cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
364
+                toggleTimelineItem.addItemListener(this);
365
+        }
366
+        
350367 //		cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
351368 //		toggleRootItem.addItemListener(this);
352369 //                    toggleRootItem.setState(false);
....@@ -484,13 +501,13 @@
484501         //SendInfo("Name:", "bold");
485502         if (sel.GetTextures() != null || debug)
486503         {
487
-            si.SendInfo(sel.toString(), "bold");
504
+            si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
488505             //SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
489506             if (sel.Size() > 0)
490507             {
491508                 si.SendInfo("#children = " + sel.Size(), "regular");
492509             }
493
-            si.SendInfo((debug ? "    Parent: " : "    ") + sel.parent, "regular");
510
+            si.SendInfo((debug ? "    Parent: " : "    ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
494511             if (debug)
495512             {
496513                 try
....@@ -532,7 +549,7 @@
532549                 }
533550                 if (sel.support != null)
534551                 {
535
-                    si.SendInfo("    support: " + sel.support, "regular");
552
+                    si.SendInfo("    support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
536553                 }
537554                 if (sel.scriptnode != null)
538555                 {
....@@ -735,7 +752,7 @@
735752     protected static ImageIcon createImageIcon(String path,
736753             String description)
737754     {
738
-        java.net.URL imgURL = GrafreeD.class.getResource(path);
755
+        java.net.URL imgURL = Grafreed.class.getResource(path);
739756         if (imgURL != null)
740757         {
741758             return new ImageIcon(imgURL, description);
....@@ -767,6 +784,7 @@
767784 //    NumberSlider vDivsField;
768785 //    JCheckBox endcaps;
769786     JCheckBox liveCB;
787
+    JCheckBox selectCB;
770788     JCheckBox hideCB;
771789     JCheckBox link2masterCB;
772790     JCheckBox markCB;
....@@ -969,9 +987,11 @@
969987             
970988         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
971989                 liveCB.setToolTipText("Animate object");
990
+        selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
991
+                selectCB.setToolTipText("Make object selectable");
992
+//            Return();
972993         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
973994                 hideCB.setToolTipText("Hide object");
974
-//            Return();
975995         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
976996         markCB.setToolTipText("Set the animation target transform");
977997         
....@@ -1011,7 +1031,7 @@
10111031         oe.ctrlPanel.add(commandsPanel);
10121032         oe.ctrlPanel.Return();
10131033 
1014
-    pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
1034
+    pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
10151035     normalpushField = (cNumberSlider)pushPanel.getComponent(1);
10161036     //Return();
10171037 
....@@ -1313,7 +1333,7 @@
13131333         scrollpane.addMouseWheelListener(this); // Default not fast enough
13141334 
13151335         /*JTabbedPane*/ scenePanel = new cGridBag();
1316
-        scenePanel.preferredWidth = 7;
1336
+        scenePanel.preferredWidth = 6;
13171337         
13181338         JTabbedPane tabbedPane = new JTabbedPane();
13191339         tabbedPane.add(scrollpane);
....@@ -1419,8 +1439,8 @@
14191439 
14201440 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
14211441 
1422
-        frame.setSize(1024, 768);
1423
-        frame.show();
1442
+        frame.setSize(1280, 860);
1443
+        frame.setVisible(true);
14241444 
14251445         gridPanel.setDividerLocation(1.0);
14261446 
....@@ -1459,19 +1479,22 @@
14591479 
14601480         cGridBag editBar = new cGridBag().setVertical(false);
14611481             
1462
-        editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1482
+        editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
14631483                 createMaterialButton.setToolTipText("Create material");
14641484 
14651485         /*
14661486         ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
14671487          */
14681488 
1469
-        editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1489
+        editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
14701490                 clearMaterialButton.setToolTipText("Clear material");
14711491         
1472
-        editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1473
-        editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1474
-        editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1492
+        if (Globals.ADVANCED)
1493
+        {
1494
+                editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
1495
+                editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1496
+                editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1497
+        }
14751498 
14761499         editBar.preferredHeight = 15;
14771500         
....@@ -1740,12 +1763,15 @@
17401763         opacityPowerField.addChangeListener(this);
17411764         /**/
17421765 
1743
-        resetSlidersButton.addActionListener(this);
17441766         clearMaterialButton.addActionListener(this);
17451767         createMaterialButton.addActionListener(this);
1746
-
1747
-        propagateToggle.addItemListener(this);
1748
-        multiplyToggle.addItemListener(this);
1768
+        
1769
+        if (Globals.ADVANCED)
1770
+        {
1771
+                resetSlidersButton.addActionListener(this);
1772
+                propagateToggle.addItemListener(this);
1773
+                multiplyToggle.addItemListener(this);
1774
+        }
17491775     }
17501776 
17511777     void DropFile(java.io.File[] files, boolean textures)
....@@ -1916,7 +1942,7 @@
19161942 
19171943         //? flashIt = false;
19181944         CameraPane pane = (CameraPane) cameraView;
1919
-        pane.clickStart(location.x, location.y, 0);
1945
+        pane.clickStart(location.x, location.y, 0, 0);
19201946         pane.clickEnd(location.x, location.y, 0, true);
19211947 
19221948         if (group.selection.size() == 1)
....@@ -2373,11 +2399,11 @@
23732399 
23742400     void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
23752401     {
2376
-        if (GrafreeD.standAlone)
2402
+        if (Grafreed.standAlone)
23772403         {
23782404             /**/
23792405             FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2380
-            browser.show();
2406
+            browser.setVisible(true);
23812407             String filename = browser.getFile();
23822408             if (filename != null && filename.length() > 0)
23832409             {
....@@ -2737,7 +2763,8 @@
27372763             return;
27382764         }
27392765 
2740
-        multiplyToggle.setSelected(mat.multiply);
2766
+        if (multiplyToggle != null)
2767
+                multiplyToggle.setSelected(mat.multiply);
27412768 
27422769         assert (object.projectedVertices != null);
27432770 
....@@ -2952,7 +2979,7 @@
29522979             frame.validate();
29532980 
29542981             return;
2955
-        } else if (event.getSource() == toggleRandomItem)
2982
+        } else if (event.getSource() == toggleSwitchItem)
29562983         {
29572984             cameraView.ToggleRandom();
29582985             cameraView.repaint();
....@@ -2982,6 +3009,10 @@
29823009         } else if (event.getSource() == liveCB)
29833010         {
29843011             copy.live ^= true;
3012
+            return;
3013
+        } else if (event.getSource() == selectCB)
3014
+        {
3015
+            copy.dontselect ^= true;
29853016             return;
29863017         } else if (event.getSource() == hideCB)
29873018         {
....@@ -3231,8 +3262,8 @@
32313262 
32323263                 Globals.ANIMATION ^= true;
32333264 
3234
-                GrafreeD.wav.cursor = 0;
3235
-                GrafreeD.wav.loop = 0;
3265
+                Grafreed.wav.cursor = 0;
3266
+                Grafreed.wav.loop = 0;
32363267             }
32373268         } else
32383269         {
....@@ -3253,7 +3284,6 @@
32533284             callee.refreshContents();
32543285         } else
32553286         {
3256
-                new Exception().printStackTrace();
32573287             System.exit(0);
32583288         }
32593289     }
....@@ -3283,7 +3313,7 @@
32833313     void CreateMaterial()
32843314     {
32853315         //copy.ClearMaterial(); // PATCH
3286
-        copy.CreateMaterialS(multiplyToggle.isSelected());
3316
+        copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
32873317         if (copy.selection.size() > 0)
32883318         //SetMaterial(copy);
32893319         {
....@@ -3342,11 +3372,11 @@
33423372     {
33433373         copy.ResetBlockLoop(); // temporary problem
33443374 
3345
-        boolean random = CameraPane.RANDOM;
3346
-        CameraPane.RANDOM = false; // parse everything
3375
+        boolean random = CameraPane.SWITCH;
3376
+        CameraPane.SWITCH = false; // parse everything
33473377         copy.ResetDisplayList();
33483378         copy.HardTouch();
3349
-        CameraPane.RANDOM = random;
3379
+        CameraPane.SWITCH = random;
33503380     }
33513381 
33523382 //	public void applySelf()
....@@ -3420,6 +3450,36 @@
34203450             {
34213451                 //System.out.println("Propagate = " + propagate);
34223452                 copy.UpdateMaterial(anchor, current, propagate);
3453
+                
3454
+                if (copy.material != null)
3455
+                {
3456
+                    cMaterial mat = copy.material;
3457
+                            
3458
+                    colorField.SetToolTipValue((mat.color));
3459
+                    modulationField.SetToolTipValue((mat.modulation));
3460
+                    metalnessField.SetToolTipValue((mat.metalness));
3461
+                    diffuseField.SetToolTipValue((mat.diffuse));
3462
+                    specularField.SetToolTipValue((mat.specular));
3463
+                    shininessField.SetToolTipValue((mat.shininess));
3464
+                    shiftField.SetToolTipValue((mat.shift));
3465
+                    ambientField.SetToolTipValue((mat.ambient));
3466
+                    lightareaField.SetToolTipValue((mat.lightarea));
3467
+                    diffusenessField.SetToolTipValue((mat.factor));
3468
+                    velvetField.SetToolTipValue((mat.velvet));
3469
+                    sheenField.SetToolTipValue((mat.sheen));
3470
+                    subsurfaceField.SetToolTipValue((mat.subsurface));
3471
+                    backlitField.SetToolTipValue((mat.bump));
3472
+                    anisoField.SetToolTipValue((mat.aniso));
3473
+                    anisoVField.SetToolTipValue((mat.anisoV));
3474
+                    cameraField.SetToolTipValue((mat.cameralight));
3475
+                    selfshadowField.SetToolTipValue((mat.diffuseness));
3476
+                    shadowField.SetToolTipValue((mat.shadow));
3477
+                    textureField.SetToolTipValue((mat.texture));
3478
+                    opacityField.SetToolTipValue((mat.opacity));
3479
+                    fakedepthField.SetToolTipValue((mat.fakedepth));
3480
+                    shadowbiasField.SetToolTipValue((mat.shadowbias));
3481
+                }
3482
+                
34233483                 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
34243484                 {
34253485                     copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
....@@ -3535,7 +3595,7 @@
35353595         }
35363596         
35373597         if (normalpushField != null)
3538
-                copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
3598
+                copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
35393599     }
35403600 
35413601         void SnapObject()
....@@ -4002,6 +4062,7 @@
40024062             }
40034063         }
40044064     }
4065
+    
40054066     LoadGFDThread loadGFDThread;
40064067 
40074068     void ReadGFD(String fullname, iCallBack cb)
....@@ -4022,7 +4083,8 @@
40224083         try
40234084         {
40244085             java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4025
-            java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4086
+            java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4087
+            java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
40264088 
40274089             readobj = (Object3D) p.readObject();
40284090             istream.close();
....@@ -4030,7 +4092,20 @@
40304092             readobj.ResetDisplayList();
40314093         } catch (Exception e)
40324094         {
4033
-            e.printStackTrace();
4095
+            //e.printStackTrace();
4096
+            try
4097
+            {
4098
+                java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4099
+                java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4100
+
4101
+                readobj = (Object3D) p.readObject();
4102
+                istream.close();
4103
+
4104
+                readobj.ResetDisplayList();
4105
+            } catch (Exception e2)
4106
+            {
4107
+                e2.printStackTrace();
4108
+            }
40344109         }
40354110 //            catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
40364111 //            catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
....@@ -4147,7 +4222,7 @@
41474222 
41484223     void load() // throws ClassNotFoundException
41494224     {
4150
-        if (GrafreeD.standAlone)
4225
+        if (Grafreed.standAlone)
41514226         {
41524227             FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
41534228             browser.show();
....@@ -4234,11 +4309,13 @@
42344309         try
42354310         {
42364311             FileOutputStream ostream = new FileOutputStream(lastname);
4237
-            ObjectOutputStream p = new ObjectOutputStream(ostream);
4312
+            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4313
+            ObjectOutputStream p = new ObjectOutputStream(zstream);
42384314 
42394315             p.writeObject(copy);
42404316             p.flush();
42414317 
4318
+            zstream.close();
42424319             ostream.close();
42434320 
42444321             //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4248,11 +4325,12 @@
42484325         {
42494326         }
42504327     }
4328
+    
42514329     String lastname;
42524330 
42534331     void saveAs()
42544332     {
4255
-        if (GrafreeD.standAlone)
4333
+        if (Grafreed.standAlone)
42564334         {
42574335             FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
42584336             browser.setVisible(true);
....@@ -4357,13 +4435,13 @@
43574435         try
43584436         {
43594437             FileOutputStream ostream = new FileOutputStream(filename);
4360
-            // ??        java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4361
-            ObjectOutputStream p = new ObjectOutputStream(/*z*/ostream);
4438
+            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4439
+            ObjectOutputStream p = new ObjectOutputStream(zstream);
43624440 
43634441             Object3D objectparent = obj.parent;
43644442             obj.parent = null;
43654443 
4366
-            Object3D object = (Object3D) GrafreeD.clone(obj);
4444
+            Object3D object = (Object3D) Grafreed.clone(obj);
43674445 
43684446             obj.parent = objectparent;
43694447 
....@@ -4375,8 +4453,8 @@
43754453             p.writeObject(object);
43764454             p.flush();
43774455 
4456
+            zstream.close();
43784457             ostream.close();
4379
-            //       zstream.close();
43804458 
43814459 //                                    group.selection.get(0).parent = parent;
43824460             //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4397,7 +4475,7 @@
43974475         buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
43984476         cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
43994477         copy.generatePOV(buffer);
4400
-        if (GrafreeD.standAlone)
4478
+        if (Grafreed.standAlone)
44014479         {
44024480             FileDialog browser = new FileDialog(frame, "Export POV", 1);
44034481             browser.show();
....@@ -4446,7 +4524,7 @@
44464524     CheckboxMenuItem toggleFootContactItem;
44474525     CheckboxMenuItem toggleDLItem;
44484526     CheckboxMenuItem toggleTextureItem;
4449
-    CheckboxMenuItem toggleRandomItem;
4527
+    CheckboxMenuItem toggleSwitchItem;
44504528     CheckboxMenuItem toggleRootItem;
44514529     CheckboxMenuItem animationItem;
44524530     CheckboxMenuItem toggleHandleItem;