blame | history | patch | commit | commitdiff
Normand Briere
2019-06-09 c5b599b48b333b34e554b464aefbca0b9bc66275 
 ObjEditor.java
....@@ -276,24 +276,40 @@
276276     void SetupMenu()
277277     {
278278         frame.setMenuBar(menuBar = new MenuBar());
279
-        menuBar.add(windowMenu = new Menu("File"));
280
-        windowMenu.add(loadItem = new MenuItem("Load..."));
281
-        windowMenu.add("-");
282
-        windowMenu.add(saveItem = new MenuItem("Save"));
283
-        windowMenu.add(saveAsItem = new MenuItem("Save As..."));
279
+        menuBar.add(fileMenu = new Menu("File"));
280
+        fileMenu.add(newItem = new MenuItem("New"));
281
+        fileMenu.add(loadItem = new MenuItem("Load..."));
282
+        
283
+                //oe.menuBar.add(menu = new Menu("Include"));
284
+        Menu menu = new Menu("Import");
285
+		importOBJItem = menu.add(new MenuItem("OBJ file..."));
286
+		importOBJItem.addActionListener(this);
287
+		import3DSItem = menu.add(new MenuItem("3DS file..."));
288
+		import3DSItem.addActionListener(this);
289
+		importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
290
+		importVRMLX3DItem.addActionListener(this);
291
+		menu.add("-");
292
+		importGFDItem = menu.add(new MenuItem("Grafreed file..."));
293
+		importGFDItem.addActionListener(this);
294
+        fileMenu.add(menu);
295
+        fileMenu.add("-");
296
+
297
+        fileMenu.add(saveItem = new MenuItem("Save"));
298
+        fileMenu.add(saveAsItem = new MenuItem("Save As..."));
284299         //windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
285
-        windowMenu.add("-");
286
-        windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
287
-        windowMenu.add(reexportItem = new MenuItem("Re-export"));
288
-        windowMenu.add("-");
300
+        fileMenu.add("-");
301
+        fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
302
+        fileMenu.add(reexportItem = new MenuItem("Re-export"));
303
+        fileMenu.add("-");
289304         if (client.parent != null)
290305         {
291
-            windowMenu.add(closeItem = new MenuItem("Close"));
306
+            fileMenu.add(closeItem = new MenuItem("Close"));
292307         } else
293308         {
294
-            windowMenu.add(closeItem = new MenuItem("Exit"));
309
+            fileMenu.add(closeItem = new MenuItem("Exit"));
295310         }
296311 
312
+        newItem.addActionListener(this);
297313         loadItem.addActionListener(this);
298314         saveItem.addActionListener(this);
299315         saveAsItem.addActionListener(this);
....@@ -301,78 +317,6 @@
301317         reexportItem.addActionListener(this);
302318         //povItem.addActionListener(this);
303319         closeItem.addActionListener(this);
304
-
305
-        menuBar.add(cameraMenu = new Menu("View"));
306
-        //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
307
-        //zBufferItem.addActionListener(this);
308
-        //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
309
-        //normalLensItem.addActionListener(this);
310
-        cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
311
-        revertCameraItem.addActionListener(this);
312
-        
313
-        cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
314
-        toggleFullScreenItem.addItemListener(this);
315
-        toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
316
-        cameraMenu.add("-");
317
-        
318
-        cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
319
-        toggleTextureItem.addItemListener(this);
320
-        toggleTextureItem.setState(CameraPane.textureon);
321
-        
322
-        cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
323
-        toggleSwitchItem.addItemListener(this);
324
-        toggleSwitchItem.setState(CameraPane.SWITCH);
325
-        
326
-        cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
327
-        toggleHandleItem.addItemListener(this);
328
-        toggleHandleItem.setState(CameraPane.HANDLES);
329
-        
330
-        cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
331
-        togglePaintItem.addItemListener(this);
332
-        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
-        
367
-//		cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
368
-//		toggleRootItem.addItemListener(this);
369
-//                    toggleRootItem.setState(false);
370
-//		cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
371
-//		animationItem.addItemListener(this);
372
-//                    animationItem.setState(CameraPane.ANIMATION);
373
-        cameraMenu.add("-");
374
-        cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
375
-        editCameraItem.addActionListener(this);
376320 
377321         objectPanel = new JTabbedPane();
378322         toolbarPanel = new JPanel();
....@@ -784,6 +728,7 @@
784728 //    NumberSlider vDivsField;
785729 //    JCheckBox endcaps;
786730     JCheckBox liveCB;
731
+    JCheckBox selectCB;
787732     JCheckBox hideCB;
788733     JCheckBox link2masterCB;
789734     JCheckBox markCB;
....@@ -986,9 +931,11 @@
986931             
987932         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
988933                 liveCB.setToolTipText("Animate object");
934
+        selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
935
+                selectCB.setToolTipText("Make object selectable");
936
+//            Return();
989937         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
990938                 hideCB.setToolTipText("Hide object");
991
-//            Return();
992939         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
993940         markCB.setToolTipText("Set the animation target transform");
994941         
....@@ -1028,7 +975,7 @@
1028975         oe.ctrlPanel.add(commandsPanel);
1029976         oe.ctrlPanel.Return();
1030977 
1031
-    pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
978
+    pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1032979     normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1033980     //Return();
1034981 
....@@ -3007,6 +2954,10 @@
30072954         {
30082955             copy.live ^= true;
30092956             return;
2957
+        } else if (event.getSource() == selectCB)
2958
+        {
2959
+            copy.dontselect ^= true;
2960
+            return;
30102961         } else if (event.getSource() == hideCB)
30112962         {
30122963             copy.hide ^= true;
....@@ -3045,8 +2996,9 @@
30452996 
30462997     public void actionPerformed(ActionEvent event)
30472998     {
2999
+        Object source = event.getSource();
30483000         // SCRIPT DIALOG
3049
-        if (event.getSource() == okbutton)
3001
+        if (source == okbutton)
30503002         {
30513003             textpanel.setVisible(false);
30523004             textpanel.remove(textarea);
....@@ -3058,7 +3010,7 @@
30583010             textarea = null;
30593011             textpanel = null;
30603012         }
3061
-        if (event.getSource() == cancelbutton)
3013
+        if (source == cancelbutton)
30623014         {
30633015             textpanel.setVisible(false);
30643016             textpanel.remove(textarea);
....@@ -3070,50 +3022,50 @@
30703022         //applySelf();
30713023         //client.refreshEditWindow();
30723024         //refreshContents();
3073
-        if (event.getSource() == nameField)
3025
+        if (source == nameField)
30743026         {
30753027             //System.out.println("ObjEditor " + event);
30763028             applySelf0(true);
30773029             //parent.applySelf();
30783030             objEditor.refreshContents();
3079
-        } else if (event.getSource() == resetButton)
3031
+        } else if (source == resetButton)
30803032         {
30813033             CameraPane.fullreset = true;
30823034             copy.Reset(); // ResetMeshes();
30833035             copy.Touch();
30843036             objEditor.refreshContents();
3085
-        } else if (event.getSource() == stepItem)
3037
+        } else if (source == stepItem)
30863038         {
30873039             //cameraView.ONESTEP = true;
30883040             Globals.ONESTEP = true;
30893041             cameraView.repaint();
30903042             return;
3091
-        } else if (event.getSource() == stepButton)
3043
+        } else if (source == stepButton)
30923044         {
30933045             copy.Step();
30943046             copy.Touch();
30953047             objEditor.refreshContents();
3096
-        } else if (event.getSource() == slowerButton)
3048
+        } else if (source == slowerButton)
30973049         {
30983050             copy.Slower();
30993051             copy.Touch();
31003052             objEditor.refreshContents();
3101
-        } else if (event.getSource() == fasterButton)
3053
+        } else if (source == fasterButton)
31023054         {
31033055             copy.Faster();
31043056             copy.Touch();
31053057             objEditor.refreshContents();
3106
-        } else if (event.getSource() == remarkButton)
3058
+        } else if (source == remarkButton)
31073059         {
31083060             copy.Remark();
31093061             copy.Touch();
31103062             objEditor.refreshContents();
3111
-        } else if (event.getSource() == stepAllButton)
3063
+        } else if (source == stepAllButton)
31123064         {
31133065             copy.StepAll();
31143066             copy.Touch();
31153067             objEditor.refreshContents();
3116
-        } else if (event.getSource() == resetAllButton)
3068
+        } else if (source == resetAllButton)
31173069         {
31183070             //CameraPane.fullreset = true;
31193071             copy.ResetAll(); // ResetMeshes();
....@@ -3146,53 +3098,75 @@
31463098         //			Close();
31473099         //		}
31483100         //                else
3149
-        if (event.getSource() == resetSlidersButton)
3101
+        if (source == resetSlidersButton)
31503102         {
31513103             ResetSliders();
3152
-        } else if (event.getSource() == clearMaterialButton)
3104
+        } else if (source == clearMaterialButton)
31533105         {
31543106             ClearMaterial();
3155
-        } else if (event.getSource() == createMaterialButton)
3107
+        } else if (source == createMaterialButton)
31563108         {
31573109             CreateMaterial();
3158
-        } else if (event.getSource() == clearPanelButton)
3110
+        } else if (source == clearPanelButton)
31593111         {
31603112             copy.ClearUI();
31613113             refreshContents(true);
3162
-        } /*
3163
-        }
3164
-        
3165
-        public boolean action(Event event, Object arg)
3166
-        {
3167
-         */ else if (event.getSource() == closeItem)
3114
+        } else if (source == importGFDItem)
3115
+		{
3116
+			ImportGFD();
3117
+		} else
3118
+		if (source == importVRMLX3DItem)
3119
+		{
3120
+			ImportVRMLX3D();
3121
+		} else
3122
+		if (source == import3DSItem)
3123
+		{
3124
+			objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
3125
+		} else
3126
+		if (source == importOBJItem)
3127
+		{
3128
+			//objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
3129
+                            FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
3130
+                            browser.setVisible(true);
3131
+                            String filename = browser.getFile();
3132
+                            if (filename != null && filename.length() > 0)
3133
+                            {
3134
+                                String fullname = browser.getDirectory() + filename;
3135
+                                makeSomething(ReadOBJ(fullname), true);
3136
+                            }
3137
+		} else
3138
+        if (source == closeItem)
31683139         {
31693140             Close();
31703141             //return true;
3171
-        } else if (event.getSource() == loadItem)
3142
+        } else if (source == loadItem)
31723143         {
31733144             load();
31743145             //return true;
3175
-        } else if (event.getSource() == saveItem)
3146
+        } else if (source == newItem)
3147
+        {
3148
+            New();
3149
+        } else if (source == saveItem)
31763150         {
31773151             save();
31783152             //return true;
3179
-        } else if (event.getSource() == saveAsItem)
3153
+        } else if (source == saveAsItem)
31803154         {
31813155             saveAs();
31823156             //return true;
3183
-        } else if (event.getSource() == reexportItem)
3157
+        } else if (source == reexportItem)
31843158         {
31853159             reexport();
31863160             //return true;
3187
-        } else if (event.getSource() == exportAsItem)
3161
+        } else if (source == exportAsItem)
31883162         {
31893163             export();
31903164             //return true;
3191
-        } else if (event.getSource() == povItem)
3165
+        } else if (source == povItem)
31923166         {
31933167             generatePOV();
31943168             //return true;
3195
-        } else if (event.getSource() == zBufferItem)
3169
+        } else if (source == zBufferItem)
31963170         {
31973171             try
31983172             {
....@@ -3214,21 +3188,8 @@
32143188         cameraView.repaint();
32153189         //return true;
32163190         }
3217
-         */ else if (event.getSource() == editCameraItem)
3218
-        {
3219
-            cameraView.ProtectCamera();
3220
-            cameraView.repaint();
3221
-            return;
3222
-        } else if (event.getSource() == revertCameraItem)
3223
-        {
3224
-            cameraView.RevertCamera();
3225
-            cameraView.repaint();
3226
-            return;
3227
-//        } else if (event.getSource() == textureButton)
3228
-//        {
3229
-//            return; // true;
3230
-        } else // combos...
3231
-        if (event.getSource() == texresMenu)
3191
+         */ else // combos...
3192
+        if (source == texresMenu)
32323193         {
32333194             System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
32343195             copy.texres = texresMenu.getSelectedIndex();
....@@ -3240,6 +3201,48 @@
32403201         }
32413202     }
32423203 
3204
+    void New()
3205
+    {
3206
+        while (copy.Size() > 1)
3207
+        {
3208
+            copy.remove(1);
3209
+        }
3210
+        ResetModel();
3211
+        objEditor.refreshContents();
3212
+    }
3213
+    
3214
+        void ImportGFD()
3215
+        {
3216
+            FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3217
+            browser.show();
3218
+            String filename = browser.getFile();
3219
+            if (filename != null && filename.length() > 0)
3220
+            {
3221
+                String fullname = browser.getDirectory() + filename;
3222
+
3223
+                //Object3D readobj =
3224
+                        objEditor.ReadGFD(fullname, objEditor);
3225
+                //makeSomething(readobj);
3226
+            }
3227
+        }
3228
+        
3229
+	void ImportVRMLX3D()
3230
+	{
3231
+		if (Grafreed.standAlone)
3232
+		{
3233
+                    /**/
3234
+			FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
3235
+			browser.show();
3236
+			String filename = browser.getFile();
3237
+			if (filename != null && filename.length() > 0)
3238
+			{
3239
+				String fullname = browser.getDirectory() + filename;
3240
+                                LoadVRMLX3D(fullname);
3241
+			}
3242
+                     /**/
3243
+		}
3244
+	}
3245
+				
32433246     void ToggleAnimation()
32443247     {
32453248         if (!Globals.ANIMATION)
....@@ -3588,7 +3591,7 @@
35883591         }
35893592         
35903593         if (normalpushField != null)
3591
-                copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
3594
+                copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
35923595     }
35933596 
35943597         void SnapObject()
....@@ -4055,6 +4058,7 @@
40554058             }
40564059         }
40574060     }
4061
+    
40584062     LoadGFDThread loadGFDThread;
40594063 
40604064     void ReadGFD(String fullname, iCallBack cb)
....@@ -4075,7 +4079,8 @@
40754079         try
40764080         {
40774081             java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4078
-            java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4082
+            java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4083
+            java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
40794084 
40804085             readobj = (Object3D) p.readObject();
40814086             istream.close();
....@@ -4083,7 +4088,20 @@
40834088             readobj.ResetDisplayList();
40844089         } catch (Exception e)
40854090         {
4086
-            e.printStackTrace();
4091
+            //e.printStackTrace();
4092
+            try
4093
+            {
4094
+                java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4095
+                java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4096
+
4097
+                readobj = (Object3D) p.readObject();
4098
+                istream.close();
4099
+
4100
+                readobj.ResetDisplayList();
4101
+            } catch (Exception e2)
4102
+            {
4103
+                e2.printStackTrace();
4104
+            }
40874105         }
40884106 //            catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
40894107 //            catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
....@@ -4287,11 +4305,13 @@
42874305         try
42884306         {
42894307             FileOutputStream ostream = new FileOutputStream(lastname);
4290
-            ObjectOutputStream p = new ObjectOutputStream(ostream);
4308
+            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4309
+            ObjectOutputStream p = new ObjectOutputStream(zstream);
42914310 
42924311             p.writeObject(copy);
42934312             p.flush();
42944313 
4314
+            zstream.close();
42954315             ostream.close();
42964316 
42974317             //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4301,6 +4321,7 @@
43014321         {
43024322         }
43034323     }
4324
+    
43044325     String lastname;
43054326 
43064327     void saveAs()
....@@ -4410,8 +4431,8 @@
44104431         try
44114432         {
44124433             FileOutputStream ostream = new FileOutputStream(filename);
4413
-            // ??        java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4414
-            ObjectOutputStream p = new ObjectOutputStream(/*z*/ostream);
4434
+            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4435
+            ObjectOutputStream p = new ObjectOutputStream(zstream);
44154436 
44164437             Object3D objectparent = obj.parent;
44174438             obj.parent = null;
....@@ -4428,8 +4449,8 @@
44284449             p.writeObject(object);
44294450             p.flush();
44304451 
4452
+            zstream.close();
44314453             ostream.close();
4432
-            //       zstream.close();
44334454 
44344455 //                                    group.selection.get(0).parent = parent;
44354456             //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4476,7 +4497,8 @@
44764497     Object3D client;
44774498     Object3D copy;
44784499     MenuBar menuBar;
4479
-    Menu windowMenu;
4500
+    Menu fileMenu;
4501
+    MenuItem newItem;
44804502     MenuItem loadItem;
44814503     MenuItem saveItem;
44824504     MenuItem saveAsItem;
....@@ -4484,11 +4506,9 @@
44844506     MenuItem reexportItem;
44854507     MenuItem povItem;
44864508     MenuItem closeItem;
4487
-    Menu cameraMenu;
4509
+    
44884510     CheckboxMenuItem zBufferItem;
44894511     //MenuItem normalLensItem;
4490
-    MenuItem editCameraItem;
4491
-    MenuItem revertCameraItem;
44924512     MenuItem stepItem;
44934513     CheckboxMenuItem toggleLiveItem;
44944514     CheckboxMenuItem toggleFullScreenItem;
....@@ -4636,4 +4656,9 @@
46364656     //ObjectUI parent;
46374657     
46384658     cNumberSlider normalpushField;
4659
+    
4660
+	private MenuItem importGFDItem;
4661
+	private MenuItem importVRMLX3DItem;
4662
+	private MenuItem import3DSItem;
4663
+	private MenuItem importOBJItem;
46394664 }