blame | history | patch | commit | commitdiff
Normand Briere
2019-06-21 15123b19e7bc8da2869429b07f0fbaa0598e945e 
 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         {
....@@ -392,6 +470,14 @@
392470 		markleavesItem.addActionListener(this);
393471 		unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
394472 		unmarkleavesItem.addActionListener(this);
473
+		rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
474
+		rewindleavesItem.addActionListener(this);
475
+		unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
476
+		unrewindleavesItem.addActionListener(this);
477
+		randomleavesItem = menu.add(new MenuItem("Random Leaves"));
478
+		randomleavesItem.addActionListener(this);
479
+		unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
480
+		unrandomleavesItem.addActionListener(this);
395481 		menu.add("-");
396482 		flipVItem = menu.add(new MenuItem("Flip V"));
397483 		flipVItem.addActionListener(this);
....@@ -443,19 +529,6 @@
443529 		oe.menuBar.add(menu = new Menu("Insert"));
444530 		buildCreateMenu(menu);
445531                 
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
-
459532                 oe.menuBar.add(menu = new Menu("Tools"));
460533 		buildToolsMenu(menu);
461534 	}
....@@ -491,6 +564,18 @@
491564         oe.buttonGroup.add(dummyButton);
492565          */
493566                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
567
+                
568
+		oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569
+                undoButton.setToolTipText("Undo changes");
570
+		undoButton.addActionListener(this);
571
+                
572
+		oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573
+                redoButton.setToolTipText("Redo changes");
574
+		redoButton.addActionListener(this);
575
+                
576
+		oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577
+                saveButton.setToolTipText("Save changes");
578
+		saveButton.addActionListener(this);
494579                 
495580                 oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
496581                 liveCB.setToolTipText("Enable animation");
....@@ -794,6 +879,7 @@
794879             } else if(e.getSource() == liveCB)
795880             {
796881                 cameraView.ToggleLive();
882
+                refreshContents(false);
797883             }
798884             else if(e.getSource() == supportCB)
799885             {
....@@ -1201,7 +1287,7 @@
12011287 		memoryItem.addActionListener(this);
12021288 		menu.add(analyzeItem = new MenuItem("Analyze"));
12031289 		analyzeItem.addActionListener(this);
1204
-		menu.add(dumpItem = new MenuItem("Dump"));
1290
+		menu.add(dumpItem = new MenuItem("Print"));
12051291 		dumpItem.addActionListener(this);
12061292 //		menu.add(pathItem = new MenuItem("From-to path"));
12071293 //		pathItem.addActionListener(this);
....@@ -1855,31 +1941,6 @@
18551941                         csg.addChild(child);
18561942                         child.addChild(csg);
18571943 		} 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
18831944 		if (source == computeAOItem)
18841945 		{
18851946                     Globals.drawMode = CameraPane.OCCLUSION;
....@@ -1916,6 +1977,18 @@
19161977 		if (source == dumpItem)
19171978 		{
19181979                     DumpObject();
1980
+		} else
1981
+		if (source == undoButton)
1982
+		{
1983
+			Undo();
1984
+		} else
1985
+		if (source == redoButton)
1986
+		{
1987
+			Redo();
1988
+		} else
1989
+		if (source == saveButton)
1990
+		{
1991
+			Save();
19191992 		} else
19201993 		if (source == oneStepButton)
19211994 		{
....@@ -1970,6 +2043,14 @@
19702043 		if (source == cutItem || source == clearButton)
19712044 		{
19722045 			loadClipboard(true);
2046
+		} else
2047
+		if (source == undoItem)
2048
+		{
2049
+			Undo();
2050
+		} else
2051
+		if (source == redoItem)
2052
+		{
2053
+			Redo();
19732054 		} else
19742055 		if (source == duplicateItem)
19752056 		{
....@@ -2470,7 +2551,7 @@
24702551 		} else
24712552 		if (source == genNormalsMESHItem)
24722553                 {
2473
-			GenNormals(true); // TODO
2554
+			GenNormalsMESH();
24742555 		} else
24752556 		if (source == genNormalsORGANItem)
24762557                 {
....@@ -2535,6 +2616,22 @@
25352616 		if (source == unmarkleavesItem)
25362617                 {
25372618 			MarkLeaves(false);
2619
+		} else
2620
+		if (source == rewindleavesItem)
2621
+                {
2622
+			RewindLeaves(true);
2623
+		} else
2624
+		if (source == unrewindleavesItem)
2625
+                {
2626
+			RewindLeaves(false);
2627
+		} else
2628
+		if (source == randomleavesItem)
2629
+                {
2630
+			RandomLeaves(true);
2631
+		} else
2632
+		if (source == unrandomleavesItem)
2633
+                {
2634
+			RandomLeaves(false);
25382635 		} else
25392636 		if (source == flipVItem)
25402637                 {
....@@ -2994,7 +3091,7 @@
29943091 				child.CloseUI();
29953092                                 listUI.remove(child);
29963093                                 
2997
-                                child.editWindow = null; // ???????????
3094
+                                //child.editWindow = null; // ???????????
29983095 			}
29993096 			objEditor.ctrlPanel.FlushUI();
30003097 			//objEditor.jTree.clearSelection();
....@@ -3081,7 +3178,8 @@
30813178                         sideView.object = group;
30823179                     }
30833180                     
3084
-// fix "+" issue                    group.editWindow = this;
3181
+// fix "+" issue
3182
+                    group.editWindow = this;
30853183                     
30863184                     /*
30873185                     currentLayout = radio.layout;
....@@ -3095,7 +3193,20 @@
30953193                     //group.attributes = -1;
30963194                     ResetModel();
30973195                     refreshContents(true);
3098
-                }
3196
+                } else if (event.getSource() == editCameraItem)
3197
+                {
3198
+                    cameraView.ProtectCamera();
3199
+                    cameraView.repaint();
3200
+                    return;
3201
+                } else if (event.getSource() == revertCameraItem)
3202
+                {
3203
+                    cameraView.RevertCamera();
3204
+                    cameraView.repaint();
3205
+                    return;
3206
+        //        } else if (event.getSource() == textureButton)
3207
+        //        {
3208
+        //            return; // true;
3209
+                } 
30993210                 else
31003211                 {
31013212 			//return super.action(event, arg);
....@@ -3343,7 +3454,8 @@
33433454                     
33443455                     int size = obj.MemorySize();
33453456                     
3346
-                    System.err.println((size/1024) + " KB is the size of " + obj);
3457
+                    //System.err.println((size/1024) + " KB is the size of " + obj);
3458
+                    System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
33473459                 }
33483460             }
33493461             catch (Exception e)
....@@ -3424,6 +3536,13 @@
34243536 	void GenNormals(boolean crease)
34253537 	{
34263538 		group.GenNormalsS(crease);
3539
+		
3540
+		refreshContents();
3541
+	}
3542
+	
3543
+	void GenNormalsMESH()
3544
+	{
3545
+		group.GenNormalsMeshS();
34273546 		
34283547 		refreshContents();
34293548 	}
....@@ -4051,6 +4170,18 @@
40514170 		refreshContents();
40524171 	}
40534172 	
4173
+	void RewindLeaves(boolean hide)
4174
+	{
4175
+		group.selection.RewindLeaves(hide);
4176
+		refreshContents();
4177
+	}
4178
+	
4179
+	void RandomLeaves(boolean hide)
4180
+	{
4181
+		group.selection.RandomLeaves(hide);
4182
+		refreshContents();
4183
+	}
4184
+	
40544185 	void SetTexRes(int tr)
40554186 	{
40564187 		group.selection.SetTexRes(tr);
....@@ -4226,7 +4357,6 @@
42264357 			//case 702: // Event.LIST_DESELECT
42274358 			group.deselectAll();
42284359 			TreePath tps[] = objEditor.jTree.getSelectionPaths();
4229
-			objEditor.ClearInfo(); // .GetMaterial());
42304360 			if (tps != null)
42314361 			{
42324362 				for (int i=0; i < tps.length; i++)
....@@ -4235,10 +4365,8 @@
42354365 					
42364366 					//if (child.parent != null)
42374367 						//child.parent.addSelectee(child);
4368
+                    objEditor.SetMaterial(child);
42384369 					group.addSelectee(child);
4239
-					objEditor.SetMaterial(child); // .GetMaterial());
4240
-					objEditor.AddInfo(child, this, true); // .GetMaterial());
4241
-            System.err.println("info : " + child.GetPath());
42424370 				}
42434371 			}
42444372 //			else
....@@ -4248,16 +4376,17 @@
42484376 //            System.err.println("info : " + group.GetPath());
42494377 //                        }
42504378 			
4251
-                        objEditor.SetText(); // jan 2014
4252
-                        
4253
-			if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4379
+			if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
42544380 				CameraPane.flash = true;
42554381                         
4256
-			if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4382
+			if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
42574383                             // a camera
42584384                         {
4259
-                            CameraPane.camerachangeframe = 0; // don't refuse it
4260
-                            Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4385
+                            if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
4386
+                            {
4387
+                                CameraPane.camerachangeframe = 0; // don't refuse it
4388
+                                Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4389
+                            }
42614390                          //   Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
42624391                          //   Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
42634392                         }
....@@ -4270,6 +4399,26 @@
42704399 		
42714400 		freezemodel = false;
42724401 	}
4402
+        
4403
+        void refreshContents(boolean cp)
4404
+        {
4405
+            if (!Globals.MOUSEDRAGGED)
4406
+            {
4407
+                objEditor.ClearInfo(); // .GetMaterial());
4408
+
4409
+                for (int i=0; i < group.selection.Size(); i++)
4410
+                {
4411
+                    Object3D child = (Object3D) group.selection.get(i);
4412
+
4413
+                    objEditor.AddInfo(child, this, true);
4414
+    System.err.println("info : " + child.GetPath());
4415
+                }
4416
+
4417
+                objEditor.SetText(); // jan 2014
4418
+            }
4419
+                        
4420
+            super.refreshContents(cp);
4421
+        }
42734422 	
42744423 	void linkSomething(Object3D thing)
42754424 	{
....@@ -4341,6 +4490,7 @@
43414490 	{
43424491 		if (group.selection.isEmpty())
43434492 			return;
4493
+                
43444494 		Grafreed.clipboardIsTempGroup = false;
43454495 		Composite tGroup = null;
43464496 		if (group.selection.size() > 0) // 1)
....@@ -4351,6 +4501,7 @@
43514501                 
43524502 		if (cut)
43534503 		{
4504
+                    Save();
43544505 			//int indices[] = jList.getSelectedIndices();
43554506 			//for (int i = indices.length - 1; i >= 0; i--)
43564507 			//jList.remove(indices[i]);
....@@ -4440,8 +4591,10 @@
44404591 			}
44414592 			
44424593 		}
4594
+                
44434595 		if (Grafreed.clipboardIsTempGroup)
44444596 			Grafreed.clipboard = tGroup;
4597
+                
44454598 		if (cut)
44464599                 {
44474600                     ResetModel();
....@@ -4973,21 +5126,6 @@
49735126         }
49745127          */
49755128 
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
-        
49915129         /*
49925130         public void Callback(Object obj)
49935131         {
....@@ -5011,23 +5149,6 @@
50115149         }
50125150          */
50135151 
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
-				
50315152 	String GetFile(String dialogName)
50325153 	{
50335154 		if (Grafreed.standAlone)
....@@ -5098,6 +5219,9 @@
50985219 	cButton clearpanelButton;
50995220 	cButton unselectButton;
51005221 	
5222
+	cButton saveButton;
5223
+	cButton undoButton;
5224
+	cButton redoButton;
51015225 	cButton oneStepButton;
51025226         
51035227 	cButton screenfitButton;
....@@ -5130,6 +5254,8 @@
51305254 	private MenuItem lookFromItem;
51315255 	private MenuItem switchItem;
51325256 	private MenuItem cutItem;
5257
+	private MenuItem undoItem;
5258
+	private MenuItem redoItem;
51335259 	private MenuItem duplicateItem;
51345260 	private MenuItem cloneItem;
51355261 	private MenuItem cloneSupportItem;
....@@ -5193,6 +5319,10 @@
51935319 	private MenuItem showleavesItem;
51945320 	private MenuItem markleavesItem;
51955321 	private MenuItem unmarkleavesItem;
5322
+	private MenuItem rewindleavesItem;
5323
+	private MenuItem unrewindleavesItem;
5324
+	private MenuItem randomleavesItem;
5325
+	private MenuItem unrandomleavesItem;
51965326         
51975327 	private MenuItem flipVItem;
51985328 	private MenuItem unflipVItem;
....@@ -5276,11 +5406,6 @@
52765406 	private MenuItem doubleItem;
52775407 	private MenuItem tripleItem;
52785408         
5279
-	private MenuItem importGFDItem;
5280
-	private MenuItem importVRMLX3DItem;
5281
-	private MenuItem import3DSItem;
5282
-	private MenuItem importOBJItem;
5283
-
52845409 	private MenuItem computeAOItem;
52855410 	private MenuItem recompileItem;
52865411 	private MenuItem editScriptItem;
....@@ -5290,4 +5415,8 @@
52905415 	private MenuItem analyzeItem;
52915416 	private MenuItem dumpItem;
52925417 	//boolean freezemodel = false;
5418
+        
5419
+    Menu cameraMenu;
5420
+    MenuItem editCameraItem;
5421
+    MenuItem revertCameraItem;
52935422 }