Menu cleanup + transform feedback.

Normand Briere

2019-06-09 c5b599b48b333b34e554b464aefbca0b9bc66275

 GroupEditor.java
..
..
@@ -74,7 +74,7 @@
74
74
 		this.copy = this.group = copy;
75
75
 		//selectees = this.group.selectees;
76
76
 		
77
-		SetupMenu2(objEditor);
77
+		SetupMenu2(this); //objEditor);
78
78
 		SetupUI2(objEditor);
79
79
 		objEditor.SetupUI(true);
80
80
 		SetupViews(objEditor);
..
..
@@ -148,23 +148,8 @@
148
148
         
149
149
     //JTextField nameField;
150
150
     
151
-	void SetupMenu2(ObjEditor oe)
151
+	void SetupMenu2(GroupEditor oe)
152
152
 	{
153
-        if (Globals.ADVANCED)
154
-        {
155
-		oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156
-		//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157
-		//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158
-		editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159
-		oe.cameraMenu.add("-");
160
-		openWindowItem =  oe.cameraMenu.add(new MenuItem("Edit copy..."));
161
-		openWindowItem.addActionListener(this);
162
-		editLeafItem.addActionListener(this);
163
-		lookAtItem.addActionListener(this);
164
-		//lookFromItem.addActinoListener(this);
165
-		//switchItem.addActionListener(this);
166
-        }
167
-        
168
153
 		Menu menu;
169
154
 		oe.menuBar.add(menu = new Menu("Edit"));
170
155
 		//editItem = menu.add(new MenuItem("Edit"));
..
..
@@ -206,14 +191,97 @@
206
191
 		clearAllItem = menu.add(new MenuItem("Clear All"));
207
192
 		clearAllItem.addActionListener(this);
208
193
         }
194
+        
195
+        menuBar.add(cameraMenu = new Menu("View"));
196
+        //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
197
+        //zBufferItem.addActionListener(this);
198
+        //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
199
+        //normalLensItem.addActionListener(this);
200
+        cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
201
+        revertCameraItem.addActionListener(this);
202
+        
203
+        cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
204
+        toggleFullScreenItem.addItemListener(this);
205
+        toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
206
+        cameraMenu.add("-");
207
+        
208
+        cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
209
+        toggleTextureItem.addItemListener(this);
210
+        toggleTextureItem.setState(CameraPane.textureon);
211
+        
212
+        cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
213
+        toggleSwitchItem.addItemListener(this);
214
+        toggleSwitchItem.setState(CameraPane.SWITCH);
215
+        
216
+        cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
217
+        toggleHandleItem.addItemListener(this);
218
+        toggleHandleItem.setState(CameraPane.HANDLES);
219
+        
220
+        cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
221
+        togglePaintItem.addItemListener(this);
222
+        togglePaintItem.setState(CameraPane.PAINTMODE);
223
+        
224
+        if (Globals.ADVANCED)
225
+        {
226
+        cameraMenu.add("-");
227
+                cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
228
+                toggleLiveItem.addItemListener(this);
229
+                toggleLiveItem.setState(Globals.isLIVE());
209
230
 
231
+                cameraMenu.add(stepItem = new MenuItem("Step"));
232
+                stepItem.addActionListener(this);
233
+        //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
234
+        //		toggleDLItem.addItemListener(this);
235
+        //                toggleDLItem.setState(false);
236
+
237
+                cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
238
+                toggleRenderItem.addItemListener(this);
239
+                toggleRenderItem.setState(!CameraPane.frozen);
240
+
241
+                cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
242
+                toggleDebugItem.addItemListener(this);
243
+                toggleDebugItem.setState(CameraPane.DEBUG);
244
+
245
+                cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
246
+                toggleFrustumItem.addItemListener(this);
247
+                toggleFrustumItem.setState(CameraPane.FRUSTUM);
248
+
249
+                cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
250
+                toggleFootContactItem.addItemListener(this);
251
+                toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
252
+                
253
+                cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
254
+                toggleTimelineItem.addItemListener(this);
255
+        }
256
+        
257
+//		cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
258
+//		toggleRootItem.addItemListener(this);
259
+//                    toggleRootItem.setState(false);
260
+//		cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
261
+//		animationItem.addItemListener(this);
262
+//                    animationItem.setState(CameraPane.ANIMATION);
263
+        cameraMenu.add("-");
264
+        cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
265
+        editCameraItem.addActionListener(this);
266
+        
267
+        if (Globals.ADVANCED)
268
+        {
269
+		oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
270
+		//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
271
+		//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
272
+		editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
273
+		oe.cameraMenu.add("-");
274
+		openWindowItem =  oe.cameraMenu.add(new MenuItem("Edit copy..."));
275
+		openWindowItem.addActionListener(this);
276
+		editLeafItem.addActionListener(this);
277
+		lookAtItem.addActionListener(this);
278
+		//lookFromItem.addActinoListener(this);
279
+		//switchItem.addActionListener(this);
280
+        }
281
+        
210
282
 		oe.menuBar.add(menu = new Menu("Setting"));
