~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -154,11 +154,12 @@
154	154	oe.menuBar.add(menu = new Menu("Edit"));
155	155	//editItem = menu.add(new MenuItem("Edit"));
156	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("-");
	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("-");
162	163	duplicateItem = menu.add(new MenuItem("Duplicate"));
163	164	duplicateItem.addActionListener(this);
164	165	cloneItem = menu.add(new MenuItem("Clone"));
..	..	@@ -202,7 +203,7 @@
202	203	//zBufferItem.addActionListener(this);
203	204	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204	205	//normalLensItem.addActionListener(this);
205		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Camera"));
	206	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
206	207	revertCameraItem.addActionListener(this);
207	208
208	209	cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
..	..	@@ -245,7 +246,7 @@
245	246
246	247	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
247	248	toggleDebugItem.addItemListener(this);
248		- toggleDebugItem.setState(CameraPane.DEBUG);
	249	+ toggleDebugItem.setState(Globals.DEBUG);
249	250
250	251	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
251	252	toggleFrustumItem.addItemListener(this);
..	..	@@ -266,7 +267,7 @@
266	267	// animationItem.addItemListener(this);
267	268	// animationItem.setState(CameraPane.ANIMATION);
268	269	cameraMenu.add("-");
269		- cameraMenu.add(editCameraItem = new MenuItem("Save Camera"));
	270	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
