Menu cleanup + transform feedback.

Normand Briere

2019-06-09 c5b599b48b333b34e554b464aefbca0b9bc66275

 ObjEditor.java
..
..
@@ -276,24 +276,40 @@
276
276
     void SetupMenu()
277
277
     {
278
278
         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..."));
284
299
         //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("-");
289
304
         if (client.parent != null)
290
305
         {
291
-            windowMenu.add(closeItem = new MenuItem("Close"));
306
+            fileMenu.add(closeItem = new MenuItem("Close"));
292
307
         } else
293
308
         {
294
-            windowMenu.add(closeItem = new MenuItem("Exit"));
309
+            fileMenu.add(closeItem = new MenuItem("Exit"));
295
310
         }
296
311
 
312
+        newItem.addActionListener(this);
297
313
         loadItem.addActionListener(this);
298
314
         saveItem.addActionListener(this);
299
315
         saveAsItem.addActionListener(this);
..
..
@@ -301,78 +317,6 @@
301
317
         reexportItem.addActionListener(this);
302
318
         //povItem.addActionListener(this);
303
319
         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);
376
320
 
377
321
         objectPanel = new JTabbedPane();
378
322
         toolbarPanel = new JPanel();
..
..
@@ -3052,8 +2996,9 @@
3052
2996
 
3053
2997
     public void actionPerformed(ActionEvent event)
3054
2998
     {
2999
+        Object source = event.getSource();
3055
3000
         // SCRIPT DIALOG
3056
-        if (event.getSource() == okbutton)
3001
+        if (source == okbutton)
3057
3002
         {
3058
3003
             textpanel.setVisible(false);
3059
3004
             textpanel.remove(textarea);
..
..
@@ -3065,7 +3010,7 @@
3065
3010
             textarea = null;
3066
3011
             textpanel = null;
3067
3012
         }
3068
-        if (event.getSource() == cancelbutton)
3013
+        if (source == cancelbutton)
3069
3014
         {
3070
3015
             textpanel.setVisible(false);
3071
3016
             textpanel.remove(textarea);
..
..
@@ -3077,50 +3022,50 @@
3077
3022
         //applySelf();
3078
3023
         //client.refreshEditWindow();
3079
3024
         //refreshContents();
3080
-        if (event.getSource() == nameField)
3025
+        if (source == nameField)
3081
3026
         {
3082
3027
             //System.out.println("ObjEditor " + event);
3083
3028
             applySelf0(true);
3084
3029
             //parent.applySelf();
3085
3030
             objEditor.refreshContents();
3086
-        } else if (event.getSource() == resetButton)
3031
+        } else if (source == resetButton)
3087
3032
         {
3088
3033
             CameraPane.fullreset = true;
3089
3034
             copy.Reset(); // ResetMeshes();
3090
3035
             copy.Touch();
3091
3036
             objEditor.refreshContents();
3092
-        } else if (event.getSource() == stepItem)
3037
+        } else if (source == stepItem)
3093
3038
         {
3094
3039
             //cameraView.ONESTEP = true;
3095
3040
             Globals.ONESTEP = true;
3096
3041
             cameraView.repaint();
3097
3042
             return;
3098
-        } else if (event.getSource() == stepButton)
3043
+        } else if (source == stepButton)
3099
3044
         {
3100
3045
             copy.Step();
3101
3046
             copy.Touch();
3102
3047
             objEditor.refreshContents();
3103
-        } else if (event.getSource() == slowerButton)
3048
+        } else if (source == slowerButton)
3104
3049
         {
3105
3050
             copy.Slower();
3106
3051
             copy.Touch();
3107
3052
             objEditor.refreshContents();
3108
-        } else if (event.getSource() == fasterButton)
3053
+        } else if (source == fasterButton)
3109
3054
         {
3110
3055
             copy.Faster();
3111
3056
             copy.Touch();
3112
3057
             objEditor.refreshContents();
3113
-        } else if (event.getSource() == remarkButton)
3058
+        } else if (source == remarkButton)
3114
3059
         {
3115
3060
             copy.Remark();
3116
3061
             copy.Touch();
3117
3062
             objEditor.refreshContents();
3118
-        } else if (event.getSource() == stepAllButton)
3063
+        } else if (source == stepAllButton)
3119
3064
         {
3120
3065
             copy.StepAll();
3121
3066
             copy.Touch();
3122
3067
             objEditor.refreshContents();
3123
-        } else if (event.getSource() == resetAllButton)
3068
+        } else if (source == resetAllButton)
3124
3069
         {
3125
3070
             //CameraPane.fullreset = true;
3126
3071
             copy.ResetAll(); // ResetMeshes();
..
..
@@ -3153,53 +3098,75 @@
3153
3098
         //			Close();
3154
3099
         //		}
3155
3100
         //                else
3156
-        if (event.getSource() == resetSlidersButton)
3101
+        if (source == resetSlidersButton)
3157
3102
         {
3158
3103
             ResetSliders();
3159
-        } else if (event.getSource() == clearMaterialButton)
3104
+        } else if (source == clearMaterialButton)
3160
3105
         {
3161
3106
             ClearMaterial();
3162
-        } else if (event.getSource() == createMaterialButton)
3107
+        } else if (source == createMaterialButton)
3163
3108
         {
3164
3109
             CreateMaterial();
3165
-        } else if (event.getSource() == clearPanelButton)
3110
+        } else if (source == clearPanelButton)
3166
3111
         {
3167
3112
             copy.ClearUI();
3168
3113
             refreshContents(true);
3169
-        } /*
3170
-        }
3171
-        
3172
-        public boolean action(Event event, Object arg)
3173
-        {
3174
-         */ 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)
3175
3139
         {
3176
3140
             Close();
3177
3141
             //return true;
3178
-        } else if (event.getSource() == loadItem)
3142
+        } else if (source == loadItem)
3179
3143
         {
3180
3144
             load();
3181
3145
             //return true;
3182
-        } else if (event.getSource() == saveItem)
3146
+        } else if (source == newItem)
3147
+        {
3148
+            New();
3149
+        } else if (source == saveItem)
3183
3150
         {
3184
3151
             save();
3185
3152
             //return true;
3186
-        } else if (event.getSource() == saveAsItem)
3153
+        } else if (source == saveAsItem)
3187
3154
         {
3188
3155
             saveAs();
3189
3156
             //return true;
3190
-        } else if (event.getSource() == reexportItem)
3157
+        } else if (source == reexportItem)
3191
3158
         {
3192
3159
             reexport();
3193
3160
             //return true;
3194
-        } else if (event.getSource() == exportAsItem)
3161
+        } else if (source == exportAsItem)
3195
3162
         {
3196
3163
             export();
3197
3164
             //return true;
3198
-        } else if (event.getSource() == povItem)
3165
+        } else if (source == povItem)
3199
3166
         {
3200
3167
             generatePOV();
3201
3168
             //return true;
3202
-        } else if (event.getSource() == zBufferItem)
3169
+        } else if (source == zBufferItem)
3203
3170
         {
3204
3171
             try
3205
3172
             {
..
..
@@ -3221,21 +3188,8 @@
3221
3188
         cameraView.repaint();
3222
3189
         //return true;
3223
3190
         }
3224
-         */ else if (event.getSource() == editCameraItem)
3225
-        {
3226
-            cameraView.ProtectCamera();
3227
-            cameraView.repaint();
3228
-            return;
3229
-        } else if (event.getSource() == revertCameraItem)
3230
-        {
3231
-            cameraView.RevertCamera();
3232
-            cameraView.repaint();
3233
-            return;
3234
-//        } else if (event.getSource() == textureButton)
3235
-//        {
3236
-//            return; // true;
3237
-        } else // combos...
3238
-        if (event.getSource() == texresMenu)
3191
+         */ else // combos...
3192
+        if (source == texresMenu)
3239
3193
         {
3240
3194
             System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3241
3195
             copy.texres = texresMenu.getSelectedIndex();
..
..
@@ -3247,6 +3201,48 @@
3247
3201
         }
3248
3202
     }
