~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,14 +197,97 @@
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	{
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	291	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	292	revertMeshItem.addActionListener(this);
219	293	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -372,6 +446,10 @@
372	446	oe.menuBar.add(menu = new Menu("Attributes"));
373	447	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
374	448	clearMaterialsItem.addActionListener(this);
	449	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	450	+ resetAllItem.addActionListener(this);
	451	+ stepAllItem = menu.add(new MenuItem("Step All"));
	452	+ stepAllItem.addActionListener(this);
375	453	menu.add("-");
376	454	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
377	455	liveleavesItem.addActionListener(this);
..	..	@@ -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	}
..	..	@@ -492,8 +557,20 @@
492	557	*/
493	558	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
494	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);
	571	+
495	572	oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
496		- liveCB.setToolTipText("Enabled animation");
	573	+ liveCB.setToolTipText("Enable animation");
497	574	liveCB.addItemListener(this);
498	575
499	576	oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -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	{
..	..	@@ -2281,7 +2354,7 @@
2281	2354	{
2282	2355	RevertMeshes();
2283	2356	} else
2284		- if (source == resetMeshItem)
	2357	+ if (source == resetAllItem)
2285	2358	{
2286	2359	ResetAll();
2287	2360	} else
..	..	@@ -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);
..	..	@@ -3652,7 +3741,16 @@
3652	3741	String pigment = Object3D.GetPigment(tex);
3653	3742	//String bump = Object3D.GetBump(tex);
3654	3743
3655		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3744	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3745	+
	3746	+ try
	3747	+ {
	3748	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3749	+ }
	3750	+ catch (Exception e)
	3751	+ {
	3752	+ System.err.println("FAIL: " + node);
	3753	+ }
3656	3754
3657	3755	double s = v.s;
3658	3756
..	..	@@ -4124,7 +4222,7 @@
4124	4222	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4125	4223
4126	4224	Object3D elem = (Object3D)group.selection.elementAt(i);
4127		- if(elem != group)
	4225	+ if(elem != group \|\| !newWindow)
4128	4226	{
4129	4227	// if (!(elem instanceof Composite))
4130	4228	// newWindow = false;
..	..	@@ -4238,14 +4336,17 @@
4238	4336
4239	4337	objEditor.SetText(); // jan 2014
4240	4338
4241		- 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))
4242	4340	CameraPane.flash = true;
4243	4341
4244		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4342	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4245	4343	// a camera
4246	4344	{
4247		- CameraPane.camerachangeframe = 0; // don't refuse it
4248		- 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	+ }
4249	4350	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4250	4351	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4251	4352	}
..	..	@@ -4329,6 +4430,7 @@
4329	4430	{
4330	4431	if (group.selection.isEmpty())
4331	4432	return;
	4433	+
4332	4434	Grafreed.clipboardIsTempGroup = false;
4333	4435	Composite tGroup = null;
4334	4436	if (group.selection.size() > 0) // 1)
..	..	@@ -4339,6 +4441,7 @@
4339	4441
4340	4442	if (cut)
4341	4443	{
	4444	+ Save();
4342	4445	//int indices[] = jList.getSelectedIndices();
4343	4446	//for (int i = indices.length - 1; i >= 0; i--)
4344	4447	//jList.remove(indices[i]);
..	..	@@ -4428,8 +4531,10 @@
4428	4531	}
4429	4532
4430	4533	}
	4534	+
4431	4535	if (Grafreed.clipboardIsTempGroup)
4432	4536	Grafreed.clipboard = tGroup;
	4537	+
4433	4538	if (cut)
4434	4539	{
4435	4540	ResetModel();
..	..	@@ -4961,21 +5066,6 @@
4961	5066	}
4962	5067	*/
4963	5068
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	5069	/*
4980	5070	public void Callback(Object obj)
4981	5071	{
..	..	@@ -4999,23 +5089,6 @@
4999	5089	}
5000	5090	*/
5001	5091
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	5092	String GetFile(String dialogName)
5020	5093	{
5021	5094	if (Grafreed.standAlone)
..	..	@@ -5086,6 +5159,9 @@
5086	5159	cButton clearpanelButton;
5087	5160	cButton unselectButton;
5088	5161
	5162	+ cButton saveButton;
	5163	+ cButton undoButton;
	5164	+ cButton redoButton;
5089	5165	cButton oneStepButton;
5090	5166
5091	5167	cButton screenfitButton;
..	..	@@ -5118,6 +5194,8 @@
5118	5194	private MenuItem lookFromItem;
5119	5195	private MenuItem switchItem;
5120	5196	private MenuItem cutItem;
	5197	+ private MenuItem undoItem;
	5198	+ private MenuItem redoItem;
5121	5199	private MenuItem duplicateItem;
5122	5200	private MenuItem cloneItem;
5123	5201	private MenuItem cloneSupportItem;
..	..	@@ -5131,7 +5209,7 @@
5131	5209	private MenuItem linkverticesItem;
5132	5210	private MenuItem relinkverticesItem;
5133	5211	private MenuItem setMasterItem;
5134		- private MenuItem resetMeshItem;
	5212	+ private MenuItem resetAllItem;
5135	5213	private MenuItem stepAllItem;
5136	5214	private MenuItem revertMeshItem;
5137	5215	private MenuItem poseMeshItem;
..	..	@@ -5264,11 +5342,6 @@
5264	5342	private MenuItem doubleItem;
5265	5343	private MenuItem tripleItem;
5266	5344
5267		- private MenuItem importGFDItem;
5268		- private MenuItem importVRMLX3DItem;
5269		- private MenuItem import3DSItem;
5270		- private MenuItem importOBJItem;
5271		-
5272	5345	private MenuItem computeAOItem;
5273	5346	private MenuItem recompileItem;
5274	5347	private MenuItem editScriptItem;
..	..	@@ -5278,4 +5351,8 @@
5278	5351	private MenuItem analyzeItem;
5279	5352	private MenuItem dumpItem;
5280	5353	//boolean freezemodel = false;
	5354	+
	5355	+ Menu cameraMenu;
	5356	+ MenuItem editCameraItem;
	5357	+ MenuItem revertCameraItem;
5281	5358	}