270	271	editCameraItem.addActionListener(this);
271	272
272	273	if (Globals.ADVANCED)
..	..	@@ -469,6 +470,14 @@
469	470	markleavesItem.addActionListener(this);
470	471	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
471	472	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);
472	481	menu.add("-");
473	482	flipVItem = menu.add(new MenuItem("Flip V"));
474	483	flipVItem.addActionListener(this);
..	..	@@ -526,6 +535,18 @@
526	535
527	536	void SetupUI2(ObjEditor oe)
528	537	{
	538	+ // June 2019
	539	+ if (oe == null)
	540	+ {
	541	+ //super.SetupUI2(this);
	542	+ //return;
	543	+ }
	544	+
	545	+ if (copy != group)
	546	+ {
	547	+ //super.SetupUI2(this);
	548	+ }
	549	+
529	550	//new Exception().printStackTrace();
530	551
531	552	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -556,11 +577,35 @@
556	577	*/
557	578	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
558	579
	580	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	581	+ //minButton.setToolTipText("Minimize window");
	582	+ //minButton.addActionListener(this);
	583	+
	584	+ oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	585	+ maxButton.setToolTipText("Maximize window");
	586	+ maxButton.addActionListener(this);
	587	+
	588	+ oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	589	+ fullButton.setToolTipText("Full-screen window");
	590	+ fullButton.addActionListener(this);
	591	+
	592	+ oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	593	+ undoButton.setToolTipText("Undo changes");
	594	+ undoButton.addActionListener(this);
	595	+
	596	+ oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ redoButton.setToolTipText("Redo changes");
	598	+ redoButton.addActionListener(this);
	599	+
	600	+ oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	601	+ saveButton.setToolTipText("Save changes");
	602	+ saveButton.addActionListener(this);
	603	+
559	604	oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
560	605	liveCB.setToolTipText("Enable animation");
561	606	liveCB.addItemListener(this);
562	607
563		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
564	609	oneStepButton.setToolTipText("Animate one step forward");
565	610	oneStepButton.addActionListener(this);
566	611
..	..	@@ -568,7 +613,7 @@
568	613	fastCB.setToolTipText("Fast mode");
569	614	fastCB.addItemListener(this);
570	615
571		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	616	+ oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
572	617	trackCB.setToolTipText("Enable tracking");
573	618	trackCB.addItemListener(this);
574	619
..	..	@@ -796,6 +841,8 @@
796	841
797	842	void SetupViews(ObjEditor oe)
798	843	{
	844	+ theFrame = this;
	845	+
799	846	oe.SetupViews();
800	847
801	848	System.out.println("SetupViews");
..	..	@@ -858,6 +905,7 @@
858	905	} else if(e.getSource() == liveCB)
859	906	{
860	907	cameraView.ToggleLive();
	908	+ refreshContents(false);
861	909	}
862	910	else if(e.getSource() == supportCB)
863	911	{
..	..	@@ -1265,7 +1313,7 @@
1265	1313	memoryItem.addActionListener(this);
1266	1314	menu.add(analyzeItem = new MenuItem("Analyze"));
1267	1315	analyzeItem.addActionListener(this);
1268		- menu.add(dumpItem = new MenuItem("Dump"));
	1316	+ menu.add(dumpItem = new MenuItem("Print"));
1269	1317	dumpItem.addActionListener(this);
1270	1318	// menu.add(pathItem = new MenuItem("From-to path"));
1271	1319	// pathItem.addActionListener(this);
..	..	@@ -1956,6 +2004,30 @@
1956	2004	{
1957	2005	DumpObject();
1958	2006	} else
	2007	+ if (source == minButton)
	2008	+ {
	2009	+ Minimize();
	2010	+ } else
	2011	+ if (source == maxButton)
	2012	+ {
	2013	+ Maximize();
	2014	+ } else
	2015	+ if (source == fullButton)
	2016	+ {
	2017	+ ToggleFullScreen();
	2018	+ } else
	2019	+ if (source == undoButton)
	2020	+ {
	2021	+ Undo();
	2022	+ } else
	2023	+ if (source == redoButton)
	2024	+ {
	2025	+ Redo();
	2026	+ } else
	2027	+ if (source == saveButton)
	2028	+ {
	2029	+ Save();
	2030	+ } else
1959	2031	if (source == oneStepButton)
1960	2032	{
1961	2033	Globals.ONESTEP = true;
..	..	@@ -2517,7 +2589,7 @@
2517	2589	} else
2518	2590	if (source == genNormalsMESHItem)
2519	2591	{
2520		- GenNormals(true); // TODO
	2592	+ GenNormalsMESH();
2521	2593	} else
2522	2594	if (source == genNormalsORGANItem)
2523	2595	{
..	..	@@ -2582,6 +2654,22 @@
2582	2654	if (source == unmarkleavesItem)
2583	2655	{
2584	2656	MarkLeaves(false);
	2657	+ } else
	2658	+ if (source == rewindleavesItem)
	2659	+ {
	2660	+ RewindLeaves(true);
	2661	+ } else
	2662	+ if (source == unrewindleavesItem)
	2663	+ {
	2664	+ RewindLeaves(false);
	2665	+ } else
	2666	+ if (source == randomleavesItem)
	2667	+ {
	2668	+ RandomLeaves(true);
	2669	+ } else
	2670	+ if (source == unrandomleavesItem)
	2671	+ {
	2672	+ RandomLeaves(false);
2585	2673	} else
2586	2674	if (source == flipVItem)
2587	2675	{
..	..	@@ -2849,6 +2937,24 @@
2849	2937	bigThree.ClearUI();
2850	2938	bigThree.add(centralPanel);
2851	2939	bigThree.FlushUI();
	2940	+
	2941	+ cameraView.requestFocusInWindow();
	2942	+
	2943	+// refreshContents(true);
	2944	+//
	2945	+// try
	2946	+// {
	2947	+// java.awt.Robot bot = new java.awt.Robot();
	2948	+// int mask = InputEvent.BUTTON1_MASK;
	2949	+// bot.mouseMove(100, 100);
	2950	+// bot.mousePress(mask);
	2951	+// bot.mouseRelease(mask);
	2952	+// }
	2953	+// catch (Exception e)
	2954	+// {
	2955	+//
	2956	+// }
	2957	+
2852	2958	} else
2853	2959	if (source == threeButton)
2854	2960	{
..	..	@@ -2885,6 +2991,8 @@
2885	2991	bigThree.add(centralPanel);
2886	2992	bigThree.add(XYZPanel);
2887	2993	bigThree.FlushUI();
	2994	+
	2995	+ cameraView.requestFocusInWindow();
2888	2996	} else
2889	2997	if (source == fourButton)
2890	2998	{
..	..	@@ -2920,6 +3028,8 @@
2920	3028	bigThree.ClearUI();
2921	3029	bigThree.add(scenePanel);
2922	3030	bigThree.FlushUI();
	3031	+
	3032	+ cameraView.requestFocusInWindow();
2923	3033	} else
2924	3034	if (source == sixButton)
2925	3035	{
..	..	@@ -2956,6 +3066,8 @@
2956	3066	bigThree.add(scenePanel);
2957	3067	bigThree.add(centralPanel);
2958	3068	bigThree.FlushUI();
	3069	+
	3070	+ cameraView.requestFocusInWindow();
2959	3071	} else
2960	3072	if (source == sevenButton)
2961	3073	{
..	..	@@ -2993,6 +3105,8 @@
2993	3105	bigThree.add(centralPanel);
2994	3106	bigThree.add(XYZPanel);
2995	3107	bigThree.FlushUI();
	3108	+
	3109	+ cameraView.requestFocusInWindow();
2996	3110	} else
2997	3111	if (source == rootButton)
2998	3112	{
..	..	@@ -3004,6 +3118,7 @@
3004	3118	EditObject(obj);
3005	3119	}
3006	3120
	3121	+ cameraView.requestFocusInWindow();
3007	3122	refreshContents(true);
3008	3123	} else
3009	3124	if (source == closeButton)
..	..	@@ -3025,6 +3140,8 @@
3025	3140	break;
3026	3141	}
3027	3142	}
	3143	+
	3144	+ cameraView.requestFocusInWindow();
