~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,17 @@
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	+ undoItem = menu.add(new MenuItem("Undo"));
	158	+ undoItem.addActionListener(this);
	159	+ redoItem = menu.add(new MenuItem("Redo"));
	160	+ redoItem.addActionListener(this);
	161	+ menu.add("-");
172	162	duplicateItem = menu.add(new MenuItem("Duplicate"));
173	163	duplicateItem.addActionListener(this);
174	164	cloneItem = menu.add(new MenuItem("Clone"));
..	..	@@ -206,14 +196,97 @@
206	196	clearAllItem = menu.add(new MenuItem("Clear All"));
207	197	clearAllItem.addActionListener(this);
208	198	}
	199	+
	200	+ menuBar.add(cameraMenu = new Menu("View"));
	201	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	202	+ //zBufferItem.addActionListener(this);
	203	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	204	+ //normalLensItem.addActionListener(this);
	205	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Camera"));
	206	+ revertCameraItem.addActionListener(this);
	207	+
	208	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	209	+ toggleFullScreenItem.addItemListener(this);
	210	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	211	+ cameraMenu.add("-");
	212	+
	213	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	214	+ toggleTextureItem.addItemListener(this);
	215	+ toggleTextureItem.setState(CameraPane.textureon);
	216	+
	217	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	218	+ toggleSwitchItem.addItemListener(this);
	219	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	220	+
	221	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	222	+ toggleHandleItem.addItemListener(this);
	223	+ toggleHandleItem.setState(CameraPane.HANDLES);
	224	+
	225	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	226	+ togglePaintItem.addItemListener(this);
	227	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	228	+
	229	+ if (Globals.ADVANCED)
	230	+ {
	231	+ cameraMenu.add("-");
	232	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	233	+ toggleLiveItem.addItemListener(this);
	234	+ toggleLiveItem.setState(Globals.isLIVE());
209	235
	236	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	237	+ stepItem.addActionListener(this);
	238	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	239	+ // toggleDLItem.addItemListener(this);
	240	+ // toggleDLItem.setState(false);
	241	+
	242	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	243	+ toggleRenderItem.addItemListener(this);
	244	+ toggleRenderItem.setState(!CameraPane.frozen);
	245	+
	246	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	247	+ toggleDebugItem.addItemListener(this);
	248	+ toggleDebugItem.setState(CameraPane.DEBUG);
	249	+
	250	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	251	+ toggleFrustumItem.addItemListener(this);
	252	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	253	+
	254	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	255	+ toggleFootContactItem.addItemListener(this);
	256	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	257	+
	258	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	259	+ toggleTimelineItem.addItemListener(this);
	260	+ }
	261	+
	262	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	263	+// toggleRootItem.addItemListener(this);
	264	+// toggleRootItem.setState(false);
	265	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	266	+// animationItem.addItemListener(this);
	267	+// animationItem.setState(CameraPane.ANIMATION);
	268	+ cameraMenu.add("-");
	269	+ cameraMenu.add(editCameraItem = new MenuItem("Save Camera"));
	270	+ editCameraItem.addActionListener(this);
	271	+
	272	+ if (Globals.ADVANCED)
	273	+ {
	274	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	275	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	276	+ //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	277	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	278	+ oe.cameraMenu.add("-");
	279	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	280	+ openWindowItem.addActionListener(this);
	281	+ editLeafItem.addActionListener(this);
	282	+ lookAtItem.addActionListener(this);
	283	+ //lookFromItem.addActinoListener(this);
	284	+ //switchItem.addActionListener(this);
	285	+ }
	286	+
210	287	oe.menuBar.add(menu = new Menu("Setting"));
211	288	if (Globals.ADVANCED)
212	289	{
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	290	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	291	revertMeshItem.addActionListener(this);
219	292	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -372,6 +445,10 @@
372	445	oe.menuBar.add(menu = new Menu("Attributes"));
373	446	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
374	447	clearMaterialsItem.addActionListener(this);
	448	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	449	+ resetAllItem.addActionListener(this);
	450	+ stepAllItem = menu.add(new MenuItem("Step All"));
	451	+ stepAllItem.addActionListener(this);
375	452	menu.add("-");
376	453	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
377	454	liveleavesItem.addActionListener(this);
..	..	@@ -443,19 +520,6 @@
443	520	oe.menuBar.add(menu = new Menu("Insert"));
444	521	buildCreateMenu(menu);
445	522
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	523	oe.menuBar.add(menu = new Menu("Tools"));
460	524	buildToolsMenu(menu);
461	525	}
..	..	@@ -493,7 +557,7 @@
493	557	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
494	558
495	559	oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
496		- liveCB.setToolTipText("Enabled animation");
	560	+ liveCB.setToolTipText("Enable animation");
497	561	liveCB.addItemListener(this);
498	562
499	563	oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -729,6 +793,7 @@
729	793	buttonGroup.add(radioButton);
730	794	radioButton.doClick();
731	795	}
	796	+
