~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -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,27 +148,18 @@
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"));
171	156	//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("-");
172	163	duplicateItem = menu.add(new MenuItem("Duplicate"));
173	164	duplicateItem.addActionListener(this);
174	165	cloneItem = menu.add(new MenuItem("Clone"));
..	..	@@ -206,7 +197,94 @@
206	197	clearAllItem = menu.add(new MenuItem("Clear All"));
207	198	clearAllItem.addActionListener(this);
208	199	}
	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());
209	236
	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	+
210	288	oe.menuBar.add(menu = new Menu("Setting"));
211	289	if (Globals.ADVANCED)
212	290	{
..	..	@@ -443,19 +521,6 @@
443	521	oe.menuBar.add(menu = new Menu("Insert"));
444	522	buildCreateMenu(menu);
445	523
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	524	oe.menuBar.add(menu = new Menu("Tools"));
460	525	buildToolsMenu(menu);
461	526	}
..	..	@@ -491,6 +556,18 @@
491	556	oe.buttonGroup.add(dummyButton);
492	557	*/
493	558	//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);
494	571
495	572	oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
496	573	liveCB.setToolTipText("Enable animation");
..	..	@@ -729,6 +806,7 @@
729	806	buttonGroup.add(radioButton);
730	807	radioButton.doClick();
731	808	}
	809	+