3028	3145	refreshContents(true);
3029	3146	} else
3030	3147	if (source == editItem \|\| source == editButton)
..	..	@@ -3041,7 +3158,7 @@
3041	3158	child.CloseUI();
3042	3159	listUI.remove(child);
3043	3160
3044		- child.editWindow = null; // ???????????
	3161	+ //child.editWindow = null; // ???????????
3045	3162	}
3046	3163	objEditor.ctrlPanel.FlushUI();
3047	3164	//objEditor.jTree.clearSelection();
..	..	@@ -3128,7 +3245,8 @@
3128	3245	sideView.object = group;
3129	3246	}
3130	3247
3131		-// fix "+" issue group.editWindow = this;
	3248	+// fix "+" issue
	3249	+ //group.editWindow = this;
3132	3250
3133	3251	/*
3134	3252	currentLayout = radio.layout;
..	..	@@ -3141,6 +3259,8 @@
3141	3259	//group.parent = null; // ROOT
3142	3260	//group.attributes = -1;
3143	3261	ResetModel();
	3262	+
	3263	+ cameraView.requestFocusInWindow();
3144	3264	refreshContents(true);
3145	3265	} else if (event.getSource() == editCameraItem)
3146	3266	{
..	..	@@ -3164,7 +3284,6 @@
3164	3284	}
3165	3285
3166	3286	boolean useclient = false;
3167		- cRadio radio;
3168	3287
3169	3288	void ToggleRoot()
3170	3289	{
..	..	@@ -3403,7 +3522,8 @@
3403	3522
3404	3523	int size = obj.MemorySize();
3405	3524
3406		- System.err.println((size/1024) + " KB is the size of " + obj);
	3525	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3526	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3407	3527	}
3408	3528	}
3409	3529	catch (Exception e)
..	..	@@ -3484,6 +3604,13 @@
3484	3604	void GenNormals(boolean crease)
3485	3605	{
3486	3606	group.GenNormalsS(crease);
	3607	+
	3608	+ refreshContents();
	3609	+ }
	3610	+
	3611	+ void GenNormalsMESH()
	3612	+ {
	3613	+ group.GenNormalsMeshS();
3487	3614
3488	3615	refreshContents();
3489	3616	}
..	..	@@ -4111,6 +4238,18 @@
4111	4238	refreshContents();
4112	4239	}
4113	4240
	4241	+ void RewindLeaves(boolean hide)
	4242	+ {
	4243	+ group.selection.RewindLeaves(hide);
	4244	+ refreshContents();
	4245	+ }
	4246	+
	4247	+ void RandomLeaves(boolean hide)
	4248	+ {
	4249	+ group.selection.RandomLeaves(hide);
	4250	+ refreshContents();
	4251	+ }
	4252	+
4114	4253	void SetTexRes(int tr)
4115	4254	{
4116	4255	group.selection.SetTexRes(tr);
..	..	@@ -4286,7 +4425,6 @@
4286	4425	//case 702: // Event.LIST_DESELECT
4287	4426	group.deselectAll();
4288	4427	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4289		- objEditor.ClearInfo(); // .GetMaterial());
4290	4428	if (tps != null)
4291	4429	{
4292	4430	for (int i=0; i < tps.length; i++)
..	..	@@ -4295,10 +4433,8 @@
4295	4433
4296	4434	//if (child.parent != null)
4297	4435	//child.parent.addSelectee(child);
	4436	+ objEditor.SetMaterial(child);
4298	4437	group.addSelectee(child);
4299		- objEditor.SetMaterial(child); // .GetMaterial());
4300		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4301		- System.err.println("info : " + child.GetPath());
4302	4438	}
4303	4439	}
4304	4440	// else
..	..	@@ -4308,17 +4444,13 @@
4308	4444	// System.err.println("info : " + group.GetPath());
4309	4445	// }
4310	4446
4311		- objEditor.SetText(); // jan 2014
4312		-
4313		- Object3D object = (Object3D) tps[0].getLastPathComponent();
4314		-
4315		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(object instanceof Camera))
	4447	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4316	4448	CameraPane.flash = true;
4317	4449
4318		- if (tps != null && tps.length > 0 && object instanceof Camera)
	4450	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4319	4451	// a camera
4320	4452	{
4321		- if (object != Globals.theRenderer.LightCamera())
	4453	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
4322	4454	{
4323	4455	CameraPane.camerachangeframe = 0; // don't refuse it
4324	4456	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4335,6 +4467,26 @@
4335	4467
4336	4468	freezemodel = false;
4337	4469	}
	4470	+
	4471	+ void refreshContents(boolean cp)
	4472	+ {
	4473	+ if (!Globals.MOUSEDRAGGED)
	4474	+ {
	4475	+ objEditor.ClearInfo(); // .GetMaterial());
	4476	+
	4477	+ for (int i=0; i < group.selection.Size(); i++)
	4478	+ {
	4479	+ Object3D child = (Object3D) group.selection.get(i);
	4480	+
	4481	+ objEditor.AddInfo(child, this, true);
	4482	+ System.err.println("info : " + child.GetPath());
	4483	+ }
	4484	+
	4485	+ objEditor.SetText(); // jan 2014
	4486	+ }
	4487	+
	4488	+ super.refreshContents(cp);
	4489	+ }
4338	4490
4339	4491	void linkSomething(Object3D thing)
4340	4492	{
..	..	@@ -4406,6 +4558,7 @@
4406	4558	{
4407	4559	if (group.selection.isEmpty())
4408	4560	return;
	4561	+
4409	4562	Grafreed.clipboardIsTempGroup = false;
4410	4563	Composite tGroup = null;
4411	4564	if (group.selection.size() > 0) // 1)
..	..	@@ -4416,6 +4569,7 @@
4416	4569
4417	4570	if (cut)
4418	4571	{
	4572	+ Save();
4419	4573	//int indices[] = jList.getSelectedIndices();
4420	4574	//for (int i = indices.length - 1; i >= 0; i--)
4421	4575	//jList.remove(indices[i]);
..	..	@@ -4505,8 +4659,10 @@
4505	4659	}
4506	4660
4507	4661	}
	4662	+
4508	4663	if (Grafreed.clipboardIsTempGroup)
4509	4664	Grafreed.clipboard = tGroup;
	4665	+
4510	4666	if (cut)
4511	4667	{
4512	4668	ResetModel();
..	..	@@ -5131,6 +5287,12 @@
5131	5287	cButton clearpanelButton;
5132	5288	cButton unselectButton;
5133	5289
	5290	+ cButton minButton;
	5291	+ cButton maxButton;
	5292	+ cButton fullButton;
	5293	+ cButton undoButton;
	5294	+ cButton redoButton;
	5295	+ cButton saveButton;
5134	5296	cButton oneStepButton;
5135	5297
5136	5298	cButton screenfitButton;
..	..	@@ -5143,14 +5305,6 @@
5143	5305	cButton closeButton;
5144	5306
5145	5307	cButton setsupportButton;
5146		-
5147		- cButton twoButton;
5148		- cButton sixButton;
5149		- cButton threeButton;
5150		- cButton sevenButton;
5151		- cButton fourButton; // full panel
5152		- cButton oneButton; // full XYZ
5153		- //cButton currentLayout;
5154	5308
5155	5309	//
5156	5310	//Composite
..	..	@@ -5228,6 +5382,10 @@
5228	5382	private MenuItem showleavesItem;
5229	5383	private MenuItem markleavesItem;
5230	5384	private MenuItem unmarkleavesItem;
	5385	+ private MenuItem rewindleavesItem;
	5386	+ private MenuItem unrewindleavesItem;
	5387	+ private MenuItem randomleavesItem;
	5388	+ private MenuItem unrandomleavesItem;
5231	5389
5232	5390	private MenuItem flipVItem;
5233	5391	private MenuItem unflipVItem;