blame | history | patch | commit | commitdiff
Normand Briere
2019-06-11 1d909ffa0c2beb51d453b53b845c4f3a749ca5f0 
 GroupEditor.java
....@@ -74,7 +74,7 @@
7474 		this.copy = this.group = copy;
7575 		//selectees = this.group.selectees;
7676 		
77
-		SetupMenu2(objEditor);
77
+		SetupMenu2(this); //objEditor);
7878 		SetupUI2(objEditor);
7979 		objEditor.SetupUI(true);
8080 		SetupViews(objEditor);
....@@ -148,27 +148,18 @@
148148         
149149     //JTextField nameField;
150150     
151
-	void SetupMenu2(ObjEditor oe)
151
+	void SetupMenu2(GroupEditor oe)
152152 	{
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
-        
168153 		Menu menu;
169154 		oe.menuBar.add(menu = new Menu("Edit"));
170155 		//editItem = menu.add(new MenuItem("Edit"));
171156 		//editItem.addActionListener(this);
157
+                
158
+//		undoItem = menu.add(new MenuItem("Undo"));
159
+//		undoItem.addActionListener(this);
160
+//		redoItem = menu.add(new MenuItem("Redo"));
161
+//		redoItem.addActionListener(this);
162
+//		menu.add("-");
172163 		duplicateItem = menu.add(new MenuItem("Duplicate"));
173164 		duplicateItem.addActionListener(this);
174165 		cloneItem = menu.add(new MenuItem("Clone"));
....@@ -206,7 +197,94 @@
206197 		clearAllItem = menu.add(new MenuItem("Clear All"));
207198 		clearAllItem.addActionListener(this);
208199         }
200
+        
201
+        menuBar.add(cameraMenu = new Menu("View"));
202
+        //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
203
+        //zBufferItem.addActionListener(this);
204
+        //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205
+        //normalLensItem.addActionListener(this);
206
+        cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207
+        revertCameraItem.addActionListener(this);
208
+        
209
+        cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210
+        toggleFullScreenItem.addItemListener(this);
211
+        toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212
+        cameraMenu.add("-");
213
+        
214
+        cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
215
+        toggleTextureItem.addItemListener(this);
216
+        toggleTextureItem.setState(CameraPane.textureon);
217
+        
218
+        cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
219
+        toggleSwitchItem.addItemListener(this);
220
+        toggleSwitchItem.setState(CameraPane.SWITCH);
221
+        
222
+        cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
223
+        toggleHandleItem.addItemListener(this);
224
+        toggleHandleItem.setState(CameraPane.HANDLES);
225
+        
226
+        cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
227
+        togglePaintItem.addItemListener(this);
228
+        togglePaintItem.setState(CameraPane.PAINTMODE);
229
+        
230
+        if (Globals.ADVANCED)
231
+        {
232
+        cameraMenu.add("-");
233
+                cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
234
+                toggleLiveItem.addItemListener(this);
235
+                toggleLiveItem.setState(Globals.isLIVE());
209236 
237
+                cameraMenu.add(stepItem = new MenuItem("Step"));
238
+                stepItem.addActionListener(this);
239
+        //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
240
+        //		toggleDLItem.addItemListener(this);
241
+        //                toggleDLItem.setState(false);
242
+
243
+                cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
244
+                toggleRenderItem.addItemListener(this);
245
+                toggleRenderItem.setState(!CameraPane.frozen);
246
+
247
+                cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248
+                toggleDebugItem.addItemListener(this);
249
+                toggleDebugItem.setState(CameraPane.DEBUG);
250
+
251
+                cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252
+                toggleFrustumItem.addItemListener(this);
253
+                toggleFrustumItem.setState(CameraPane.FRUSTUM);
254
+
255
+                cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
256
+                toggleFootContactItem.addItemListener(this);
257
+                toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
258
+                
259
+                cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
260
+                toggleTimelineItem.addItemListener(this);
261
+        }
262
+        
263
+//		cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
264
+//		toggleRootItem.addItemListener(this);
265
+//                    toggleRootItem.setState(false);
266
+//		cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
267
+//		animationItem.addItemListener(this);
268
+//                    animationItem.setState(CameraPane.ANIMATION);
269
+        cameraMenu.add("-");
270
+        cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
271
+        editCameraItem.addActionListener(this);
272
+        
273
+        if (Globals.ADVANCED)
274
+        {
275
+		oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276
+		//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277
+		//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
278
+		editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
279
+		oe.cameraMenu.add("-");
280
+		openWindowItem =  oe.cameraMenu.add(new MenuItem("Edit copy..."));
281
+		openWindowItem.addActionListener(this);
282
+		editLeafItem.addActionListener(this);
283
+		lookAtItem.addActionListener(this);
284
+		//lookFromItem.addActinoListener(this);
285
+		//switchItem.addActionListener(this);
286
+        }
287
+        
210288 		oe.menuBar.add(menu = new Menu("Setting"));
211289         if (Globals.ADVANCED)
212290         {
....@@ -443,19 +521,6 @@
443521 		oe.menuBar.add(menu = new Menu("Insert"));
444522 		buildCreateMenu(menu);
445523                 
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
-
459524                 oe.menuBar.add(menu = new Menu("Tools"));
460525 		buildToolsMenu(menu);
461526 	}
....@@ -491,6 +556,18 @@
491556         oe.buttonGroup.add(dummyButton);
492557          */
493558                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
559
+                
560
+		oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561
+                undoButton.setToolTipText("Undo changes");
562
+		undoButton.addActionListener(this);
563
+                
564
+		oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565
+                redoButton.setToolTipText("Redo changes");
566
+		redoButton.addActionListener(this);
567
+                
568
+		oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569
+                saveButton.setToolTipText("Save changes");
570
+		saveButton.addActionListener(this);
494571                 
495572                 oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
496573                 liveCB.setToolTipText("Enable animation");
....@@ -1855,31 +1932,6 @@
18551932                         csg.addChild(child);
18561933                         child.addChild(csg);
18571934 		} else
1858
-                    
1859
-		if (source == importGFDItem)
1860
-		{
1861
-			ImportGFD();
1862
-		} else
1863
-		if (source == importVRMLX3DItem)
1864
-		{
1865
-			ImportVRMLX3D();
1866
-		} else
1867
-		if (source == import3DSItem)
1868
-		{
1869
-			objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1870
-		} else
1871
-		if (source == importOBJItem)
1872
-		{
1873
-			//objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1874
-                            FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1875
-                            browser.setVisible(true);
1876
-                            String filename = browser.getFile();
1877
-                            if (filename != null && filename.length() > 0)
1878
-                            {
1879
-                                String fullname = browser.getDirectory() + filename;
1880
-                                makeSomething(ReadOBJ(fullname), true);
1881
-                            }
1882
-		} else
18831935 		if (source == computeAOItem)
18841936 		{
18851937                     Globals.drawMode = CameraPane.OCCLUSION;
....@@ -1916,6 +1968,18 @@
19161968 		if (source == dumpItem)
19171969 		{
19181970                     DumpObject();
1971
+		} else
1972
+		if (source == undoButton)
1973
+		{
1974
+			Undo();
1975
+		} else
1976
+		if (source == redoButton)
1977
+		{
1978
+			Redo();
1979
+		} else
1980
+		if (source == saveButton)
1981
+		{
1982
+			Save();
19191983 		} else
19201984 		if (source == oneStepButton)
19211985 		{
....@@ -1970,6 +2034,14 @@
19702034 		if (source == cutItem || source == clearButton)
19712035 		{
19722036 			loadClipboard(true);
2037
+		} else
2038
+		if (source == undoItem)
2039
+		{
2040
+			Undo();
2041
+		} else
2042
+		if (source == redoItem)
2043
+		{
2044
+			Redo();
19732045 		} else
19742046 		if (source == duplicateItem)
19752047 		{
....@@ -2994,7 +3066,7 @@
29943066 				child.CloseUI();
29953067                                 listUI.remove(child);
29963068                                 
2997
-                                child.editWindow = null; // ???????????
3069
+                                //child.editWindow = null; // ???????????
29983070 			}
29993071 			objEditor.ctrlPanel.FlushUI();
30003072 			//objEditor.jTree.clearSelection();
....@@ -3081,7 +3153,8 @@
30813153                         sideView.object = group;
30823154                     }
30833155                     
3084
-// fix "+" issue                    group.editWindow = this;
3156
+// fix "+" issue
3157
+                    group.editWindow = this;
30853158                     
30863159                     /*
30873160                     currentLayout = radio.layout;
....@@ -3095,7 +3168,20 @@
30953168                     //group.attributes = -1;
30963169                     ResetModel();
30973170                     refreshContents(true);
3098
-                }
3171
+                } else if (event.getSource() == editCameraItem)
3172
+                {
3173
+                    cameraView.ProtectCamera();
3174
+                    cameraView.repaint();
3175
+                    return;
3176
+                } else if (event.getSource() == revertCameraItem)
3177
+                {
3178
+                    cameraView.RevertCamera();
3179
+                    cameraView.repaint();
3180
+                    return;
3181
+        //        } else if (event.getSource() == textureButton)
3182
+        //        {
3183
+        //            return; // true;
3184
+                } 
30993185                 else
31003186                 {
31013187 			//return super.action(event, arg);
....@@ -4250,14 +4336,17 @@
42504336 			
42514337                         objEditor.SetText(); // jan 2014
42524338                         
4253
-			if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4339
+			if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
42544340 				CameraPane.flash = true;
42554341                         
4256
-			if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4342
+			if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
42574343                             // a camera
42584344                         {
4259
-                            CameraPane.camerachangeframe = 0; // don't refuse it
4260
-                            Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4345
+                            if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
4346
+                            {
4347
+                                CameraPane.camerachangeframe = 0; // don't refuse it
4348
+                                Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4349
+                            }
42614350                          //   Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
42624351                          //   Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
42634352                         }
....@@ -4341,6 +4430,7 @@
43414430 	{
43424431 		if (group.selection.isEmpty())
43434432 			return;
4433
+                
43444434 		Grafreed.clipboardIsTempGroup = false;
43454435 		Composite tGroup = null;
43464436 		if (group.selection.size() > 0) // 1)
....@@ -4351,6 +4441,7 @@
43514441                 
43524442 		if (cut)
43534443 		{
4444
+                    Save();
43544445 			//int indices[] = jList.getSelectedIndices();
43554446 			//for (int i = indices.length - 1; i >= 0; i--)
43564447 			//jList.remove(indices[i]);
....@@ -4440,8 +4531,10 @@
44404531 			}
44414532 			
44424533 		}
4534
+                
44434535 		if (Grafreed.clipboardIsTempGroup)
44444536 			Grafreed.clipboard = tGroup;
4537
+                
44454538 		if (cut)
44464539                 {
44474540                     ResetModel();
....@@ -4973,21 +5066,6 @@
49735066         }
49745067          */
49755068 
4976
-        void ImportGFD()
4977
-        {
4978
-            FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4979
-            browser.show();
4980
-            String filename = browser.getFile();
4981
-            if (filename != null && filename.length() > 0)
4982
-            {
4983
-                String fullname = browser.getDirectory() + filename;
4984
-
4985
-                //Object3D readobj =
4986
-                        objEditor.ReadGFD(fullname, objEditor);
4987
-                //makeSomething(readobj);
4988
-            }
4989
-        }
4990
-        
49915069         /*
49925070         public void Callback(Object obj)
49935071         {
....@@ -5011,23 +5089,6 @@
50115089         }
50125090          */
50135091 
5014
-	void ImportVRMLX3D()
5015
-	{
5016
-		if (Grafreed.standAlone)
5017
-		{
5018
-                    /**/
5019
-			FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
5020
-			browser.show();
5021
-			String filename = browser.getFile();
5022
-			if (filename != null && filename.length() > 0)
5023
-			{
5024
-				String fullname = browser.getDirectory() + filename;
5025
-                                LoadVRMLX3D(fullname);
5026
-			}
5027
-                     /**/
5028
-		}
5029
-	}
5030
-				
50315092 	String GetFile(String dialogName)
50325093 	{
50335094 		if (Grafreed.standAlone)
....@@ -5098,6 +5159,9 @@
50985159 	cButton clearpanelButton;
50995160 	cButton unselectButton;
51005161 	
5162
+	cButton saveButton;
5163
+	cButton undoButton;
5164
+	cButton redoButton;
51015165 	cButton oneStepButton;
51025166         
51035167 	cButton screenfitButton;
....@@ -5130,6 +5194,8 @@
51305194 	private MenuItem lookFromItem;
51315195 	private MenuItem switchItem;
51325196 	private MenuItem cutItem;
5197
+	private MenuItem undoItem;
5198
+	private MenuItem redoItem;
51335199 	private MenuItem duplicateItem;
51345200 	private MenuItem cloneItem;
51355201 	private MenuItem cloneSupportItem;
....@@ -5276,11 +5342,6 @@
52765342 	private MenuItem doubleItem;
52775343 	private MenuItem tripleItem;
52785344         
5279
-	private MenuItem importGFDItem;
5280
-	private MenuItem importVRMLX3DItem;
5281
-	private MenuItem import3DSItem;
5282
-	private MenuItem importOBJItem;
5283
-
52845345 	private MenuItem computeAOItem;
52855346 	private MenuItem recompileItem;
52865347 	private MenuItem editScriptItem;
....@@ -5290,4 +5351,8 @@
52905351 	private MenuItem analyzeItem;
52915352 	private MenuItem dumpItem;
52925353 	//boolean freezemodel = false;
5354
+        
5355
+    Menu cameraMenu;
5356
+    MenuItem editCameraItem;
5357
+    MenuItem revertCameraItem;
52935358 }