211
283
         if (Globals.ADVANCED)
212
284
         {
213
-                resetMeshItem = menu.add(new MenuItem("Reset All"));
214
-		resetMeshItem.addActionListener(this);
215
-		stepAllItem = menu.add(new MenuItem("Step All"));
216
-		stepAllItem.addActionListener(this);
217
285
 		revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218
286
 		revertMeshItem.addActionListener(this);
219
287
 		resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..
..
@@ -372,6 +440,10 @@
372
440
                 oe.menuBar.add(menu = new Menu("Attributes"));
373
441
 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
374
442
 		clearMaterialsItem.addActionListener(this);
443
+                resetAllItem = menu.add(new MenuItem("Reset All"));
444
+		resetAllItem.addActionListener(this);
445
+		stepAllItem = menu.add(new MenuItem("Step All"));
446
+		stepAllItem.addActionListener(this);
375
447
 		menu.add("-");
376
448
 		liveleavesItem = menu.add(new MenuItem("Live Leaves"));
377
449
 		liveleavesItem.addActionListener(this);
..
..
@@ -443,19 +515,6 @@
443
515
 		oe.menuBar.add(menu = new Menu("Insert"));
444
516
 		buildCreateMenu(menu);
445
517
                 
446
-                oe.menuBar.add(menu = new Menu("Include"));
447
-		importOBJItem = menu.add(new MenuItem("OBJ file..."));
448
-		importOBJItem.addActionListener(this);
449
-		menu.add("-");
450
-		import3DSItem = menu.add(new MenuItem("3DS file..."));
451
-		import3DSItem.addActionListener(this);
452
-		menu.add("-");
453
-		importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
454
-		importVRMLX3DItem.addActionListener(this);
455
-		menu.add("-");
456
-		importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
457
-		importGFDItem.addActionListener(this);
458
-
459
518
                 oe.menuBar.add(menu = new Menu("Tools"));
460
519
 		buildToolsMenu(menu);
461
520
 	}
..
..
@@ -493,7 +552,7 @@
493
552
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
494
553
                 
495
554
                 oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
496
-                liveCB.setToolTipText("Enabled animation");
555
+                liveCB.setToolTipText("Enable animation");
497
556
                                 liveCB.addItemListener(this);
498
557
 
499
558
 		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -729,6 +788,7 @@
729
788
             buttonGroup.add(radioButton);
730
789
             radioButton.doClick();
731
790
         }
791
+        
732
792
         void SetupViews(ObjEditor oe)
733
793
         {
734
794
             oe.SetupViews();
..
..
@@ -1854,31 +1914,6 @@
1854
1914
                         csg.addChild(child);
1855
1915
                         child.addChild(csg);
1856
1916
 		} else
1857
-                    
1858
-		if (source == importGFDItem)
1859
-		{
1860
-			ImportGFD();
1861
-		} else
1862
-		if (source == importVRMLX3DItem)
1863
-		{
1864
-			ImportVRMLX3D();
1865
-		} else
1866
-		if (source == import3DSItem)
1867
-		{
1868
-			objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1869
-		} else
1870
-		if (source == importOBJItem)
1871
-		{
1872
-			//objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1873
-                            FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1874
-                            browser.setVisible(true);
1875
-                            String filename = browser.getFile();
1876
-                            if (filename != null && filename.length() > 0)
1877
-                            {
1878
-                                String fullname = browser.getDirectory() + filename;
1879
-                                makeSomething(ReadOBJ(fullname), true);
1880
-                            }
1881
-		} else
1882
1917
 		if (source == computeAOItem)
1883
1918
 		{
1884
1919
                     Globals.drawMode = CameraPane.OCCLUSION;
..
..
@@ -2281,7 +2316,7 @@
2281
2316
 		{
2282
2317
 			RevertMeshes();
2283
2318
 		} else
2284
-		if (source == resetMeshItem)
2319
+		if (source == resetAllItem)
2285
2320
 		{
2286
2321
 			ResetAll();
2287
2322
 		} else
..
..
@@ -3079,7 +3114,9 @@
3079
3114
                         frontView.object = group;
3080
3115
                         sideView.object = group;
3081
3116
                     }
