~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -60,6 +60,12 @@
60	60	this.copy = this.group = group;
61	61	//selectees = this.group.selectees;
62	62
	63	+ if (copy.versions == null)
	64	+ {
	65	+ copy.versions = new byte[100][];
	66	+ copy.versionindex = -1;
	67	+ }
	68	+
63	69	if(ui)
64	70	SetupUI(objEditor);
65	71	}
..	..	@@ -74,6 +80,12 @@
74	80	this.copy = this.group = copy;
75	81	//selectees = this.group.selectees;
76	82
	83	+ if (copy.versions == null)
	84	+ {
	85	+ copy.versions = new byte[100][];
	86	+ copy.versionindex = -1;
	87	+ }
	88	+
77	89	SetupMenu2(this); //objEditor);
78	90	SetupUI2(objEditor);
79	91	objEditor.SetupUI(true);
..	..	@@ -84,6 +96,10 @@
84	96
85	97	void CloneSelection(boolean supports)
86	98	{
	99	+ if (Globals.REPLACEONMAKE)
	100	+ Save();
	101	+ boolean keep = Globals.REPLACEONMAKE;
	102	+ Globals.REPLACEONMAKE = false;
87	103	// Object3D keep = GrafreeD.clipboard;
88	104	//Object3D obj;
89	105	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +110,7 @@
94	110
95	111	makeSomething(clone, i==group.selection.size()-1);
96	112	}
	113	+ Globals.REPLACEONMAKE = keep;
97	114	}
98	115
99	116	void CloneClipboard(boolean supports)
..	..	@@ -220,7 +237,7 @@
220	237	// toggleSwitchItem.addItemListener(this);
221	238	// toggleSwitchItem.setState(CameraPane.SWITCH);
222	239
223		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	240	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224	241	toggleHandleItem.addItemListener(this);
225	242	toggleHandleItem.setState(CameraPane.HANDLES);
226	243
..	..	@@ -380,13 +397,14 @@
380	397	shadowYItem.addActionListener(this);
381	398	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382	399	shadowZItem.addActionListener(this);
	400	+ attributeItem = menu.add(new MenuItem("Attribute"));
	401	+ attributeItem.addActionListener(this);
	402	+
383	403	if (Globals.ADVANCED)
384	404	{
385	405	menu.add("-");
386	406	linkerItem = menu.add(new MenuItem("Linker"));
387	407	linkerItem.addActionListener(this);
388		- attributeItem = menu.add(new MenuItem("Attribute"));
389		- attributeItem.addActionListener(this);
390	408	templateItem = menu.add(new MenuItem("Template"));
391	409	templateItem.addActionListener(this);
392	410	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -538,6 +556,7 @@
538	556	buildToolsMenu(menu);
539	557	}
540	558
	559	+