3249
3203
 
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
+				
3250
3246
     void ToggleAnimation()
3251
3247
     {
3252
3248
         if (!Globals.ANIMATION)
..
..
@@ -4501,7 +4497,8 @@
4501
4497
     Object3D client;
4502
4498
     Object3D copy;
4503
4499
     MenuBar menuBar;
4504
-    Menu windowMenu;
4500
+    Menu fileMenu;
4501
+    MenuItem newItem;
4505
4502
     MenuItem loadItem;
4506
4503
     MenuItem saveItem;
4507
4504
     MenuItem saveAsItem;
..
..
@@ -4509,11 +4506,9 @@
4509
4506
     MenuItem reexportItem;
4510
4507
     MenuItem povItem;
4511
4508
     MenuItem closeItem;
4512
-    Menu cameraMenu;
4509
+    
4513
4510
     CheckboxMenuItem zBufferItem;
4514
4511
     //MenuItem normalLensItem;
4515
-    MenuItem editCameraItem;
4516
-    MenuItem revertCameraItem;
4517
4512
     MenuItem stepItem;
4518
4513
     CheckboxMenuItem toggleLiveItem;
4519
4514
     CheckboxMenuItem toggleFullScreenItem;
..
..
@@ -4661,4 +4656,9 @@
4661
4656
     //ObjectUI parent;
4662
4657
     
4663
4658
     cNumberSlider normalpushField;
4659
+    
4660
+	private MenuItem importGFDItem;
4661
+	private MenuItem importVRMLX3DItem;
4662
+	private MenuItem import3DSItem;
4663
+	private MenuItem importOBJItem;
4664
4664
 }