732	797	void SetupViews(ObjEditor oe)
733	798	{
734	799	oe.SetupViews();
..	..	@@ -1854,31 +1919,6 @@
1854	1919	csg.addChild(child);
1855	1920	child.addChild(csg);
1856	1921	} 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	1922	if (source == computeAOItem)
1883	1923	{
1884	1924	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1969,6 +2009,14 @@
1969	2009	if (source == cutItem \|\| source == clearButton)
1970	2010	{
1971	2011	loadClipboard(true);
	2012	+ } else
	2013	+ if (source == undoItem)
	2014	+ {
	2015	+ Undo();
	2016	+ } else
	2017	+ if (source == redoItem)
	2018	+ {
	2019	+ Redo();
1972	2020	} else
1973	2021	if (source == duplicateItem)
1974	2022	{
..	..	@@ -2281,7 +2329,7 @@
2281	2329	{
2282	2330	RevertMeshes();
2283	2331	} else
2284		- if (source == resetMeshItem)
	2332	+ if (source == resetAllItem)
2285	2333	{
2286	2334	ResetAll();
2287	2335	} else
..	..	@@ -2993,7 +3041,7 @@
2993	3041	child.CloseUI();
2994	3042	listUI.remove(child);
2995	3043
2996		- child.editWindow = null; // ???????????
	3044	+ //child.editWindow = null; // ???????????
2997	3045	}
2998	3046	objEditor.ctrlPanel.FlushUI();
2999	3047	//objEditor.jTree.clearSelection();
..	..	@@ -3079,7 +3127,9 @@
3079	3127	frontView.object = group;
3080	3128	sideView.object = group;
3081	3129	}
3082		- group.editWindow = this;
	3130	+
	3131	+// fix "+" issue group.editWindow = this;
	3132	+
3083	3133	/*
3084	3134	currentLayout = radio.layout;
3085	3135	if (currentLayout == null)
..	..	@@ -3092,7 +3142,20 @@
3092	3142	//group.attributes = -1;
3093	3143	ResetModel();
3094	3144	refreshContents(true);
3095		- }
	3145	+ } else if (event.getSource() == editCameraItem)
	3146	+ {
	3147	+ cameraView.ProtectCamera();
	3148	+ cameraView.repaint();
	3149	+ return;
	3150	+ } else if (event.getSource() == revertCameraItem)
	3151	+ {
	3152	+ cameraView.RevertCamera();
	3153	+ cameraView.repaint();
	3154	+ return;
	3155	+ // } else if (event.getSource() == textureButton)
	3156	+ // {
	3157	+ // return; // true;
	3158	+ }
3096	3159	else
3097	3160	{
3098	3161	//return super.action(event, arg);
..	..	@@ -3652,7 +3715,16 @@
3652	3715	String pigment = Object3D.GetPigment(tex);
3653	3716	//String bump = Object3D.GetBump(tex);
3654	3717
3655		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3718	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3719	+
	3720	+ try
	3721	+ {
	3722	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3723	+ }
	3724	+ catch (Exception e)
	3725	+ {
	3726	+ System.err.println("FAIL: " + node);
	3727	+ }
3656	3728
3657	3729	double s = v.s;
3658	3730
..	..	@@ -4124,7 +4196,7 @@
4124	4196	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4125	4197
4126	4198	Object3D elem = (Object3D)group.selection.elementAt(i);
4127		- if(elem != group)
	4199	+ if(elem != group \|\| !newWindow)
4128	4200	{
4129	4201	// if (!(elem instanceof Composite))
4130	4202	// newWindow = false;
..	..	@@ -4238,14 +4310,17 @@
4238	4310
4239	4311	objEditor.SetText(); // jan 2014
4240	4312
4241		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4313	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4242	4314	CameraPane.flash = true;
4243	4315
4244		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4316	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4245	4317	// a camera
4246	4318	{
4247		- CameraPane.camerachangeframe = 0; // don't refuse it
4248		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4319	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4320	+ {
	4321	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4322	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4323	+ }
4249	4324	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4250	4325	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4251	4326	}
..	..	@@ -4961,21 +5036,6 @@
4961	5036	}
4962	5037	*/
4963	5038
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	5039	/*
4980	5040	public void Callback(Object obj)
4981	5041	{
..	..	@@ -4999,23 +5059,6 @@
4999	5059	}
5000	5060	*/
5001	5061
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	5062	String GetFile(String dialogName)
5020	5063	{
5021	5064	if (Grafreed.standAlone)
..	..	@@ -5118,6 +5161,8 @@
5118	5161	private MenuItem lookFromItem;
5119	5162	private MenuItem switchItem;
5120	5163	private MenuItem cutItem;
	5164	+ private MenuItem undoItem;
	5165	+ private MenuItem redoItem;
5121	5166	private MenuItem duplicateItem;
5122	5167	private MenuItem cloneItem;
5123	5168	private MenuItem cloneSupportItem;
..	..	@@ -5131,7 +5176,7 @@
5131	5176	private MenuItem linkverticesItem;
5132	5177	private MenuItem relinkverticesItem;
5133	5178	private MenuItem setMasterItem;
5134		- private MenuItem resetMeshItem;
	5179	+ private MenuItem resetAllItem;
5135	5180	private MenuItem stepAllItem;
5136	5181	private MenuItem revertMeshItem;
5137	5182	private MenuItem poseMeshItem;
..	..	@@ -5264,11 +5309,6 @@
5264	5309	private MenuItem doubleItem;
5265	5310	private MenuItem tripleItem;
5266	5311
5267		- private MenuItem importGFDItem;
5268		- private MenuItem importVRMLX3DItem;
5269		- private MenuItem import3DSItem;
5270		- private MenuItem importOBJItem;
5271		-
5272	5312	private MenuItem computeAOItem;
5273	5313	private MenuItem recompileItem;
5274	5314	private MenuItem editScriptItem;
..	..	@@ -5278,4 +5318,8 @@
5278	5318	private MenuItem analyzeItem;
5279	5319	private MenuItem dumpItem;
5280	5320	//boolean freezemodel = false;
	5321	+
	5322	+ Menu cameraMenu;
	5323	+ MenuItem editCameraItem;
	5324	+ MenuItem revertCameraItem;
5281	5325	}