541	560	void SetupUI2(ObjEditor oe)
542	561	{
543	562	// June 2019
..	..	@@ -582,7 +601,7 @@
582	601	*/
583	602	cGridBag copyOptionsPanel = new cGridBag();
584	603
585		- copyOptionsPanel.preferredHeight = 2;
	604	+ copyOptionsPanel.preferredHeight = 1;
586	605
587	606	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
588	607
..	..	@@ -590,50 +609,66 @@
590	609	//minButton.setToolTipText("Minimize window");
591	610	//minButton.addActionListener(this);
592	611
593		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- maxButton.setToolTipText("Maximize window");
595		- maxButton.addActionListener(this);
	612	+ if (Globals.ADVANCED)
	613	+ {
	614	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ maxButton.setToolTipText("Maximize window");
	616	+ maxButton.addActionListener(this);
	617	+ }
596	618
597	619	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598	620	fullButton.setToolTipText("Full-screen window");
599	621	fullButton.addActionListener(this);
600	622
	623	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ screenfitButton.setToolTipText("Screen fit");
	625	+ screenfitButton.addActionListener(this);
	626	+
601	627	oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602	628	restoreCameraButton.setToolTipText("Restore viewpoint");
603	629	restoreCameraButton.addActionListener(this);
604	630
	631	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	632	+ saveButton.setToolTipText("New version");
	633	+ saveButton.addActionListener(this);
	634	+
605	635	copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606		- undoButton.setToolTipText("Undo changes");
	636	+ undoButton.setToolTipText("Previous version");
607	637	undoButton.addActionListener(this);
608	638	undoButton.setEnabled(false);
609	639
	640	+ cGridBag updown = new cGridBag().setVertical(true);
	641	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ restoreButton.setToolTipText("Restore current");
	643	+ restoreButton.addActionListener(this);
	644	+ restoreButton.setEnabled(false);
	645	+
	646	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ replaceButton.setToolTipText("Replace current");
	648	+ replaceButton.addActionListener(this);
	649	+ replaceButton.setEnabled(false);
	650	+
	651	+ copyOptionsPanel.add(updown);
	652	+
610	653	copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611		- redoButton.setToolTipText("Redo changes");
	654	+ redoButton.setToolTipText("Next version");
612	655	redoButton.addActionListener(this);
613	656	redoButton.setEnabled(false);
614	657
615		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616		- saveButton.setToolTipText("Save changes");
617		- saveButton.addActionListener(this);
618		-
619		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	658	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
620	659	liveCB.setToolTipText("Enable animation");
621	660	liveCB.addItemListener(this);
622	661
623		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624	663	oneStepButton.setToolTipText("Animate one step forward");
625	664	oneStepButton.addActionListener(this);
626	665
627		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	666	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
628	667	fastCB.setToolTipText("Fast mode");
629	668	fastCB.addItemListener(this);
630	669
631	670	//oe.toolboxPanel.Return();
632	671
633		- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- screenfitButton.setToolTipText("Screen fit");
635		- screenfitButton.addActionListener(this);
636		-
637	672	// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
638	673	// trackCB.setToolTipText("Enable tracking");
639	674	// trackCB.addItemListener(this);
..	..	@@ -726,7 +761,7 @@
726	761	compositeButton.addActionListener(this);
727	762
728	763	oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
729		- switchButton.setToolTipText("Create switch");
	764	+ switchButton.setToolTipText("Create item switcher");
730	765	switchButton.addActionListener(this);
731	766
732	767	oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -811,6 +846,9 @@
811	846
812	847	oe.treePanel.add(copyOptionsPanel);
813	848	oe.treePanel.Return();
	849	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	850	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	851	+ sliderPane.preferredHeight = 1;
814	852
815	853	// mainPanel.setDividerLocation(0.5); //1.0);
816	854	// mainPanel.setResizeWeight(0.5);
..	..	@@ -863,9 +901,13 @@
863	901
864	902	if (true) // Globals.ADVANCED)
865	903	{
866		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
867		- supportCB.setToolTipText("Enable rigging");
868		- supportCB.addItemListener(this);
	904	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	905	+// supportCB.setToolTipText("Enable rigging");
	906	+// supportCB.addItemListener(this);
	907	+
	908	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	909	+ freezeCB.setToolTipText("Fast moving camera");
	910	+ freezeCB.addItemListener(this);
869	911
870	912	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
871	913	// localCB.addItemListener(this);
..	..	@@ -929,12 +971,12 @@
929	971	toggleTextureCB.addItemListener(this);
930	972
931	973	panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
932		- toggleSwitchCB.setToolTipText("Use switch");
	974	+ toggleSwitchCB.setToolTipText("Choose a single item");
933	975	toggleSwitchCB.addItemListener(this);
934	976
935		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
936		- autosaveCB.setToolTipText("On structure change");
937		- autosaveCB.addItemListener(this);
	977	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	978	+ autokeepCB.setToolTipText("On structure change");
	979	+ autokeepCB.addItemListener(this);
938	980
939	981	panel.Return();
940	982	if (Globals.ADVANCED)
..	..	@@ -963,7 +1005,7 @@
963	1005	{
964	1006	cRadio radioButton = new cRadio(obj.name);
965	1007
966		- // Patch to avoid bug with transparency.
	1008	+ // June 2019. Patch to avoid bug with transparency.
967	1009	radioButton.hadMaterial = obj.material != null;
968	1010	if (!radioButton.hadMaterial)
969	1011	{
..	..	@@ -1000,6 +1042,7 @@
1000	1042	cCheckBox slowCB;
1001	1043	cCheckBox boxCB;
1002	1044	cCheckBox zoomBoxCB;
	1045	+ cCheckBox freezeCB;
1003	1046	//cToggleButton trackCB;
1004	1047	cCheckBox trackCB;
1005	1048	cCheckBox smoothfocusCB;
..	..	@@ -1010,7 +1053,7 @@
1010	1053
1011	1054	cCheckBox oeilCB;
1012	1055	cCheckBox shadowCB;
1013		- cCheckBox autosaveCB;
	1056	+ cCheckBox autokeepCB;
1014	1057	cCheckBox lookAtCB;
1015	1058
1016	1059	// static int COLOR = 1;
..	..	@@ -1118,9 +1161,13 @@
1118	1161	{
1119	1162	Globals.COMPUTESHADOWWHENLIVE ^= true;
1120	1163	}
1121		- else if(e.getSource() == autosaveCB)
	1164	+ else if(e.getSource() == freezeCB)
1122	1165	{
1123		- Globals.SAVEONMAKE ^= true;
	1166	+ Globals.FREEZEONMOVE ^= true;
	1167	+ }
	1168	+ else if(e.getSource() == autokeepCB)
	1169	+ {
	1170	+ Globals.REPLACEONMAKE ^= true;
1124	1171	}
1125	1172	else if(e.getSource() == lookAtCB)
1126	1173	{
..	..	@@ -1202,8 +1249,6 @@
1202	1249	}
1203	1250	}
1204	1251
1205		- String string = (String) object;
1206		-
1207	1252	System.out.println("Transfer = " + object + "; drop : " + target);
1208	1253	// if( object instanceof java.io.File[])
1209	1254	// {
..	..	@@ -1211,6 +1256,8 @@
1211	1256	// objEditor.DropFile((java.io.File[]) object, true);
1212	1257	// return;
1213	1258	// }
	1259	+
	1260	+ String string = object.toString();
1214	1261
1215	1262	// File path for Mac and Windows
1216	1263	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1460,6 +1507,9 @@
1460	1507	animationItem.addItemListener(this);
1461	1508	animationItem.setState(Globals.ANIMATION);
1462	1509
	1510	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1511	+ archiveItem.addActionListener(this);
	1512	+
1463	1513	menu.add("-");
1464	1514	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1465	1515	parseverticesItem.addActionListener(this);
..	..	@@ -1472,6 +1522,8 @@
1472	1522	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1473	1523	reduce34MorphItem.addActionListener(this);
1474	1524	menu.add("-");
	1525	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1526	+ memoryItem.addActionListener(this);
1475	1527	menu.add(computeAOItem = new MenuItem("Compute AO"));
1476	1528	computeAOItem.addActionListener(this);
1477	1529
..	..	@@ -1480,8 +1532,6 @@
1480	1532	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1481	1533	mirrorItem.addActionListener(this);
1482	1534	menu.add("-");
1483		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1484		- memoryItem.addActionListener(this);
1485	1535	menu.add(analyzeItem = new MenuItem("Analyze"));
1486	1536	analyzeItem.addActionListener(this);
1487	1537	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -2122,25 +2172,25 @@
2122	2172	Composite csg = new GroupLeaf();
2123	2173	csg.count = 5;
2124	2174	group(csg);
2125		- Composite child = new cGroup();
	2175	+ Composite child = new cGroup("Branch");
2126	2176	csg.addChild(child);
2127	2177	child.addChild(csg);
2128	2178	} else
2129	2179	if (source == doubleItem)
2130	2180	{
2131		- Composite csg = new GroupLeaf();
	2181	+ Composite csg = new GroupLeaf("Fork");
2132	2182	csg.count = 5;
2133	2183	group(csg);
2134		- Composite child = new cGroup();
	2184	+ Composite child = new cGroup("Branch A");
2135	2185	csg.addChild(child);
2136	2186	child.addChild(csg);
2137		- child = new cGroup();
	2187	+ child = new cGroup("Branch B");
2138	2188	csg.addChild(child);
2139	2189	child.addChild(csg);
2140	2190	} else
2141	2191	if (source == tripleItem)
2142	2192	{
2143		- Composite csg = new GroupLeaf();
	2193	+ Composite csg = new GroupLeaf("Trident");
2144	2194	csg.count = 4;
2145	2195	group(csg);
2146	2196	Composite child = new cGroup();
..	..	@@ -2204,15 +2254,31 @@
2204	2254	} else
2205	2255	if (source == undoButton)
2206	2256	{
	2257	+ // Go to previous version
	2258	+ //if (!Undo())
	2259	+ //java.awt.Toolkit.getDefaultToolkit().beep();
2207	2260	Undo();
	2261	+ } else
	2262	+ if (source == restoreButton)
	2263	+ {
	2264	+ // Restore current version
	2265	+ Restore();
	2266	+ } else
	2267	+ if (source == replaceButton)
	2268	+ {
	2269	+ // Overwrite current version
	2270	+ Replace();
2208	2271	} else
2209	2272	if (source == redoButton)
2210	2273	{
	2274	+ // Go to next version
2211	2275	Redo();
2212	2276	} else
2213	2277	if (source == saveButton)
2214	2278	{
2215		- Save();
	2279	+ // Save a new version
	2280	+ if (!Save(true))
	2281	+ java.awt.Toolkit.getDefaultToolkit().beep();
2216	2282	} else
2217	2283	if (source == oneStepButton)
2218	2284	{
..	..	@@ -2221,17 +2287,14 @@
2221	2287	} else
2222	2288	if (source == screenfitButton)
2223	2289	{
2224		- //Reload(lastConverter, lastFilename, true);
2225	2290	ScreenFit();
2226	2291	} else
2227	2292	if (source == screenfitpointButton)
2228	2293	{
2229		- //Reload(lastConverter, lastFilename, true);
2230	2294	ScreenFitPoint();
2231	2295	} else
2232	2296	if (source == snapobjectButton)
2233	2297	{
2234		- //Reload(lastConverter, lastFilename, true);
2235	2298	SnapObject();
2236	2299	} else
2237	2300	// if (event.getSource() == recompileButton)
..	..	@@ -2755,15 +2818,28 @@
2755	2818	} else
2756	2819	if (source == ungroupItem \|\| source == ungroupButton)
2757	2820	{
2758		- //ungroup();
	2821	+ boolean hasRoot = false;
	2822	+
2759	2823	for (int i=0; i<group.selection.size(); i++)
2760	2824	{
2761		- Ungroup(group.selection.get(i));
	2825	+ if (group.selection.get(i) == group)
	2826	+ {
	2827	+ hasRoot = true;
	2828	+ break;
	2829	+ }
2762	2830	}
2763	2831
2764		- ClearSelection(false);
2765		-
2766		- refreshContents();
	2832	+ if (!hasRoot)
	2833	+ {
	2834	+ for (int i=0; i<group.selection.size(); i++)
	2835	+ {
	2836	+ Ungroup(group.selection.get(i));
	2837	+ }
	2838	+
	2839	+ ClearSelection(false);
	2840	+
	2841	+ refreshContents();
	2842	+ }
2767	2843	} else
2768	2844	if (source == genUVItem)
2769	2845	{
..	..	@@ -3446,6 +3522,9 @@
3446	3522	}
3447	3523
3448	3524	copy = group;
	3525	+
	3526	+ SetUndoStates();
	3527	+
3449	3528	//Globals.theRenderer.object = group;
3450	3529	if(!useclient)
3451	3530	{
..	..	@@ -3474,6 +3553,8 @@
3474	3553	radio.layout.doClick();
3475	3554
3476	3555	ClearUnpinned();
	3556	+ Grafreed.Assert(group != null);
	3557	+ Grafreed.Assert(group.selection != null);
3477	3558	SetPinStates(group.selection.size() > 0);
3478	3559	if (group.selection.size() == 1)
3479	3560	EditSelection(false);
..	..	@@ -4706,7 +4787,7 @@
4706	4787	void refreshContents(boolean cp)
4707	4788	{
4708	4789	if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4709		- if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4790	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4710	4791	{
4711	4792	objEditor.ClearInfo(); // .GetMaterial());
4712	4793
..	..	@@ -4805,8 +4886,8 @@
4805	4886
4806	4887	if (cut)
4807	4888	{
4808		- if (Globals.SAVEONMAKE)
4809		- Save();
	4889	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4890	+// Save();
4810	4891	//int indices[] = jList.getSelectedIndices();
4811	4892	//for (int i = indices.length - 1; i >= 0; i--)
4812	4893	//jList.remove(indices[i]);
..	..	@@ -4909,6 +4990,10 @@
4909	4990
4910	4991	void paste(boolean expand)
4911	4992	{
	4993	+ if (Globals.REPLACEONMAKE)
	4994	+ Save();
	4995	+ boolean keep = Globals.REPLACEONMAKE;
	4996	+ Globals.REPLACEONMAKE = false;
4912	4997	// if (GrafreeD.clipboard == null)
4913	4998	// return;
4914	4999	boolean first = true;
..	..	@@ -4968,6 +5053,7 @@
4968	5053	Grafreed.clipboard.get(0).parent = keepparent;
4969	5054	}
4970	5055
	5056	+ Globals.REPLACEONMAKE = keep;
4971	5057	ResetModel();
4972	5058	refreshContents();
4973	5059	}
..	..	@@ -5103,6 +5189,10 @@
5103	5189
5104	5190	void group(Object3D csg, boolean grab)
5105	5191	{
	5192	+ if (Globals.REPLACEONMAKE)
	5193	+ Save();
	5194	+ boolean keep = Globals.REPLACEONMAKE;
	5195	+ Globals.REPLACEONMAKE = false;
5106	5196	if (//false) // why??
5107	5197	!group.selection.isEmpty())
5108	5198	{
..	..	@@ -5216,10 +5306,15 @@
5216	5306	//node.add(csg);
5217	5307	//makeSomething(node);
5218	5308	makeSomething(csg);
	5309	+ Globals.REPLACEONMAKE = keep;
5219	5310	}
5220	5311
5221	5312	void Ungroup(Object3D g)
5222	5313	{
	5314	+ if (Globals.REPLACEONMAKE)
	5315	+ Save();
	5316	+ boolean keep = Globals.REPLACEONMAKE;
	5317	+ Globals.REPLACEONMAKE = false;
5223	5318	if (g instanceof HiddenObject)
5224	5319	{
5225	5320	HiddenObject h = (HiddenObject) g;
..	..	@@ -5236,6 +5331,7 @@
5236	5331	objEditor.makeSomething(g.get(i), false);
5237	5332	}
5238	5333	}
	5334	+ Globals.REPLACEONMAKE = keep;
5239	5335	}
5240	5336
5241	5337	void ungroup()
..	..	@@ -5526,9 +5622,6 @@
5526	5622
5527	5623	cButton restoreCameraButton;
5528	5624
5529		- cButton minButton;
5530		- cButton maxButton;
5531		- cButton fullButton;
5532	5625	cButton saveButton;
5533	5626	cButton oneStepButton;
5534	5627