732	810	void SetupViews(ObjEditor oe)
733	811	{
734	812	oe.SetupViews();
..	..	@@ -1854,31 +1932,6 @@
1854	1932	csg.addChild(child);
1855	1933	child.addChild(csg);
1856	1934	} 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	1935	if (source == computeAOItem)
1883	1936	{
1884	1937	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1915,6 +1968,18 @@
1915	1968	if (source == dumpItem)
1916	1969	{
1917	1970	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();
1918	1983	} else
1919	1984	if (source == oneStepButton)
1920	1985	{
..	..	@@ -1969,6 +2034,14 @@
1969	2034	if (source == cutItem \|\| source == clearButton)
1970	2035	{
1971	2036	loadClipboard(true);
	2037	+ } else
	2038	+ if (source == undoItem)
	2039	+ {
	2040	+ Undo();
	2041	+ } else
	2042	+ if (source == redoItem)
	2043	+ {
	2044	+ Redo();
1972	2045	} else
1973	2046	if (source == duplicateItem)
1974	2047	{
..	..	@@ -2469,7 +2542,7 @@
2469	2542	} else
2470	2543	if (source == genNormalsMESHItem)
2471	2544	{
2472		- GenNormals(true); // TODO
	2545	+ GenNormalsMESH();
2473	2546	} else
2474	2547	if (source == genNormalsORGANItem)
2475	2548	{
..	..	@@ -2993,7 +3066,7 @@
2993	3066	child.CloseUI();
2994	3067	listUI.remove(child);
2995	3068
2996		- child.editWindow = null; // ???????????
	3069	+ //child.editWindow = null; // ???????????
2997	3070	}
2998	3071	objEditor.ctrlPanel.FlushUI();
2999	3072	//objEditor.jTree.clearSelection();
..	..	@@ -3079,7 +3152,10 @@
3079	3152	frontView.object = group;
3080	3153	sideView.object = group;
3081	3154	}
	3155	+
	3156	+// fix "+" issue
3082	3157	group.editWindow = this;
	3158	+
3083	3159	/*
3084	3160	currentLayout = radio.layout;
3085	3161	if (currentLayout == null)
..	..	@@ -3092,7 +3168,20 @@
3092	3168	//group.attributes = -1;
3093	3169	ResetModel();
3094	3170	refreshContents(true);
3095		- }
	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	+ }
3096	3185	else
3097	3186	{
3098	3187	//return super.action(event, arg);
..	..	@@ -3340,7 +3429,8 @@
3340	3429
3341	3430	int size = obj.MemorySize();
3342	3431
3343		- System.err.println((size/1024) + " KB is the size of " + obj);
	3432	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3433	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3344	3434	}
3345	3435	}
3346	3436	catch (Exception e)
..	..	@@ -3421,6 +3511,13 @@
3421	3511	void GenNormals(boolean crease)
3422	3512	{
3423	3513	group.GenNormalsS(crease);
	3514	+
	3515	+ refreshContents();
	3516	+ }
	3517	+
	3518	+ void GenNormalsMESH()
	3519	+ {
	3520	+ group.GenNormalsMeshS();
3424	3521
3425	3522	refreshContents();
3426	3523	}
..	..	@@ -4133,7 +4230,7 @@
4133	4230	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4134	4231
4135	4232	Object3D elem = (Object3D)group.selection.elementAt(i);
4136		- if(elem != group)
	4233	+ if(elem != group \|\| !newWindow)
4137	4234	{
4138	4235	// if (!(elem instanceof Composite))
4139	4236	// newWindow = false;
..	..	@@ -4247,14 +4344,17 @@
4247	4344
4248	4345	objEditor.SetText(); // jan 2014
4249	4346
4250		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4347	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4251	4348	CameraPane.flash = true;
4252	4349
4253		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4350	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4254	4351	// a camera
4255	4352	{
4256		- CameraPane.camerachangeframe = 0; // don't refuse it
4257		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4353	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4354	+ {
	4355	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4356	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4357	+ }
4258	4358	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4259	4359	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4260	4360	}
..	..	@@ -4338,6 +4438,7 @@
4338	4438	{
4339	4439	if (group.selection.isEmpty())
4340	4440	return;
	4441	+
4341	4442	Grafreed.clipboardIsTempGroup = false;
4342	4443	Composite tGroup = null;
4343	4444	if (group.selection.size() > 0) // 1)
..	..	@@ -4348,6 +4449,7 @@
4348	4449
4349	4450	if (cut)
4350	4451	{
	4452	+ Save();
4351	4453	//int indices[] = jList.getSelectedIndices();
4352	4454	//for (int i = indices.length - 1; i >= 0; i--)
4353	4455	//jList.remove(indices[i]);
..	..	@@ -4437,8 +4539,10 @@
4437	4539	}
4438	4540
4439	4541	}
	4542	+
4440	4543	if (Grafreed.clipboardIsTempGroup)
4441	4544	Grafreed.clipboard = tGroup;
	4545	+
4442	4546	if (cut)
4443	4547	{
4444	4548	ResetModel();
..	..	@@ -4970,21 +5074,6 @@
4970	5074	}
4971	5075	*/
4972	5076
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		-
4988	5077	/*
4989	5078	public void Callback(Object obj)
4990	5079	{
..	..	@@ -5008,23 +5097,6 @@
5008	5097	}
5009	5098	*/
5010	5099
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		-
5028	5100	String GetFile(String dialogName)
5029	5101	{
5030	5102	if (Grafreed.standAlone)
..	..	@@ -5095,6 +5167,9 @@
5095	5167	cButton clearpanelButton;
5096	5168	cButton unselectButton;
5097	5169
	5170	+ cButton saveButton;
	5171	+ cButton undoButton;
	5172	+ cButton redoButton;
5098	5173	cButton oneStepButton;
5099	5174
5100	5175	cButton screenfitButton;
..	..	@@ -5127,6 +5202,8 @@
5127	5202	private MenuItem lookFromItem;
5128	5203	private MenuItem switchItem;
5129	5204	private MenuItem cutItem;
	5205	+ private MenuItem undoItem;
	5206	+ private MenuItem redoItem;
5130	5207	private MenuItem duplicateItem;
5131	5208	private MenuItem cloneItem;
5132	5209	private MenuItem cloneSupportItem;
..	..	@@ -5273,11 +5350,6 @@
5273	5350	private MenuItem doubleItem;
5274	5351	private MenuItem tripleItem;
5275	5352
5276		- private MenuItem importGFDItem;
5277		- private MenuItem importVRMLX3DItem;
5278		- private MenuItem import3DSItem;
5279		- private MenuItem importOBJItem;
5280		-
5281	5353	private MenuItem computeAOItem;
5282	5354	private MenuItem recompileItem;
5283	5355	private MenuItem editScriptItem;
..	..	@@ -5287,4 +5359,8 @@
5287	5359	private MenuItem analyzeItem;
5288	5360	private MenuItem dumpItem;
5289	5361	//boolean freezemodel = false;
	5362	+
	5363	+ Menu cameraMenu;
	5364	+ MenuItem editCameraItem;
	5365	+ MenuItem revertCameraItem;
5290	5366	}