blame | history | patch | commit | commitdiff
Normand Briere
2019-06-17 26b49d8e26625491f4a407a05e9bc9d72037f938 
 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");
....@@ -729,6 +806,7 @@
729806             buttonGroup.add(radioButton);
730807             radioButton.doClick();
731808         }
809
+        
732810         void SetupViews(ObjEditor oe)
733811         {
734812             oe.SetupViews();
....@@ -793,6 +871,7 @@
793871             } else if(e.getSource() == liveCB)
794872             {
795873                 cameraView.ToggleLive();
874
+                refreshContents(false);
796875             }
797876             else if(e.getSource() == supportCB)
798877             {
....@@ -1200,7 +1279,7 @@
12001279 		memoryItem.addActionListener(this);
12011280 		menu.add(analyzeItem = new MenuItem("Analyze"));
12021281 		analyzeItem.addActionListener(this);
1203
-		menu.add(dumpItem = new MenuItem("Dump"));
1282
+		menu.add(dumpItem = new MenuItem("Print"));
12041283 		dumpItem.addActionListener(this);
12051284 //		menu.add(pathItem = new MenuItem("From-to path"));
12061285 //		pathItem.addActionListener(this);
....@@ -1854,31 +1933,6 @@
18541933                         csg.addChild(child);
18551934                         child.addChild(csg);
18561935 		} 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
18821936 		if (source == computeAOItem)
18831937 		{
18841938                     Globals.drawMode = CameraPane.OCCLUSION;
....@@ -1915,6 +1969,18 @@
19151969 		if (source == dumpItem)
19161970 		{
19171971                     DumpObject();
1972
+		} else
1973
+		if (source == undoButton)
1974
+		{
1975
+			Undo();
1976
+		} else
1977
+		if (source == redoButton)
1978
+		{
1979
+			Redo();
1980
+		} else
1981
+		if (source == saveButton)
1982
+		{
1983
+			Save();
19181984 		} else
19191985 		if (source == oneStepButton)
19201986 		{
....@@ -1969,6 +2035,14 @@
19692035 		if (source == cutItem || source == clearButton)
19702036 		{
19712037 			loadClipboard(true);
2038
+		} else
2039
+		if (source == undoItem)
2040
+		{
2041
+			Undo();
2042
+		} else
2043
+		if (source == redoItem)
2044
+		{
2045
+			Redo();
19722046 		} else
19732047 		if (source == duplicateItem)
19742048 		{
....@@ -2469,7 +2543,7 @@
24692543 		} else
24702544 		if (source == genNormalsMESHItem)
24712545                 {
2472
-			GenNormals(true); // TODO
2546
+			GenNormalsMESH();
24732547 		} else
24742548 		if (source == genNormalsORGANItem)
24752549                 {
....@@ -2993,7 +3067,7 @@
29933067 				child.CloseUI();
29943068                                 listUI.remove(child);
29953069                                 
2996
-                                child.editWindow = null; // ???????????
3070
+                                //child.editWindow = null; // ???????????
29973071 			}
29983072 			objEditor.ctrlPanel.FlushUI();
29993073 			//objEditor.jTree.clearSelection();
....@@ -3079,7 +3153,10 @@
30793153                         frontView.object = group;
30803154                         sideView.object = group;
30813155                     }
3156
+                    
3157
+// fix "+" issue
30823158                     group.editWindow = this;
3159
+                    
30833160                     /*
30843161                     currentLayout = radio.layout;
30853162                     if (currentLayout == null)
....@@ -3092,7 +3169,20 @@
30923169                     //group.attributes = -1;
30933170                     ResetModel();
30943171                     refreshContents(true);
3095
-                }
3172
+                } else if (event.getSource() == editCameraItem)
3173
+                {
3174
+                    cameraView.ProtectCamera();
3175
+                    cameraView.repaint();
3176
+                    return;
3177
+                } else if (event.getSource() == revertCameraItem)
3178
+                {
3179
+                    cameraView.RevertCamera();
3180
+                    cameraView.repaint();
3181
+                    return;
3182
+        //        } else if (event.getSource() == textureButton)
3183
+        //        {
3184
+        //            return; // true;
3185
+                } 
30963186                 else
30973187                 {
30983188 			//return super.action(event, arg);
....@@ -3340,7 +3430,8 @@
33403430                     
33413431                     int size = obj.MemorySize();
33423432                     
3343
-                    System.err.println((size/1024) + " KB is the size of " + obj);
3433
+                    //System.err.println((size/1024) + " KB is the size of " + obj);
3434
+                    System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
33443435                 }
33453436             }
33463437             catch (Exception e)
....@@ -3421,6 +3512,13 @@
34213512 	void GenNormals(boolean crease)
34223513 	{
34233514 		group.GenNormalsS(crease);
3515
+		
3516
+		refreshContents();
3517
+	}
3518
+	
3519
+	void GenNormalsMESH()
3520
+	{
3521
+		group.GenNormalsMeshS();
34243522 		
34253523 		refreshContents();
34263524 	}
....@@ -4133,7 +4231,7 @@
41334231                     objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
41344232                     
41354233 			Object3D elem = (Object3D)group.selection.elementAt(i);
4136
-                        if(elem != group)
4234
+                        if(elem != group || !newWindow)
41374235                         {
41384236                         //    if (!(elem instanceof Composite))
41394237                         //        newWindow = false;
....@@ -4223,7 +4321,6 @@
42234321 			//case 702: // Event.LIST_DESELECT
42244322 			group.deselectAll();
42254323 			TreePath tps[] = objEditor.jTree.getSelectionPaths();
4226
-			objEditor.ClearInfo(); // .GetMaterial());
42274324 			if (tps != null)
42284325 			{
42294326 				for (int i=0; i < tps.length; i++)
....@@ -4232,10 +4329,8 @@
42324329 					
42334330 					//if (child.parent != null)
42344331 						//child.parent.addSelectee(child);
4332
+                    objEditor.SetMaterial(child);
42354333 					group.addSelectee(child);
4236
-					objEditor.SetMaterial(child); // .GetMaterial());
4237
-					objEditor.AddInfo(child, this, true); // .GetMaterial());
4238
-            System.err.println("info : " + child.GetPath());
42394334 				}
42404335 			}
42414336 //			else
....@@ -4245,16 +4340,17 @@
42454340 //            System.err.println("info : " + group.GetPath());
42464341 //                        }
42474342 			
4248
-                        objEditor.SetText(); // jan 2014
4249
-                        
4250
-			if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4343
+			if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
42514344 				CameraPane.flash = true;
42524345                         
4253
-			if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4346
+			if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
42544347                             // a camera
42554348                         {
4256
-                            CameraPane.camerachangeframe = 0; // don't refuse it
4257
-                            Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4349
+                            if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
4350
+                            {
4351
+                                CameraPane.camerachangeframe = 0; // don't refuse it
4352
+                                Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4353
+                            }
42584354                          //   Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
42594355                          //   Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
42604356                         }
....@@ -4267,6 +4363,26 @@
42674363 		
42684364 		freezemodel = false;
42694365 	}
4366
+        
4367
+        void refreshContents(boolean cp)
4368
+        {
4369
+            if (!Globals.MOUSEDRAGGED)
4370
+            {
4371
+                objEditor.ClearInfo(); // .GetMaterial());
4372
+
4373
+                for (int i=0; i < group.selection.Size(); i++)
4374
+                {
4375
+                    Object3D child = (Object3D) group.selection.get(i);
4376
+
4377
+                    objEditor.AddInfo(child, this, true);
4378
+    System.err.println("info : " + child.GetPath());
4379
+                }
4380
+
4381
+                objEditor.SetText(); // jan 2014
4382
+            }
4383
+                        
4384
+            super.refreshContents(cp);
4385
+        }
42704386 	
42714387 	void linkSomething(Object3D thing)
42724388 	{
....@@ -4338,6 +4454,7 @@
43384454 	{
43394455 		if (group.selection.isEmpty())
43404456 			return;
4457
+                
43414458 		Grafreed.clipboardIsTempGroup = false;
43424459 		Composite tGroup = null;
43434460 		if (group.selection.size() > 0) // 1)
....@@ -4348,6 +4465,7 @@
43484465                 
43494466 		if (cut)
43504467 		{
4468
+                    Save();
43514469 			//int indices[] = jList.getSelectedIndices();
43524470 			//for (int i = indices.length - 1; i >= 0; i--)
43534471 			//jList.remove(indices[i]);
....@@ -4437,8 +4555,10 @@
44374555 			}
44384556 			
44394557 		}
4558
+                
44404559 		if (Grafreed.clipboardIsTempGroup)
44414560 			Grafreed.clipboard = tGroup;
4561
+                
44424562 		if (cut)
44434563                 {
44444564                     ResetModel();
....@@ -4970,21 +5090,6 @@
49705090         }
49715091          */
49725092 
4973
-        void ImportGFD()
4974
-        {
4975
-            FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4976
-            browser.show();
4977
-            String filename = browser.getFile();
4978
-            if (filename != null && filename.length() > 0)
4979
-            {
4980
-                String fullname = browser.getDirectory() + filename;
4981
-
4982
-                //Object3D readobj =
4983
-                        objEditor.ReadGFD(fullname, objEditor);
4984
-                //makeSomething(readobj);
4985
-            }
4986
-        }
4987
-        
49885093         /*
49895094         public void Callback(Object obj)
49905095         {
....@@ -5008,23 +5113,6 @@
50085113         }
50095114          */
50105115 
5011
-	void ImportVRMLX3D()
5012
-	{
5013
-		if (Grafreed.standAlone)
5014
-		{
5015
-                    /**/
5016
-			FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
5017
-			browser.show();
5018
-			String filename = browser.getFile();
5019
-			if (filename != null && filename.length() > 0)
5020
-			{
5021
-				String fullname = browser.getDirectory() + filename;
5022
-                                LoadVRMLX3D(fullname);
5023
-			}
5024
-                     /**/
5025
-		}
5026
-	}
5027
-				
50285116 	String GetFile(String dialogName)
50295117 	{
50305118 		if (Grafreed.standAlone)
....@@ -5095,6 +5183,9 @@
50955183 	cButton clearpanelButton;
50965184 	cButton unselectButton;
50975185 	
5186
+	cButton saveButton;
5187
+	cButton undoButton;
5188
+	cButton redoButton;
50985189 	cButton oneStepButton;
50995190         
51005191 	cButton screenfitButton;
....@@ -5127,6 +5218,8 @@
51275218 	private MenuItem lookFromItem;
51285219 	private MenuItem switchItem;
51295220 	private MenuItem cutItem;
5221
+	private MenuItem undoItem;
5222
+	private MenuItem redoItem;
51305223 	private MenuItem duplicateItem;
51315224 	private MenuItem cloneItem;
51325225 	private MenuItem cloneSupportItem;
....@@ -5273,11 +5366,6 @@
52735366 	private MenuItem doubleItem;
52745367 	private MenuItem tripleItem;
52755368         
5276
-	private MenuItem importGFDItem;
5277
-	private MenuItem importVRMLX3DItem;
5278
-	private MenuItem import3DSItem;
5279
-	private MenuItem importOBJItem;
5280
-
52815369 	private MenuItem computeAOItem;
52825370 	private MenuItem recompileItem;
52835371 	private MenuItem editScriptItem;
....@@ -5287,4 +5375,8 @@
52875375 	private MenuItem analyzeItem;
52885376 	private MenuItem dumpItem;
52895377 	//boolean freezemodel = false;
5378
+        
5379
+    Menu cameraMenu;
5380
+    MenuItem editCameraItem;
5381
+    MenuItem revertCameraItem;
52905382 }