3082
-                    group.editWindow = this;
3117
+                    
3118
+// fix "+" issue                    group.editWindow = this;
3119
+                    
3083
3120
                     /*
3084
3121
                     currentLayout = radio.layout;
3085
3122
                     if (currentLayout == null)
..
..
@@ -3092,7 +3129,20 @@
3092
3129
                     //group.attributes = -1;
3093
3130
                     ResetModel();
3094
3131
                     refreshContents(true);
3095
-                }
3132
+                } else if (event.getSource() == editCameraItem)
3133
+                {
3134
+                    cameraView.ProtectCamera();
3135
+                    cameraView.repaint();
3136
+                    return;
3137
+                } else if (event.getSource() == revertCameraItem)
3138
+                {
3139
+                    cameraView.RevertCamera();
3140
+                    cameraView.repaint();
3141
+                    return;
3142
+        //        } else if (event.getSource() == textureButton)
3143
+        //        {
3144
+        //            return; // true;
3145
+                } 
3096
3146
                 else
3097
3147
                 {
3098
3148
 			//return super.action(event, arg);
..
..
@@ -3652,7 +3702,16 @@
3652
3702
                             String pigment = Object3D.GetPigment(tex);
3653
3703
                             //String bump = Object3D.GetBump(tex);
3654
3704
                             
3655
-                            com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3705
+                            com.sun.opengl.util.texture.TextureData texturedata = null;
3706
+                            
3707
+                            try
3708
+                            {
3709
+                                texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3710
+                            }
3711
+                            catch (Exception e)
3712
+                            {
3713
+                                System.err.println("FAIL: " + node);
3714
+                            }
3656
3715
                             
3657
3716
                             double s = v.s;
3658
3717
                             
..
..
@@ -4124,7 +4183,7 @@
4124
4183
                     objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4125
4184
                     
4126
4185
 			Object3D elem = (Object3D)group.selection.elementAt(i);
4127
-                        if(elem != group)
4186
+                        if(elem != group || !newWindow)
4128
4187
                         {
4129
4188
                         //    if (!(elem instanceof Composite))
4130
4189
                         //        newWindow = false;
..
..
@@ -4961,21 +5020,6 @@
4961
5020
         }
4962
5021
          */
4963
5022
 
4964
-        void ImportGFD()
4965
-        {
4966
-            FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4967
-            browser.show();
4968
-            String filename = browser.getFile();
4969
-            if (filename != null && filename.length() > 0)
4970
-            {
4971
-                String fullname = browser.getDirectory() + filename;
4972
-
4973
-                //Object3D readobj =
4974
-                        objEditor.ReadGFD(fullname, objEditor);
4975
-                //makeSomething(readobj);
4976
-            }
4977
-        }
4978
-        
4979
5023
         /*
4980
5024
         public void Callback(Object obj)
4981
5025
         {
..
..
@@ -4999,23 +5043,6 @@
4999
5043
         }
5000
5044
          */
5001
5045
 
5002
-	void ImportVRMLX3D()
5003
-	{
5004
-		if (Grafreed.standAlone)
5005
-		{
5006
-                    /**/
5007
-			FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
5008
-			browser.show();
5009
-			String filename = browser.getFile();
5010
-			if (filename != null && filename.length() > 0)
5011
-			{
5012
-				String fullname = browser.getDirectory() + filename;
5013
-                                LoadVRMLX3D(fullname);
5014
-			}
5015
-                     /**/
5016
-		}
5017
-	}
5018
-				
5019
5046
 	String GetFile(String dialogName)
5020
5047
 	{
5021
5048
 		if (Grafreed.standAlone)
..
..
@@ -5131,7 +5158,7 @@
5131
5158
 	private MenuItem linkverticesItem;
5132
5159
 	private MenuItem relinkverticesItem;
5133
5160
 	private MenuItem setMasterItem;
5134
-	private MenuItem resetMeshItem;
5161
+	private MenuItem resetAllItem;
5135
5162
 	private MenuItem stepAllItem;
5136
5163
 	private MenuItem revertMeshItem;
5137
5164
 	private MenuItem poseMeshItem;
..
..
@@ -5264,11 +5291,6 @@
5264
5291
 	private MenuItem doubleItem;
5265
5292
 	private MenuItem tripleItem;
5266
5293
         
5267
-	private MenuItem importGFDItem;
5268
-	private MenuItem importVRMLX3DItem;
5269
-	private MenuItem import3DSItem;
5270
-	private MenuItem importOBJItem;
5271
-
5272
5294
 	private MenuItem computeAOItem;
5273
5295
 	private MenuItem recompileItem;
5274
5296
 	private MenuItem editScriptItem;
..
..
@@ -5278,4 +5300,8 @@
5278
5300
 	private MenuItem analyzeItem;
5279
5301
 	private MenuItem dumpItem;
5280
5302
 	//boolean freezemodel = false;
5303
+        
5304
+    Menu cameraMenu;
5305
+    MenuItem editCameraItem;
5306
+    MenuItem revertCameraItem;
5281
5307
 }