~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,314 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	46	+ {
	47	+ cGridBag tab0 = new cGridBag().setVertical(true);
	48	+
	49	+ tab0.setName("Urban");
	50	+ skyboxpanel.add(tab0);
	51	+
	52	+ cGridBag row0 = new cGridBag();
	53	+ cGridBag row1 = new cGridBag();
	54	+ cGridBag row2 = new cGridBag();
	55	+ cGridBag row3 = new cGridBag();
	56	+ cGridBag row4 = new cGridBag();
	57	+ cGridBag row5 = new cGridBag();
	58	+ cGridBag row6 = new cGridBag();
	59	+
	60	+ AddSkyboxButton("default", "rgb", row0);
	61	+ //AddSkyboxButton("default", "cornell", row0);
	62	+ AddSkyboxButton("penguins", "dust", row0);
	63	+ AddSkyboxButton("penguins", "tropic", row0);
	64	+ AddSkyboxButton("penguins", "yonder", row0);
	65	+
	66	+ AddSkyboxButton("default", "uffizi", row1);
	67	+ AddSkyboxButton("bridge", "Bridge", row1);
	68	+ AddSkyboxButton("bridge", "Bridge2", row1);
	69	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	70	+
	71	+ AddSkyboxButton("urban", "Parliament", row2);
	72	+ AddSkyboxButton("urban", "Roundabout", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	74	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	75	+
	76	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	77	+ AddSkyboxButton("urban", "UnionSquare", row3);
	78	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	79	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	80	+
	81	+ AddSkyboxButton("park", "Buddha", row4);
	82	+ AddSkyboxButton("park", "CNTower2", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	84	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	85	+
	86	+ AddSkyboxButton("park", "Park", row5);
	87	+ AddSkyboxButton("park", "Pond", row5);
	88	+ AddSkyboxButton("park", "Skansen", row5);
	89	+ AddSkyboxButton("park", "Skansen2", row5);
	90	+
	91	+ AddSkyboxButton("park", "Skansen3", row6);
	92	+ AddSkyboxButton("park", "Skansen4", row6);
	93	+ AddSkyboxButton("park", "Skansen5", row6);
	94	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	95	+
	96	+ tab0.add(row0);
	97	+ tab0.add(row1);
	98	+ tab0.add(row2);
	99	+ tab0.add(row3);
	100	+ tab0.add(row4);
	101	+ tab0.add(row5);
	102	+ tab0.add(row6);
	103	+
	104	+ for (int i=5; --i>=0;)
	105	+ {
	106	+ //oe.toolboxPanel.Return();
	107	+ //tab0.add(new cGridBag());
	108	+ }
	109	+ }
	110	+
	111	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	112	+ {
	113	+ cGridBag tab0 = new cGridBag().setVertical(true);
	114	+
	115	+ tab0.setName("Nature");
	116	+ skyboxpanel.add(tab0);
	117	+
	118	+ cGridBag row0 = new cGridBag();
	119	+ cGridBag row1 = new cGridBag();
	120	+ cGridBag row2 = new cGridBag();
	121	+ cGridBag row3 = new cGridBag();
	122	+ cGridBag row4 = new cGridBag();
	123	+ cGridBag row5 = new cGridBag();
	124	+ cGridBag row6 = new cGridBag();
	125	+
	126	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	127	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	128	+ AddSkyboxButton("beach", "PalmTrees", row0);
	129	+ AddSkyboxButton("beach", "Tenerife", row0);
	130	+
	131	+ AddSkyboxButton("beach", "Tenerife2", row1);
	132	+ AddSkyboxButton("beach", "Tenerife3", row1);
	133	+ AddSkyboxButton("field", "FishPond", row1);
	134	+ AddSkyboxButton("field", "Footballfield", row1);
	135	+
	136	+ AddSkyboxButton("field", "Meadow", row2);
	137	+ AddSkyboxButton("field", "Sorsele", row2);
	138	+ AddSkyboxButton("field", "Sorsele2", row2);
	139	+ AddSkyboxButton("field", "Sorsele3", row2);
	140	+
	141	+ AddSkyboxButton("forest", "Brudslojan", row3);
	142	+ AddSkyboxButton("forest", "Langholmen2", row3);
	143	+ AddSkyboxButton("forest", "Plants", row3);
	144	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	145	+
	146	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	147	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	148	+ AddSkyboxButton("mountain", "Teide", row4);
	149	+ AddSkyboxButton("park", "Tantolunden4", row4);
	150	+
	151	+ AddSkyboxButton("park", "Stairs", row5);
	152	+ AddSkyboxButton("default", "skycube", row6);
	153	+ AddSkyboxButton("rocky", "Langholmen", row5);
	154	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	155	+
	156	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	157	+ AddSkyboxButton("default", "CloudyHills", row6);
	158	+ AddSkyboxButton("daz", "Autumn", row6);
	159	+ AddSkyboxButton("daz", "MountainTrail", row6);
	160	+ /*
	161	+Autumn
	162	+Greenlands
	163	+MountainTrail
	164	+Oasis
	165	+TheRock
	166	+TopOfTheWorld
	167	+Winter
	168	+ */
	169	+
	170	+ tab0.add(row0);
	171	+ tab0.add(row1);
	172	+ tab0.add(row2);
	173	+ tab0.add(row3);
	174	+ tab0.add(row4);
	175	+ tab0.add(row5);
	176	+ tab0.add(row6);
	177	+
	178	+ for (int i=5; --i>=0;)
	179	+ {
	180	+ //oe.toolboxPanel.Return();
	181	+ //tab0.add(new cGridBag());
	182	+ }
	183	+ }
	184	+
	185	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	186	+ {
	187	+ cGridBag tab0 = new cGridBag().setVertical(true);
	188	+
	189	+ tab0.setName("Night");
	190	+ skyboxpanel.add(tab0);
	191	+
	192	+ cGridBag row0 = new cGridBag();
	193	+ cGridBag row1 = new cGridBag();
	194	+ cGridBag row2 = new cGridBag();
	195	+ cGridBag row3 = new cGridBag();
	196	+ cGridBag row4 = new cGridBag();
	197	+ cGridBag row5 = new cGridBag();
	198	+ cGridBag row6 = new cGridBag();
	199	+
	200	+ AddSkyboxButton("night", "NightPath", row0);
	201	+ AddSkyboxButton("night", "PondNight", row0);
	202	+ AddSkyboxButton("night", "Powerlines", row0);
	203	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	204	+
	205	+ AddSkyboxButton("urban", "CNTower", row1);
	206	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	207	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	208	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	209	+
	210	+ AddSkyboxButton("penguins", "kenon_star", row2);
	211	+ AddSkyboxButton("persson", "corona", row2);
	212	+ AddSkyboxButton("persson", "spaceskybox", row2);
	213	+ AddSkyboxButton("indoors", "Vasa", row2);
	214	+
	215	+ AddSkyboxButton("winter", "Backyard", row3);
	216	+ AddSkyboxButton("winter", "Creek", row3);
	217	+ AddSkyboxButton("winter", "FootballField3", row3);
	218	+ AddSkyboxButton("winter", "Forest", row3);
	219	+
	220	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	221	+ AddSkyboxButton("winter", "House", row4);
	222	+ AddSkyboxButton("winter", "IceLake", row4);
	223	+ AddSkyboxButton("winter", "IceRiver", row4);
	224	+
	225	+ AddSkyboxButton("winter", "Park3", row5);
	226	+ AddSkyboxButton("winter", "PondWinter", row5);
	227	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	228	+ AddSkyboxButton("winter", "Vindelalven", row5);
	229	+
	230	+ AddSkyboxButton("daz", "TheRock", row6);
	231	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	232	+ AddSkyboxButton("daz", "Winter", row6);
	233	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	234	+
	235	+ tab0.add(row0);
	236	+ tab0.add(row1);
	237	+ tab0.add(row2);
	238	+ tab0.add(row3);
	239	+ tab0.add(row4);
	240	+ tab0.add(row5);
	241	+ tab0.add(row6);
	242	+
	243	+ for (int i=5; --i>=0;)
	244	+ {
	245	+ //oe.toolboxPanel.Return();
	246	+ //tab0.add(new cGridBag());
	247	+ }
	248	+ }
	249	+
	250	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	251	+ {
	252	+ cGridBag tab0 = new cGridBag().setVertical(true);
	253	+
	254	+ tab0.setName("Others");
	255	+ skyboxpanel.add(tab0);
	256	+
	257	+ cGridBag row0 = new cGridBag();
	258	+ cGridBag row1 = new cGridBag();
	259	+ cGridBag row2 = new cGridBag();
	260	+ cGridBag row3 = new cGridBag();
	261	+ cGridBag row4 = new cGridBag();
	262	+ cGridBag row5 = new cGridBag();
	263	+ cGridBag row6 = new cGridBag();
	264	+
	265	+ AddSkyboxButton("mayhem", "afterrain", row0);
	266	+ AddSkyboxButton("mayhem", "aqua4", row0);
	267	+ AddSkyboxButton("mayhem", "aqua9", row0);
	268	+ AddSkyboxButton("mayhem", "flame", row0);
	269	+
	270	+ AddSkyboxButton("mayhem", "h2s", row1);
	271	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	272	+ AddSkyboxButton("mayhem", "scorched", row1);
	273	+ AddSkyboxButton("penguins", "desertdawn", row1);
	274	+
	275	+ AddSkyboxButton("persson", "Citadella", row2);
	276	+ AddSkyboxButton("persson", "Citadella2", row2);
	277	+ AddSkyboxButton("persson", "clouds1", row2);
	278	+ AddSkyboxButton("penguins", "wrath", row2);
	279	+
	280	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	281	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	282	+ AddSkyboxButton("indoors", "DallasW", row3);
	283	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	284	+
	285	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	286	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	287	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	288	+ AddSkyboxButton("persson", "redeclipse", row4);
	289	+
	290	+ AddSkyboxButton("daz", "Greenlands", row5);
	291	+ AddSkyboxButton("daz", "Oasis", row5);
	292	+ AddSkyboxButton("elyvisions", "arch3", row5);
	293	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	294	+
	295	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	296	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	297	+ AddSkyboxButton("elyvisions", "heaven", row6);
	298	+ AddSkyboxButton("elyvisions", "hot", row6);
	299	+
	300	+ tab0.add(row0);
	301	+ tab0.add(row1);
	302	+ tab0.add(row2);
	303	+ tab0.add(row3);
	304	+ tab0.add(row4);
	305	+ tab0.add(row5);
	306	+ tab0.add(row6);
	307	+
	308	+ for (int i=5; --i>=0;)
	309	+ {
	310	+ //oe.toolboxPanel.Return();
	311	+ //tab0.add(new cGridBag());
	312	+ }
	313	+ }
	314	+
	315	+ public void CallBack(String[] path)
	316	+ {
	317	+ for (int i = 0; i < path.length; i++)
	318	+ {
	319	+ System.out.print(path[i] + "/");
	320	+ }
	321	+
	322	+ System.out.println();
	323	+ }
	324	+
	325	+ public void ChangeSkybox(String skybox)
	326	+ {
	327	+ //cameraView.envyoff = false;
	328	+ group.skyboxname = skybox;
	329	+ group.skyboxext = "jpg";
	330	+ cameraView.repaint();
	331	+
	332	+ Grafreed.ParseResources("textures", this);
	333	+ }
	334	+
26	335	//ObjEditor objEditor;
27	336	public void closeUI2()
28	337	{
..	..	@@ -60,6 +369,12 @@
60	369	this.copy = this.group = group;
61	370	//selectees = this.group.selectees;
62	371
	372	+ if (copy.versionlist == null)
	373	+ {
	374	+ copy.versionlist = new Object3D[100];
	375	+ copy.versionindex = -1;
	376	+ }
	377	+
63	378	if(ui)
64	379	SetupUI(objEditor);
65	380	}
..	..	@@ -74,16 +389,28 @@
74	389	this.copy = this.group = copy;
75	390	//selectees = this.group.selectees;
76	391
77		- SetupMenu2(objEditor);
	392	+ SetupMenu2(this); //objEditor);
78	393	SetupUI2(objEditor);
79	394	objEditor.SetupUI(true);
80	395	SetupViews(objEditor);
81	396
82	397	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	398	+
	399	+ if (copy.versionlist == null)
	400	+ {
	401	+ copy.versionlist = new Object3D[100];
	402	+ copy.versionindex = -1;
	403	+
	404	+ Save(true);
	405	+ }
83	406	}
84	407
85	408	void CloneSelection(boolean supports)
86	409	{
	410	+ if (Globals.REPLACEONMAKE)
	411	+ Save();
	412	+ boolean keep = Globals.REPLACEONMAKE;
	413	+ Globals.REPLACEONMAKE = false;
87	414	// Object3D keep = GrafreeD.clipboard;
88	415	//Object3D obj;
89	416	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +421,19 @@
94	421
95	422	makeSomething(clone, i==group.selection.size()-1);
96	423	}
	424	+ Globals.REPLACEONMAKE = keep;
97	425	}
98	426
99	427	void CloneClipboard(boolean supports)
100	428	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	429	+ assert(Grafreed.clipboard.parent == null);
	430	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	431	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	432	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	433	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	434	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	435	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	436	+ Grafreed.clipboard.get(0).parent = keepparent;
109	437	}
110	438
111	439	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +447,7 @@
119	447	// obj.support = null;
120	448	if (!supports)
121	449	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	450	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	451	obj.parent = parent;
124	452	// obj.support = support;
125	453	// clone.support = support; // aout 2013
..	..	@@ -148,28 +476,21 @@
148	476
149	477	//JTextField nameField;
150	478
151		- void SetupMenu2(ObjEditor oe)
	479	+ void SetupMenu2(GroupEditor oe)
152	480	{
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		-
	481	+ oe.jTree = new cTree();
	482	+
168	483	Menu menu;
169	484	oe.menuBar.add(menu = new Menu("Edit"));
170	485	//editItem = menu.add(new MenuItem("Edit"));
171	486	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	487	+
	488	+// undoItem = menu.add(new MenuItem("Undo"));
	489	+// undoItem.addActionListener(this);
	490	+// redoItem = menu.add(new MenuItem("Redo"));
	491	+// redoItem.addActionListener(this);
	492	+// menu.add("-");
	493	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	494	duplicateItem.addActionListener(this);
174	495	cloneItem = menu.add(new MenuItem("Clone"));
175	496	cloneItem.addActionListener(this);
..	..	@@ -185,7 +506,6 @@
185	506	copyItem.addActionListener(this);
186	507	pasteItem = menu.add(new MenuItem("Paste"));
187	508	pasteItem.addActionListener(this);
188		- menu.add("-");
189	509
190	510	menu.add("-");
191	511	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -197,8 +517,8 @@
197	517	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
198	518	// pasteExpandItem.addActionListener(this);
199	519	menu.add("-");
200		- clearItem = menu.add(new MenuItem("Clear"));
201		- clearItem.addActionListener(this);
	520	+ deleteItem = menu.add(new MenuItem("Delete"));
	521	+ deleteItem.addActionListener(this);
202	522
203	523	if (Globals.ADVANCED)
204	524	{
..	..	@@ -206,14 +526,97 @@
206	526	clearAllItem = menu.add(new MenuItem("Clear All"));
207	527	clearAllItem.addActionListener(this);
208	528	}
	529	+
	530	+ menuBar.add(cameraMenu = new Menu("View"));
	531	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	532	+ //zBufferItem.addActionListener(this);
	533	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	534	+ //normalLensItem.addActionListener(this);
	535	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	536	+ restoreCameraItem.addActionListener(this);
	537	+
	538	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	539	+// toggleFullScreenItem.addItemListener(this);
	540	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	541	+// cameraMenu.add("-");
	542	+//
	543	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	544	+// toggleTextureItem.addItemListener(this);
	545	+// toggleTextureItem.setState(CameraPane.textureon);
	546	+//
	547	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	548	+// toggleSwitchItem.addItemListener(this);
	549	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	550	+
	551	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	552	+ toggleHandleItem.addItemListener(this);
	553	+ toggleHandleItem.setState(CameraPane.HANDLES);
	554	+
	555	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	556	+ togglePaintItem.addItemListener(this);
	557	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	558	+
	559	+ if (Globals.ADVANCED)
	560	+ {
	561	+ cameraMenu.add("-");
	562	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	563	+ toggleLiveItem.addItemListener(this);
	564	+ toggleLiveItem.setState(Globals.isLIVE());
209	565
	566	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	567	+ stepItem.addActionListener(this);
	568	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	569	+ // toggleDLItem.addItemListener(this);
	570	+ // toggleDLItem.setState(false);
	571	+
	572	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	573	+ toggleRenderItem.addItemListener(this);
	574	+ toggleRenderItem.setState(!CameraPane.frozen);
	575	+
	576	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	577	+ toggleDebugItem.addItemListener(this);
	578	+ toggleDebugItem.setState(Globals.DEBUG);
	579	+
	580	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	581	+ toggleFrustumItem.addItemListener(this);
	582	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	583	+
	584	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	585	+ toggleFootContactItem.addItemListener(this);
	586	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	587	+
	588	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	589	+ toggleTimelineItem.addItemListener(this);
	590	+ }
	591	+
	592	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	593	+// toggleRootItem.addItemListener(this);
	594	+// toggleRootItem.setState(false);
	595	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	596	+// animationItem.addItemListener(this);
	597	+// animationItem.setState(CameraPane.ANIMATION);
	598	+ cameraMenu.add("-");
	599	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	600	+ editCameraItem.addActionListener(this);
	601	+
	602	+ if (Globals.ADVANCED)
	603	+ {
	604	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	605	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	606	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	607	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	608	+ oe.cameraMenu.add("-");
	609	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	610	+ openWindowItem.addActionListener(this);
	611	+ editLeafItem.addActionListener(this);
	612	+ lookAtItem.addActionListener(this);
	613	+ //lookFromItem.addActinoListener(this);
	614	+ //switchViewItem.addActionListener(this);
	615	+ }
	616	+
210	617	oe.menuBar.add(menu = new Menu("Setting"));
211	618	if (Globals.ADVANCED)
212	619	{
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	620	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	621	revertMeshItem.addActionListener(this);
219	622	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -253,21 +656,29 @@
253	656	}
254	657
255	658	oe.menuBar.add(menu = new Menu("Group"));
256		- grabItem = menu.add(new MenuItem("Grab"));
257		- grabItem.addActionListener(this);
	659	+// grabItem = menu.add(new MenuItem("Grab"));
	660	+// grabItem.addActionListener(this);
258	661	backItem = menu.add(new MenuItem("Back"));
259	662	backItem.addActionListener(this);
260	663	frontItem = menu.add(new MenuItem("Front"));
261	664	frontItem.addActionListener(this);
262		- compositeItem = menu.add(new MenuItem("Composite"));
263		- compositeItem.addActionListener(this);
	665	+// compositeItem = menu.add(new MenuItem("Composite"));
	666	+// compositeItem.addActionListener(this);
	667	+
	668	+ if (Globals.ADVANCED)
	669	+ {
264	670	hideItem = menu.add(new MenuItem("Hidden Group"));
265	671	hideItem.addActionListener(this);
	672	+ }
266	673	ungroupItem = menu.add(new MenuItem("Ungroup"));
267	674	ungroupItem.addActionListener(this);
268		- menu.add("-");
269		- randomItem = menu.add(new MenuItem("Switch node"));
270		- randomItem.addActionListener(this);
	675	+
	676	+// menu.add("-");
	677	+//
	678	+// switchItem = menu.add(new MenuItem("Switch node"));
	679	+// switchItem.addActionListener(this);
	680	+ if (Globals.ADVANCED)
	681	+ {
271	682	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
272	683	switchGeoItem.addActionListener(this);
273	684	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -275,8 +686,6 @@
275	686	morphItem = menu.add(new MenuItem("Morph Group"));
276	687	morphItem.addActionListener(this);
277	688
278		- if (Globals.ADVANCED)
279		- {
280	689	menu.add("-");
281	690	physicsItem = menu.add(new MenuItem("Physics"));
282	691	physicsItem.addActionListener(this);
..	..	@@ -284,30 +693,29 @@
284	693	frameselectorItem.addActionListener(this);
285	694	scriptNodeItem = menu.add(new MenuItem("Script Node"));
286	695	scriptNodeItem.addActionListener(this);
287		- cameraItem = menu.add(new MenuItem("Camera"));
288		- cameraItem.addActionListener(this);
289	696	}
290	697
291	698	oe.menuBar.add(menu = new Menu("Object"));
292		- textureItem = menu.add(new MenuItem("Texture"));
293		- textureItem.addActionListener(this);
	699	+// textureItem = menu.add(new MenuItem("Texture"));
	700	+// textureItem.addActionListener(this);
294	701	billboardItem = menu.add(new MenuItem("Billboard"));
295	702	billboardItem.addActionListener(this);
296	703	csgItem = menu.add(new MenuItem("CSG"));
297	704	csgItem.addActionListener(this);
298		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	705	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
299	706	shadowXItem.addActionListener(this);
300		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	707	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
301	708	shadowYItem.addActionListener(this);
302		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	709	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303	710	shadowZItem.addActionListener(this);
	711	+ attributeItem = menu.add(new MenuItem("Attribute"));
	712	+ attributeItem.addActionListener(this);
	713	+
304	714	if (Globals.ADVANCED)
305	715	{
306	716	menu.add("-");
307	717	linkerItem = menu.add(new MenuItem("Linker"));
308	718	linkerItem.addActionListener(this);
309		- attributeItem = menu.add(new MenuItem("Attribute"));
310		- attributeItem.addActionListener(this);
311	719	templateItem = menu.add(new MenuItem("Template"));
312	720	templateItem.addActionListener(this);
313	721	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -318,8 +726,12 @@
318	726	resetTransformItem.addActionListener(this);
319	727	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	728	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- transformgeometryItem.addActionListener(this);
	729	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	730	+ resetCentroidXZItem.addActionListener(this);
	731	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	732	+ transformGeometryItem.addActionListener(this);
	733	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	734	+ transformChildrenItem.addActionListener(this);
323	735
324	736	oe.menuBar.add(menu = new Menu("Geometry"));
325	737	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -332,7 +744,7 @@
332	744	genNormalsMESHItem.addActionListener(this);
333	745	if (Globals.ADVANCED)
334	746	{
335		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	747	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336	748	genNormalsMINEItem.addActionListener(this);
337	749	}
338	750	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -368,6 +780,10 @@
368	780	oe.menuBar.add(menu = new Menu("Attributes"));
369	781	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	782	clearMaterialsItem.addActionListener(this);
	783	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	784	+ resetAllItem.addActionListener(this);
	785	+ stepAllItem = menu.add(new MenuItem("Step All"));
	786	+ stepAllItem.addActionListener(this);
371	787	menu.add("-");
372	788	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	789	liveleavesItem.addActionListener(this);
..	..	@@ -388,6 +804,14 @@
388	804	markleavesItem.addActionListener(this);
389	805	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
390	806	unmarkleavesItem.addActionListener(this);
	807	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	808	+ rewindleavesItem.addActionListener(this);
	809	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	810	+ unrewindleavesItem.addActionListener(this);
	811	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	812	+ randomleavesItem.addActionListener(this);
	813	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	814	+ unrandomleavesItem.addActionListener(this);
391	815	menu.add("-");
392	816	flipVItem = menu.add(new MenuItem("Flip V"));
393	817	flipVItem.addActionListener(this);
..	..	@@ -413,47 +837,56 @@
413	837	attachBumpItem.addActionListener(this);
414	838	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
415	839	pigmentBumpItem.addActionListener(this);
	840	+ //embedTexturesItem
416	841	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
417	842	detachPigmentItem.addActionListener(this);
418	843	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
419	844	detachBumpItem.addActionListener(this);
	845	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	846	+ embedTexturesItem.addActionListener(this);
	847	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	848	+ deEmbedTexturesItem.addActionListener(this);
420	849	menu.add("-");
421	850	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
422	851	sortbysizeItem.addActionListener(this);
423	852	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	853	sortbynameItem.addActionListener(this);
	854	+ menu.add("-");
	855	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	856	+ shareGeometriesItem.addActionListener(this);
	857	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	858	+ mergeGeometriesItem.addActionListener(this);
425	859	if (Globals.ADVANCED)
426	860	{
427		- menu.add("-");
	861	+ // Pretty much the same as duplicate and clone.
428	862	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	863	extractGeometriesItem.addActionListener(this);
430	864	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	865	cloneGeometriesItem.addActionListener(this);
432		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
433		- shareGeometriesItem.addActionListener(this);
434		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
435		- mergeGeometriesItem.addActionListener(this);
436	866	}
437	867
438	868	oe.menuBar.add(menu = new Menu("Insert"));
439	869	buildCreateMenu(menu);
440	870
441		- oe.menuBar.add(menu = new Menu("Include"));
442		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
443		- importGFDItem.addActionListener(this);
444		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
445		- importVRMLX3DItem.addActionListener(this);
446		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
447		- importOBJItem.addActionListener(this);
448		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
449		- import3DSItem.addActionListener(this);
450		-
451	871	oe.menuBar.add(menu = new Menu("Tools"));
452	872	buildToolsMenu(menu);
453	873	}
454	874
	875	+
455	876	void SetupUI2(ObjEditor oe)
456	877	{
	878	+ // June 2019
	879	+ if (oe == null)
	880	+ {
	881	+ //super.SetupUI2(this);
	882	+ //return;
	883	+ }
	884	+
	885	+ if (copy != group)
	886	+ {
	887	+ //super.SetupUI2(this);
	888	+ }
	889	+
457	890	//new Exception().printStackTrace();
458	891
459	892	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -482,97 +915,242 @@
482	915	oe.radioPanel.add(dummyButton);
483	916	oe.buttonGroup.add(dummyButton);
484	917	*/
	918	+ cGridBag copyOptionsPanel = new cGridBag();
	919	+
	920	+ copyOptionsPanel.preferredHeight = 2;
	921	+
485	922	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
486	923
487		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
488		- liveCB.setToolTipText("Enabled animation");
	924	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	925	+ //minButton.setToolTipText("Minimize window");
	926	+ //minButton.addActionListener(this);
	927	+
	928	+ if (Globals.ADVANCED)
	929	+ {
	930	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ maxButton.setToolTipText("Maximize window");
	932	+ maxButton.addActionListener(this);
	933	+ }
	934	+
	935	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	936	+ fullButton.setToolTipText("Full-screen window");
	937	+ fullButton.addActionListener(this);
	938	+
	939	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	940	+ screenfitButton.setToolTipText("Screen fit");
	941	+ screenfitButton.addActionListener(this);
	942	+
	943	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	944	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	945	+ restoreCameraButton.addActionListener(this);
	946	+
	947	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	948	+ saveVersionButton.setToolTipText("Duplicate current version");
	949	+ saveVersionButton.addActionListener(this);
	950	+
	951	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	952	+ deleteVersionButton.setToolTipText("Delete current version");
	953	+ deleteVersionButton.addActionListener(this);
	954	+
	955	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	956	+ previousVersionButton.setToolTipText("Previous version");
	957	+ previousVersionButton.addActionListener(this);
	958	+ previousVersionButton.setEnabled(false);
	959	+
	960	+ cGridBag updown = new cGridBag().setVertical(true);
	961	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	962	+ restoreButton.setToolTipText("Undo (restore current version)");
	963	+ restoreButton.addActionListener(this);
	964	+ //restoreButton.setEnabled(false);
	965	+
	966	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	967	+ replaceButton.setToolTipText("Save (replace current version)");
	968	+ replaceButton.addActionListener(this);
	969	+ //replaceButton.setEnabled(false);
	970	+
	971	+ copyOptionsPanel.add(updown);
	972	+
	973	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	974	+ nextVersionButton.setToolTipText("Next version");
	975	+ nextVersionButton.addActionListener(this);
	976	+ nextVersionButton.setEnabled(false);
	977	+
	978	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	979	+ liveCB.setToolTipText("Enable animation");
489	980	liveCB.addItemListener(this);
490	981
491		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	982	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	983	oneStepButton.setToolTipText("Animate one step forward");
493	984	oneStepButton.addActionListener(this);
494	985
495		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	986	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
496	987	fastCB.setToolTipText("Fast mode");
497	988	fastCB.addItemListener(this);
498	989
499		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
500		- trackCB.setToolTipText("Enable tracking");
501		- trackCB.addItemListener(this);
502		-
503		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504		- screenfitButton.setToolTipText("Screen fit");
505		- screenfitButton.addActionListener(this);
	990	+ //oe.toolboxPanel.Return();
	991	+
	992	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	993	+// trackCB.setToolTipText("Enable tracking");
	994	+// trackCB.addItemListener(this);
506	995
507	996	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
508	997	// screenfitpointButton.addActionListener(this);
509	998
510	999	if (Globals.ADVANCED)
511	1000	{
512		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1001	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
513	1002	snapobjectButton.addActionListener(this);
514	1003	snapobjectButton.setToolTipText("Snap Object");
	1004	+
	1005	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1006	+ fourButton.addActionListener(this);
	1007	+ fourButton.setToolTipText("Show control panel only");
515	1008	}
516	1009
517		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
518		- flashSelectionButton.setToolTipText("Show selection");
519		- flashSelectionButton.addActionListener(this);
	1010	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
520	1011
521		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
522		-
523		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
524		- twoButton.setToolTipText("Show center view only");
	1012	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1013	+ twoButton.setToolTipText("Show 3D view only");
525	1014	twoButton.addActionListener(this);
526		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
527		- fourButton.addActionListener(this);
528		- fourButton.setToolTipText("Show left panel only");
529		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
530		- sixButton.setToolTipText("2-column layout left");
531		- sixButton.addActionListener(this);
532		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
533		- threeButton.setToolTipText("2-column layout right");
	1015	+ this.fullscreenLayout = twoButton;
	1016	+
	1017	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1018	+ threeButton.setToolTipText("Show controls and 3D view");
534	1019	threeButton.addActionListener(this);
535		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
536		- sevenButton.setToolTipText("3-column layout");
537		- sevenButton.addActionListener(this);
	1020	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1021	+ sixButton.setToolTipText("Show 3D view and controls");
	1022	+ sixButton.addActionListener(this);
	1023	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1024	+// sevenButton.setToolTipText("3-column layout");
	1025	+// sevenButton.addActionListener(this);
538	1026	//
539	1027
540		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
541		- rootButton.setToolTipText("Edit selection in new tab");
	1028	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1029	+ rootButton.setToolTipText("Open selection in new tab");
542	1030	rootButton.addActionListener(this);
543	1031
544		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1032	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
545	1033	closeButton.setToolTipText("Close tab");
546	1034	closeButton.addActionListener(this);
547	1035	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
548	1036	//clearButton.addActionListener(this);
549		-
550		- cGridBag commandsPanel = new cGridBag();
	1037	+
	1038	+ cGridBag row1 = new cGridBag();
551	1039
552		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
553		- editButton.setToolTipText("Edit selection");
	1040	+ // INSERT
	1041	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+ gridButton.setToolTipText("Create grid");
	1043	+ gridButton.addActionListener(this);
	1044	+
	1045	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1046	+ boxButton.setToolTipText("Create box");
	1047	+ boxButton.addActionListener(this);
	1048	+
	1049	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ sphereButton.setToolTipText("Create sphere");
	1051	+ sphereButton.addActionListener(this);
	1052	+
	1053	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+ coneButton.setToolTipText("Create cone");
	1055	+ coneButton.addActionListener(this);
	1056	+
	1057	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ torusButton.setToolTipText("Create torus");
	1059	+ torusButton.addActionListener(this);
	1060	+
	1061	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1062	+ superButton.setToolTipText("Create superellipsoid");
	1063	+ superButton.addActionListener(this);
	1064	+
	1065	+ if (Globals.ADVANCED)
	1066	+ {
	1067	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ kleinButton.setToolTipText("Create Klein bottle");
	1069	+ kleinButton.addActionListener(this);
	1070	+ }
	1071	+
	1072	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ particlesButton.setToolTipText("Create particle system");
	1074	+ particlesButton.addActionListener(this);
	1075	+
	1076	+ oe.toolboxPanel.add(row1);
	1077	+
	1078	+ cGridBag row2 = new cGridBag();
	1079	+
	1080	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+ groupButton.setToolTipText("Create group");
	1082	+ groupButton.addActionListener(this);
	1083	+
	1084	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ compositeButton.setToolTipText("Create composite");
	1086	+ compositeButton.addActionListener(this);
	1087	+
	1088	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ switchButton.setToolTipText("Create item switcher");
	1090	+ switchButton.addActionListener(this);
	1091	+
	1092	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ loopButton.setToolTipText("Create loop");
	1094	+ loopButton.addActionListener(this);
	1095	+
	1096	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ textureButton.setToolTipText("Create texture");
	1098	+ textureButton.addActionListener(this);
	1099	+
	1100	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1101	+ overlayButton.setToolTipText("Create overlay");
	1102	+ overlayButton.addActionListener(this);
	1103	+
	1104	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1105	+ lightButton.setToolTipText("Create light");
	1106	+ lightButton.addActionListener(this);
	1107	+
	1108	+ oe.toolboxPanel.add(row2);
	1109	+
	1110	+ // ENVYMAPS
	1111	+ cGridBag skyboxpane = new cGridBag();
	1112	+ skyboxpane.preferredHeight = 100;
	1113	+
	1114	+ oe.skyboxPanel.add(skyboxpane);
	1115	+
	1116	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1117	+ skyboxpane.add(skyboxpanel);
	1118	+
	1119	+ AddSkyboxTab0(skyboxpanel);
	1120	+ AddSkyboxTab1(skyboxpanel);
	1121	+ AddSkyboxTab2(skyboxpanel);
	1122	+ AddSkyboxTab3(skyboxpanel);
	1123	+
	1124	+ // EDIT panel
	1125	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ editButton.setToolTipText("Pin selection controls");
554	1127	editButton.addActionListener(this);
555	1128
556		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
557		- uneditButton.setToolTipText("Unedit selection");
	1129	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ uneditButton.setToolTipText("Unpin and remove selection controls");
558	1131	uneditButton.addActionListener(this);
559	1132
560		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
561		- allParamsButton.setToolTipText("Edit all params");
	1133	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1134	+ allParamsButton.setToolTipText("Show all controle");
562	1135	allParamsButton.addActionListener(this);
563	1136
564		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565	1138	clearPanelButton.setToolTipText("Clear edit panel");
566	1139	clearPanelButton.addActionListener(this);
567	1140
568		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
569		- unselectButton.setToolTipText("Unselect");
570		- unselectButton.addActionListener(this);
	1141	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1142	+ //unselectButton.setToolTipText("Unselect");
	1143	+ //unselectButton.addActionListener(this);
571	1144
572		- commandsPanel.preferredHeight = 1;
	1145	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1146	+ flashSelectionButton.setToolTipText("Highlight selection");
	1147	+ flashSelectionButton.addActionListener(this);
573	1148
574		- oe.treePanel.add(commandsPanel);
575		- oe.treePanel.Return();
	1149	+ editCommandsPanel.preferredHeight = 1;
	1150	+
	1151	+ SetPinStates(false);
	1152	+// oe.treePanel.add(commandsPanel);
	1153	+// oe.treePanel.Return();
576	1154
577	1155	// oe.aConstraints.gridx += 1;
578	1156	// oe.aConstraints.weighty = 0;
..	..	@@ -589,32 +1167,20 @@
589	1167
590	1168	JScrollPane jSP;
591	1169	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
592		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1170	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
593	1171	ResetModel();
594	1172
595	1173	oe.treePanel.add(jSPPanel);
596	1174	oe.treePanel.Return();
597	1175
598		- cGridBag copyOptionsPanel = new cGridBag();
599		-
600		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
601		- colorCB.setToolTipText("Copy color when dropped");
602		- colorCB.addItemListener(this);
603		-
604		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
605		- materialCB.setToolTipText("Copy material when dropped");
606		- materialCB.addItemListener(this);
607		-
608		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
609		- textureCB.setToolTipText("Copy texture when dropped");
610		- textureCB.addItemListener(this);
611		-
612		- copyOptionsPanel.preferredHeight = 1;
613	1176	oe.treePanel.add(copyOptionsPanel);
614	1177	oe.treePanel.Return();
	1178	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1179	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1180	+ sliderPane.preferredHeight = 1;
615	1181
616		-// mainPanel.setDividerLocation(0.5); //1.0);
617		-// mainPanel.setResizeWeight(0.5);
	1182	+// mainPanel.setDividerLocation(0.1); //1.0);
	1183	+ mainPanel.setResizeWeight(0.4);
618	1184
619	1185	//jList.addListSelectionListener(this);
620	1186	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -622,7 +1188,7 @@
622	1188	//jTree.setEditable(true);
623	1189	oe.jTree.setDragEnabled(true);
624	1190	//jTree.setPreferredSize(new Dimension(10,10));
625		- jSP.setPreferredSize(new Dimension(100,200));
	1191	+ //jSP.setPreferredSize(new Dimension(100,200));
626	1192
627	1193	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
628	1194
..	..	@@ -634,29 +1200,49 @@
634	1200	dgr.addDragGestureListener(this);
635	1201	}catch(Exception e) {}
636	1202	*/
637		- radio.layout = sevenButton;
	1203	+ radio.layout = threeButton; // sixButton;
638	1204	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
639	1205	}
640	1206
641	1207	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
642	1208	{
	1209	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1210	+ colorCB.setToolTipText("Copy color when dropped");
	1211	+ colorCB.addItemListener(this);
	1212	+
	1213	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1214	+ materialCB.setToolTipText("Copy material when dropped");
	1215	+ materialCB.addItemListener(this);
	1216	+
	1217	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1218	+ textureCB.setToolTipText("Copy texture when dropped");
	1219	+ textureCB.addItemListener(this);
	1220	+
	1221	+ panel.Return();
	1222	+
643	1223	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
644	1224	boxCB.setToolTipText("Display bounding boxes");
645	1225	boxCB.addItemListener(this);
646	1226
647	1227	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
648		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1228	+ zoomBoxCB.setToolTipText("Display only for wheel");
649	1229	zoomBoxCB.addItemListener(this);
650	1230
651		- if (Globals.ADVANCED)
	1231	+ if (true) // Globals.ADVANCED)
652	1232	{
653		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
654		- supportCB.setToolTipText("Enable rigging");
655		- supportCB.addItemListener(this);
	1233	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1234	+// supportCB.setToolTipText("Enable rigging");
	1235	+// supportCB.addItemListener(this);
	1236	+
	1237	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1238	+ freezeCB.setToolTipText("Fast moving camera");
	1239	+ freezeCB.addItemListener(this);
656	1240
657	1241	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
658	1242	// localCB.addItemListener(this);
659	1243
	1244	+ panel.Return();
	1245	+
660	1246	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
661	1247	crowdCB.setToolTipText("Used for crowds");
662	1248	crowdCB.addItemListener(this);
..	..	@@ -665,14 +1251,19 @@
665	1251	smoothCB.setToolTipText("Snapping delay");
666	1252	smoothCB.addItemListener(this);
667	1253
668		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
669		- slowCB.setToolTipText("Smooth interpolation");
670		- slowCB.addItemListener(this);
	1254	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1255	+// slowCB.setToolTipText("Smooth interpolation");
	1256	+// slowCB.addItemListener(this);
	1257	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1258	+ minshaderCB.setToolTipText("Minimal fast shader");
	1259	+ minshaderCB.addItemListener(this);
671	1260
672	1261	// constraints.gridy += 1;
673	1262	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
674	1263	// speakerMocapCB.addItemListener(this);
675	1264
	1265	+ panel.Return();
	1266	+
676	1267	if (false)
677	1268	{
678	1269	// handled in scripts
..	..	@@ -687,42 +1278,85 @@
687	1278	//constraints.gridy += 1;
688	1279	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
689	1280	smoothfocusCB.addItemListener(this);
	1281	+ panel.Return();
690	1282	}
691	1283
692	1284	//constraints.gridx += 1;
693	1285	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
694	1286	// debugCB.addItemListener(this);
695	1287
	1288	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1289	+ trackCB.setToolTipText("Enable tracking target");
	1290	+ trackCB.addItemListener(this);
	1291	+
696	1292	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1293	+ oeilCB.setToolTipText("Move camera when tracking");
697	1294	oeilCB.addItemListener(this);
698	1295
	1296	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1297	+ shadowCB.setToolTipText("When live compute shadows");
	1298	+ shadowCB.addItemListener(this);
	1299	+
	1300	+ panel.Return();
	1301	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1302	+ toggleTextureCB.setToolTipText("Load textures");
	1303	+ toggleTextureCB.addItemListener(this);
	1304	+
	1305	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1306	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1307	+ toggleSwitchCB.addItemListener(this);
	1308	+
	1309	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1310	+ autokeepCB.setToolTipText("On structure change");
	1311	+ autokeepCB.addItemListener(this);
	1312	+
	1313	+ panel.Return();
	1314	+ if (Globals.ADVANCED)
	1315	+ {
699	1316	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
700	1317	lookAtCB.setToolTipText("Look-at target");
701	1318	lookAtCB.addItemListener(this);
	1319	+ }
702	1320
703	1321	}
704	1322
705	1323	cGridBag fill = new cGridBag();
706		-
707	1324	fill.preferredHeight = 200;
	1325	+ cGridBag fill2 = new cGridBag();
	1326	+ fill2.preferredHeight = 200;
	1327	+ cGridBag fill3 = new cGridBag();
	1328	+ fill3.preferredHeight = 200;
708	1329
709	1330	panel.add(fill);
	1331	+ panel.add(fill2);
	1332	+ panel.add(fill3);
710	1333
711	1334	}
712	1335
713	1336	void EditObject(Object3D obj)
714	1337	{
715	1338	cRadio radioButton = new cRadio(obj.name);
	1339	+
	1340	+ // June 2019. Patch to avoid bug with transparency.
	1341	+ radioButton.hadMaterial = obj.material != null;
	1342	+ if (!radioButton.hadMaterial)
	1343	+ {
	1344	+ obj.material = new cMaterial();
	1345	+ }
	1346	+
716	1347	radioButton.SetObject(obj);
717		- radioButton.layout = sevenButton;
	1348	+ radioButton.layout = threeButton; // sixButton;
718	1349	radioButton.SetCamera(cameraView.renderCamera, false);
719	1350	radioButton.addActionListener(this);
720	1351	radioPanel.add(radioButton);
721	1352	buttonGroup.add(radioButton);
722	1353	radioButton.doClick();
723	1354	}
	1355	+
724	1356	void SetupViews(ObjEditor oe)
725	1357	{
	1358	+ theFrame = this;
	1359	+
726	1360	oe.SetupViews();
727	1361
728	1362	System.out.println("SetupViews");
..	..	@@ -731,23 +1365,30 @@
731	1365	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
732	1366	}
733	1367
734		- JCheckBox liveCB;
735		- JCheckBox supportCB;
736		- JCheckBox localCB;
737		- JCheckBox crowdCB;
738		- JCheckBox smoothCB;
739		- JCheckBox fastCB;
740		- JCheckBox slowCB;
741		- JCheckBox boxCB;
742		- JCheckBox zoomBoxCB;
743		- JCheckBox trackCB;
744		- JCheckBox smoothfocusCB;
	1368	+ cToggleButton liveCB;
	1369	+ cCheckBox supportCB;
	1370	+ cCheckBox localCB;
	1371	+ cCheckBox crowdCB;
	1372	+ cCheckBox smoothCB;
	1373	+ cCheckBox minshaderCB;
	1374	+
	1375	+ cToggleButton fastCB;
	1376	+ cCheckBox slowCB;
	1377	+ cCheckBox boxCB;
	1378	+ cCheckBox zoomBoxCB;
	1379	+ cCheckBox freezeCB;
	1380	+ //cToggleButton trackCB;
	1381	+ cCheckBox trackCB;
	1382	+ cCheckBox smoothfocusCB;
745	1383	// JCheckBox speakerMocapCB;
746		- JCheckBox speakerCameraCB;
747		- JCheckBox speakerFocusCB;
748		- JCheckBox debugCB;
749		- JCheckBox oeilCB;
750		- JCheckBox lookAtCB;
	1384	+ cCheckBox speakerCameraCB;
	1385	+ cCheckBox speakerFocusCB;
	1386	+ cCheckBox debugCB;
	1387	+
	1388	+ cCheckBox oeilCB;
	1389	+ cCheckBox shadowCB;
	1390	+ cCheckBox autokeepCB;
	1391	+ cCheckBox lookAtCB;
751	1392
752	1393	// static int COLOR = 1;
753	1394	// static int MATERIAL = 2;
..	..	@@ -755,9 +1396,9 @@
755	1396
756	1397	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
757	1398
758		- JCheckBox colorCB;
759		- JCheckBox materialCB;
760		- JCheckBox textureCB;
	1399	+ cCheckBox colorCB;
	1400	+ cCheckBox materialCB;
	1401	+ cCheckBox textureCB;
761	1402
762	1403	public void itemStateChanged(ItemEvent e)
763	1404	{
..	..	@@ -785,6 +1426,7 @@
785	1426	} else if(e.getSource() == liveCB)
786	1427	{
787	1428	cameraView.ToggleLive();
	1429	+ refreshContents(false);
788	1430	}
789	1431	else if(e.getSource() == supportCB)
790	1432	{
..	..	@@ -800,6 +1442,12 @@
800	1442	{
801	1443	cameraView.ToggleInertia();
802	1444	cameraView.repaint();
	1445	+ }
	1446	+ else if(e.getSource() == minshaderCB)
	1447	+ {
	1448	+ Globals.MINSHADER ^= true;
	1449	+ cameraView.programInitialized = false;
	1450	+ cameraView.repaint();
803	1451	}
804	1452	else if(e.getSource() == localCB)
805	1453	{
..	..	@@ -849,6 +1497,18 @@
849	1497	{
850	1498	cameraView.ToggleOeil();
851	1499	}
	1500	+ else if(e.getSource() == shadowCB)
	1501	+ {
	1502	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1503	+ }
	1504	+ else if(e.getSource() == freezeCB)
	1505	+ {
	1506	+ Globals.FREEZEONMOVE ^= true;
	1507	+ }
	1508	+ else if(e.getSource() == autokeepCB)
	1509	+ {
	1510	+ Globals.REPLACEONMAKE ^= true;
	1511	+ }
852	1512	else if(e.getSource() == lookAtCB)
853	1513	{
854	1514	cameraView.ToggleLookAt();
..	..	@@ -865,7 +1525,8 @@
865	1525
866	1526	/**/
867	1527	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
868		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1528	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1529	+ TreePath path = objEditor.jTree.getSelectionPath();
869	1530	if ((path == null) \|\| (path.getPathCount() <= 1)) {
870	1531	// We can't move the root node or an empty selection
871	1532	return;
..	..	@@ -928,8 +1589,6 @@
928	1589	}
929	1590	}
930	1591
931		- String string = (String) object;
932		-
933	1592	System.out.println("Transfer = " + object + "; drop : " + target);
934	1593	// if( object instanceof java.io.File[])
935	1594	// {
..	..	@@ -937,7 +1596,11 @@
937	1596	// objEditor.DropFile((java.io.File[]) object, true);
938	1597	// return;
939	1598	// }
940		- if (string.charAt(0) == '/')
	1599	+
	1600	+ String string = object.toString();
	1601	+
	1602	+ // File path for Mac and Windows
	1603	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
941	1604	{
942	1605	// file(s)
943	1606	String[] names = string.split("\n");
..	..	@@ -964,7 +1627,7 @@
964	1627
965	1628	flashIt = false;
966	1629	CameraPane pane = (CameraPane) target;
967		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1630	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
968	1631	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
969	1632
970	1633	if (group.selection.size() == 1)
..	..	@@ -980,23 +1643,33 @@
980	1643
981	1644	assert target == objEditor.jTree;
982	1645	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1646	+ Object3D destinationLeaf;
983	1647	try {
984		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1648	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
985	1649	} catch (Exception e) {
986	1650	System.out.println("destinationPath : " + destinationPath);
987	1651	return;
988	1652	}
989	1653
990		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1654	+ for (int i=group.selection.size(); --i>=0;)
991	1655	{
	1656	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1657	+
	1658	+ // Cannot move into itself
	1659	+ if (child == destinationLeaf)
	1660	+ return;
	1661	+ }
	1662	+
	1663	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1664	+// {
992	1665	loadClipboard(true);
993	1666	objEditor.jTree.setSelectionPath(destinationPath);
994	1667	pasteInto(false, false);
995		- } else {
996		- loadClipboard(false);
997		- objEditor.jTree.setSelectionPath(destinationPath);
998		- pasteInto(false, false); // true); // ???
999		- }
	1668	+// } else {
	1669	+// loadClipboard(false);
	1670	+// objEditor.jTree.setSelectionPath(destinationPath);
	1671	+// pasteInto(false, false); // true); // ???
	1672	+// }
1000	1673	}
1001	1674	public void dropActionChanged(DropTargetDragEvent dtde)
1002	1675	// Called if the user has modified the current drop gesture
..	..	@@ -1101,22 +1774,30 @@
1101	1774	{
1102	1775	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1103	1776	//heightFieldItem.addActionListener(this);
1104		- gridItem = menu.add(new MenuItem("Grid"));
1105		- gridItem.addActionListener(this);
1106		- rectoidItem = menu.add(new MenuItem("Box"));
1107		- rectoidItem.addActionListener(this);
1108		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1109		- ellipsoidItem.addActionListener(this);
1110		- coneItem = menu.add(new MenuItem("Cone"));
1111		- coneItem.addActionListener(this);
1112		- torusItem = menu.add(new MenuItem("Torus"));
1113		- torusItem.addActionListener(this);
1114		- superItem = menu.add(new MenuItem("Superellipsoid"));
1115		- superItem.addActionListener(this);
	1777	+// gridItem = menu.add(new MenuItem("Grid"));
	1778	+// gridItem.addActionListener(this);
	1779	+// rectoidItem = menu.add(new MenuItem("Box"));
	1780	+// rectoidItem.addActionListener(this);
	1781	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1782	+// ellipsoidItem.addActionListener(this);
	1783	+// coneItem = menu.add(new MenuItem("Cone"));
	1784	+// coneItem.addActionListener(this);
	1785	+// torusItem = menu.add(new MenuItem("Torus"));
	1786	+// torusItem.addActionListener(this);
	1787	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1788	+// superItem.addActionListener(this);
	1789	+
	1790	+ cameraItem = menu.add(new MenuItem("Camera"));
	1791	+ cameraItem.addActionListener(this);
	1792	+
	1793	+ if (!Globals.ADVANCED)
	1794	+ {
1116	1795	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1117	1796	kleinItem.addActionListener(this);
1118		- particleItem = menu.add(new MenuItem("Particle system"));
1119		- particleItem.addActionListener(this);
	1797	+ }
	1798	+
	1799	+// particleItem = menu.add(new MenuItem("Particle system"));
	1800	+// particleItem.addActionListener(this);
1120	1801	if (Globals.ADVANCED)
1121	1802	{
1122	1803	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1142,15 +1823,15 @@
1142	1823	}
1143	1824	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1144	1825	bezierItem.addActionListener(this);
1145		- overlayItem = menu.add(new MenuItem("Overlay"));
1146		- overlayItem.addActionListener(this);
1147		- lightItem = menu.add(new MenuItem("Light"));
1148		- lightItem.addActionListener(this);
	1826	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1827	+// overlayItem.addActionListener(this);
	1828	+// lightItem = menu.add(new MenuItem("Light"));
	1829	+// lightItem.addActionListener(this);
1149	1830	menu.add("-");
1150	1831	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1151	1832	//superLoopItem.addActionListener(this);
1152		- loopItem = menu.add(new MenuItem("Loop"));
1153		- loopItem.addActionListener(this);
	1833	+// loopItem = menu.add(new MenuItem("Loop"));
	1834	+// loopItem.addActionListener(this);
1154	1835	doubleItem = menu.add(new MenuItem("Fork"));
1155	1836	doubleItem.addActionListener(this);
1156	1837	if (Globals.ADVANCED)
..	..	@@ -1166,6 +1847,9 @@
1166	1847	animationItem.addItemListener(this);
1167	1848	animationItem.setState(Globals.ANIMATION);
1168	1849
	1850	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1851	+ archiveItem.addActionListener(this);
	1852	+
1169	1853	menu.add("-");
1170	1854	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1171	1855	parseverticesItem.addActionListener(this);
..	..	@@ -1178,6 +1862,8 @@
1178	1862	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1179	1863	reduce34MorphItem.addActionListener(this);
1180	1864	menu.add("-");
	1865	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1866	+ memoryItem.addActionListener(this);
1181	1867	menu.add(computeAOItem = new MenuItem("Compute AO"));
1182	1868	computeAOItem.addActionListener(this);
1183	1869
..	..	@@ -1186,11 +1872,9 @@
1186	1872	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1187	1873	mirrorItem.addActionListener(this);
1188	1874	menu.add("-");
1189		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1190		- memoryItem.addActionListener(this);
1191	1875	menu.add(analyzeItem = new MenuItem("Analyze"));
1192	1876	analyzeItem.addActionListener(this);
1193		- menu.add(dumpItem = new MenuItem("Dump"));
	1877	+ menu.add(dumpItem = new MenuItem("Print"));
1194	1878	dumpItem.addActionListener(this);
1195	1879	// menu.add(pathItem = new MenuItem("From-to path"));
1196	1880	// pathItem.addActionListener(this);
..	..	@@ -1331,9 +2015,34 @@
1331	2015	shadow.material = new cMaterial(obj.material);
1332	2016	shadow.material.diffuse = 0.0001f;
1333	2017	shadow.material.specular = 0.0001f;
	2018	+ //shadow.projectedVertices[1].x = 300;
1334	2019
1335	2020	makeSomething(shadow);
1336	2021	}
	2022	+
	2023	+ private void ClearUnpinned()
	2024	+ {
	2025	+ //for (Object3D obj : listUI)
	2026	+ for (int i=listUI.size(); --i>=0;)
	2027	+ {
	2028	+ Object3D obj = listUI.elementAt(i);
	2029	+ if (!obj.pinned)
	2030	+ {
	2031	+ obj.CloseUI();
	2032	+ listUI.remove(i);
	2033	+ }
	2034	+ }
	2035	+ }
	2036	+
	2037	+ private void EditElement(Object3D elem, boolean newWindow)
	2038	+ {
	2039	+ // if (!(elem instanceof Composite))
	2040	+ // newWindow = false;
	2041	+ listUI.add(elem);
	2042	+ elem.openEditWindow(this, newWindow); //, false);
	2043	+ System.out.println("edit : " + elem);
	2044	+ elem.editWindow.refreshContents(true); // ? new
	2045	+ }
1337	2046
1338	2047	/**
1339	2048	* applyExample
..	..	@@ -1537,9 +2246,9 @@
1537	2246
1538	2247	void Overwrite(int mask)
1539	2248	{
1540		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2249	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1541	2250	{
1542		- Object3D content = GrafreeD.clipboard.get(0);
	2251	+ Object3D content = Grafreed.clipboard.get(0);
1543	2252
1544	2253	if (content instanceof cGroup && ((cGroup)content).transientlink )
1545	2254	content = ((cGroup)content).get(0);
..	..	@@ -1578,7 +2287,7 @@
1578	2287	{
1579	2288	ScreenFit();
1580	2289	} else
1581		- if (source == switchItem)
	2290	+ if (source == switchViewItem)
1582	2291	{
1583	2292	cVector v1 = new cVector();
1584	2293	cVector v2 = new cVector();
..	..	@@ -1587,11 +2296,11 @@
1587	2296	objEditor.cameraView.renderCamera.setAim(v2, v1);
1588	2297	objEditor.cameraView.repaint();
1589	2298	} else
1590		- if (source == rectoidItem)
	2299	+ if (source == rectoidItem \|\| source == boxButton)
1591	2300	{
1592	2301	makeSomething(new Box());
1593	2302	} else
1594		- if (source == particleItem)
	2303	+ if (source == particleItem \|\| source == particlesButton)
1595	2304	{
1596	2305	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1597	2306	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1670,27 +2379,27 @@
1670	2379
1671	2380	makeSomething(obj);
1672	2381	} else
1673		- if (source == gridItem)
	2382	+ if (source == gridItem \|\| source == gridButton)
1674	2383	{
1675	2384	makeSomething(new Grid());
1676	2385	} else
1677		- if (source == ellipsoidItem)
	2386	+ if (source == ellipsoidItem \|\| source == sphereButton)
1678	2387	{
1679	2388	makeSomething(new Sphere());
1680	2389	} else
1681		- if (source == coneItem)
	2390	+ if (source == coneItem \|\| source == coneButton)
1682	2391	{
1683	2392	makeSomething(new Cone());
1684	2393	} else
1685		- if (source == torusItem)
	2394	+ if (source == torusItem \|\| source == torusButton)
1686	2395	{
1687	2396	makeSomething(new Torus());
1688	2397	} else
1689		- if (source == superItem)
	2398	+ if (source == superItem \|\| source == superButton)
1690	2399	{
1691	2400	makeSomething(new Superellipsoid());
1692	2401	} else
1693		- if (source == kleinItem)
	2402	+ if (source == kleinItem \|\| source == kleinButton)
1694	2403	{
1695	2404	makeSomething(new Klein());
1696	2405	} else
..	..	@@ -1710,7 +2419,7 @@
1710	2419	{
1711	2420	makeSomething(new BezierSurface());
1712	2421	} else
1713		- if (source == overlayItem)
	2422	+ if (source == overlayItem \|\| source == overlayButton)
1714	2423	{
1715	2424	/*
1716	2425	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1758,10 +2467,27 @@
1758	2467	s.setup();
1759	2468	makeSomething(s);
1760	2469	} else
1761		- if (source == lightItem)
	2470	+ if (source == lightItem \|\| source == lightButton)
1762	2471	{
1763	2472	makeSomething(new Light());
1764	2473	} else
	2474	+// if (source == skybox1Button \|\|
	2475	+// source == skybox2Button \|\|
	2476	+// source == skybox3Button \|\|
	2477	+// source == skybox4Button \|\|
	2478	+// source == skybox5Button \|\|
	2479	+// source == skybox6Button \|\|
	2480	+// source == skybox7Button \|\|
	2481	+// source == skybox11Button \|\|
	2482	+// source == skybox12Button \|\|
	2483	+// source == skybox13Button \|\|
	2484	+// source == skybox14Button \|\|
	2485	+// source == skybox15Button \|\|
	2486	+// source == skybox16Button \|\|
	2487	+// source == skybox17Button)
	2488	+// {
	2489	+// ChangeSkybox(source);
	2490	+// } else
1765	2491	if (source == csgItem)
1766	2492	{
1767	2493	group(new CSG());
..	..	@@ -1808,30 +2534,30 @@
1808	2534
1809	2535	group(g);
1810	2536	} else
1811		- if (source == loopItem)
	2537	+ if (source == loopItem \|\| source == loopButton)
1812	2538	{
1813	2539	Composite csg = new GroupLeaf();
1814	2540	csg.count = 5;
1815	2541	group(csg);
1816		- Composite child = new cGroup();
	2542	+ Composite child = new cGroup("Branch");
1817	2543	csg.addChild(child);
1818	2544	child.addChild(csg);
1819	2545	} else
1820	2546	if (source == doubleItem)
1821	2547	{
1822		- Composite csg = new GroupLeaf();
	2548	+ Composite csg = new GroupLeaf("Fork");
1823	2549	csg.count = 5;
1824	2550	group(csg);
1825		- Composite child = new cGroup();
	2551	+ Composite child = new cGroup("Branch A");
1826	2552	csg.addChild(child);
1827	2553	child.addChild(csg);
1828		- child = new cGroup();
	2554	+ child = new cGroup("Branch B");
1829	2555	csg.addChild(child);
1830	2556	child.addChild(csg);
1831	2557	} else
1832	2558	if (source == tripleItem)
1833	2559	{
1834		- Composite csg = new GroupLeaf();
	2560	+ Composite csg = new GroupLeaf("Trident");
1835	2561	csg.count = 4;
1836	2562	group(csg);
1837	2563	Composite child = new cGroup();
..	..	@@ -1844,27 +2570,10 @@
1844	2570	csg.addChild(child);
1845	2571	child.addChild(csg);
1846	2572	} else
1847		-
1848		- if (source == importGFDItem)
1849		- {
1850		- ImportGFD();
1851		- } else
1852		- if (source == importVRMLX3DItem)
1853		- {
1854		- ImportVRMLX3D();
1855		- } else
1856		- if (source == import3DSItem)
1857		- {
1858		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1859		- } else
1860		- if (source == importOBJItem)
1861		- {
1862		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1863		- } else
1864	2573	if (source == computeAOItem)
1865	2574	{
1866	2575	Globals.drawMode = CameraPane.OCCLUSION;
1867		- Globals.theRenderer.repaint();
	2576	+ cameraView.repaint();
1868	2577	} else
1869	2578	if (source == recompileItem)
1870	2579	{
..	..	@@ -1879,7 +2588,7 @@
1879	2588	if (source == invariantsItem)
1880	2589	{
1881	2590	System.out.println("Invariants:");
1882		- GrafreeD.grafreeD.universe.invariants();
	2591	+ Grafreed.grafreed.universe.invariants();
1883	2592	} else
1884	2593	if (source == memoryItem)
1885	2594	{
..	..	@@ -1898,6 +2607,53 @@
1898	2607	{
1899	2608	DumpObject();
1900	2609	} else
	2610	+ if (source == minButton)
	2611	+ {
	2612	+ Minimize();
	2613	+ } else
	2614	+ if (source == maxButton)
	2615	+ {
	2616	+ Maximize();
	2617	+ } else
	2618	+ if (source == fullButton)
	2619	+ {
	2620	+ ToggleFullScreen();
	2621	+ } else
	2622	+ if (source == previousVersionButton)
	2623	+ {
	2624	+ // Go to previous version
	2625	+ //if (!Undo())
	2626	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2627	+ PreviousVersion();
	2628	+ } else
	2629	+ if (source == restoreButton)
	2630	+ {
	2631	+ // Restore current version
	2632	+ Restore();
	2633	+ //restoreButton.setEnabled(false);
	2634	+ } else
	2635	+ if (source == replaceButton)
	2636	+ {
	2637	+ // Overwrite current version
	2638	+ Replace();
	2639	+ //replaceButton.setEnabled(false);
	2640	+ } else
	2641	+ if (source == nextVersionButton)
	2642	+ {
	2643	+ // Go to next version
	2644	+ NextVersion();
	2645	+ } else
	2646	+ if (source == saveVersionButton)
	2647	+ {
	2648	+ // Save a new version
	2649	+ if (!Save(true))
	2650	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2651	+ } else
	2652	+ if (source == deleteVersionButton)
	2653	+ {
	2654	+ // Delete a new version
	2655	+ DeleteVersion();
	2656	+ } else
1901	2657	if (source == oneStepButton)
1902	2658	{
1903	2659	Globals.ONESTEP = true;
..	..	@@ -1905,17 +2661,14 @@
1905	2661	} else
1906	2662	if (source == screenfitButton)
1907	2663	{
1908		- //Reload(lastConverter, lastFilename, true);
1909	2664	ScreenFit();
1910	2665	} else
1911	2666	if (source == screenfitpointButton)
1912	2667	{
1913		- //Reload(lastConverter, lastFilename, true);
1914	2668	ScreenFitPoint();
1915	2669	} else
1916	2670	if (source == snapobjectButton)
1917	2671	{
1918		- //Reload(lastConverter, lastFilename, true);
1919	2672	SnapObject();
1920	2673	} else
1921	2674	// if (event.getSource() == recompileButton)
..	..	@@ -1952,12 +2705,20 @@
1952	2705	{
1953	2706	loadClipboard(true);
1954	2707	} else
	2708	+ if (source == undoItem)
	2709	+ {
	2710	+ PreviousVersion();
	2711	+ } else
	2712	+ if (source == redoItem)
	2713	+ {
	2714	+ NextVersion();
	2715	+ } else
1955	2716	if (source == duplicateItem)
1956	2717	{
1957		- Object3D keep = GrafreeD.clipboard;
	2718	+ Object3D keep = Grafreed.clipboard;
1958	2719	loadClipboard(false);
1959	2720	paste(false);
1960		- GrafreeD.clipboard = keep;
	2721	+ Grafreed.clipboard = keep;
1961	2722	} else
1962	2723	if (source == cloneItem)
1963	2724	{
..	..	@@ -2177,9 +2938,9 @@
2177	2938	// group.selection.get(0).setMasterThis(content); // should be identity
2178	2939	// refreshContents();
2179	2940	// }
2180		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2941	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2181	2942	{
2182		- Object3D content = GrafreeD.clipboard.get(0);
	2943	+ Object3D content = Grafreed.clipboard.get(0);
2183	2944
2184	2945	if (content instanceof cGroup && ((cGroup)content).transientlink )
2185	2946	content = ((cGroup)content).get(0);
..	..	@@ -2229,9 +2990,9 @@
2229	2990	} else
2230	2991	if (source == setMasterItem)
2231	2992	{
2232		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2993	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2233	2994	{
2234		- Object3D content = GrafreeD.clipboard.get(0);
	2995	+ Object3D content = Grafreed.clipboard.get(0);
2235	2996
2236	2997	if (content instanceof cGroup && ((cGroup)content).transientlink )
2237	2998	content = ((cGroup)content).get(0);
..	..	@@ -2244,9 +3005,9 @@
2244	3005	{
2245	3006	if (group.selection.size() == 1)
2246	3007	{
2247		- if (GrafreeD.clipboard.size() == 1)
	3008	+ if (Grafreed.clipboard.size() == 1)
2248	3009	{
2249		- Object3D content = GrafreeD.clipboard.get(0);
	3010	+ Object3D content = Grafreed.clipboard.get(0);
2250	3011
2251	3012	if (content instanceof cGroup && ((cGroup)content).transientlink )
2252	3013	content = ((cGroup)content).get(0);
..	..	@@ -2263,7 +3024,7 @@
2263	3024	{
2264	3025	RevertMeshes();
2265	3026	} else
2266		- if (source == resetMeshItem)
	3027	+ if (source == resetAllItem)
2267	3028	{
2268	3029	ResetAll();
2269	3030	} else
..	..	@@ -2271,7 +3032,7 @@
2271	3032	{
2272	3033	StepAll();
2273	3034	} else
2274		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3035	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2275	3036	{
2276	3037	//int indices[] = jList.getSelectedIndices();
2277	3038	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2283,9 +3044,9 @@
2283	3044	{
2284	3045	ClearSelection(true);
2285	3046	} else
2286		- if (source == grabItem)
	3047	+ if (source == grabItem \|\| source == groupButton)
2287	3048	{
2288		- group(new cGroup(), true);
	3049	+ group(new cGroup(), false); // true);
2289	3050	} else
2290	3051	if (source == hideItem)
2291	3052	{
..	..	@@ -2303,11 +3064,11 @@
2303	3064	{
2304	3065	makeSomething(new Camera());
2305	3066	} else
2306		- if (source == compositeItem)
	3067	+ if (source == compositeItem \|\| source == compositeButton)
2307	3068	{
2308	3069	group(new Composite());
2309	3070	} else
2310		- if (source == randomItem)
	3071	+ if (source == switchItem \|\| source == switchButton)
2311	3072	{
2312	3073	RandomNode random = new RandomNode();
2313	3074	group(random);
..	..	@@ -2409,7 +3170,7 @@
2409	3170	{
2410	3171	group(new cLinker());
2411	3172	} else
2412		- if (source == textureItem)
	3173	+ if (source == textureItem \|\| source == textureButton)
2413	3174	{
2414	3175	group(new TextureNode());
2415	3176	} else
..	..	@@ -2429,17 +3190,30 @@
2429	3190	{
2430	3191	CastShadow(2);
2431	3192	} else
2432		- if (source == ungroupItem)
	3193	+ if (source == ungroupItem \|\| source == ungroupButton)
2433	3194	{
2434		- //ungroup();
	3195	+ boolean hasRoot = false;
	3196	+
2435	3197	for (int i=0; i<group.selection.size(); i++)
2436	3198	{
2437		- Ungroup(group.selection.get(i));
	3199	+ if (group.selection.get(i) == group)
	3200	+ {
	3201	+ hasRoot = true;
	3202	+ break;
	3203	+ }
2438	3204	}
2439	3205
2440		- ClearSelection(false);
2441		-
2442		- refreshContents();
	3206	+ if (!hasRoot)
	3207	+ {
	3208	+ for (int i=0; i<group.selection.size(); i++)
	3209	+ {
	3210	+ Ungroup(group.selection.get(i));
	3211	+ }
	3212	+
	3213	+ ClearSelection(false);
	3214	+
	3215	+ refreshContents();
	3216	+ }
2443	3217	} else
2444	3218	if (source == genUVItem)
2445	3219	{
..	..	@@ -2451,7 +3225,7 @@
2451	3225	} else
2452	3226	if (source == genNormalsMESHItem)
2453	3227	{
2454		- GenNormals(true); // TODO
	3228	+ GenNormalsMESH();
2455	3229	} else
2456	3230	if (source == genNormalsORGANItem)
2457	3231	{
..	..	@@ -2516,6 +3290,22 @@
2516	3290	if (source == unmarkleavesItem)
2517	3291	{
2518	3292	MarkLeaves(false);
	3293	+ } else
	3294	+ if (source == rewindleavesItem)
	3295	+ {
	3296	+ RewindLeaves(true);
	3297	+ } else
	3298	+ if (source == unrewindleavesItem)
	3299	+ {
	3300	+ RewindLeaves(false);
	3301	+ } else
	3302	+ if (source == randomleavesItem)
	3303	+ {
	3304	+ RandomLeaves(true);
	3305	+ } else
	3306	+ if (source == unrandomleavesItem)
	3307	+ {
	3308	+ RandomLeaves(false);
2519	3309	} else
2520	3310	if (source == flipVItem)
2521	3311	{
..	..	@@ -2601,9 +3391,13 @@
2601	3391	{
2602	3392	SmoothMesh();
2603	3393	} else
2604		- if (source == transformgeometryItem)
	3394	+ if (source == transformGeometryItem)
2605	3395	{
2606	3396	TransformGeometry();
	3397	+ } else
	3398	+ if (source == transformChildrenItem)
	3399	+ {
	3400	+ TransformChildren();
2607	3401	} else
2608	3402	if (source == resetTransformItem)
2609	3403	{
..	..	@@ -2611,7 +3405,11 @@
2611	3405	} else
2612	3406	if (source == resetCentroidItem)
2613	3407	{
2614		- ResetCentroid();
	3408	+ ResetCentroid(true);
	3409	+ } else
	3410	+ if (source == resetCentroidXZItem)
	3411	+ {
	3412	+ ResetCentroid(false);
2615	3413	} else
2616	3414	if (source == resetParentItem)
2617	3415	{
..	..	@@ -2716,7 +3514,7 @@
2716	3514	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2717	3515	{
2718	3516	obj = (Object3D)e.nextElement();
2719		- obj.SetBumpTexture(null);
	3517	+ obj.ResetBumpTexture();
2720	3518	}
2721	3519
2722	3520	refreshContents();
..	..	@@ -2732,6 +3530,31 @@
2732	3530
2733	3531	refreshContents();
2734	3532	} else
	3533	+ if (source == embedTexturesItem)
	3534	+ {
	3535	+ Object3D obj;
	3536	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3537	+ {
	3538	+ obj = (Object3D)e.nextElement();
	3539	+ obj.EmbedTextures(true);
	3540	+ }
	3541	+
	3542	+ refreshContents();
	3543	+ } else
	3544	+ if (source == deEmbedTexturesItem)
	3545	+ {
	3546	+ Object3D obj;
	3547	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3548	+ {
	3549	+ obj = (Object3D)e.nextElement();
	3550	+ obj.EmbedTextures(false);
	3551	+ }
	3552	+
	3553	+ CameraPane.texturepigment.clear();
	3554	+ CameraPane.texturebump.clear();
	3555	+
	3556	+ refreshContents();
	3557	+ } else
2735	3558	if (source == flashSelectionButton)
2736	3559	{
2737	3560	CameraPane.flash = true;
..	..	@@ -2743,6 +3566,10 @@
2743	3566	if (source == twoButton)
2744	3567	{
2745	3568	radio.layout = twoButton;
	3569	+
	3570	+ if (CameraPane.FULLSCREEN)
	3571	+ fullscreenLayout = radio.layout;
	3572	+
2746	3573	// bug
2747	3574	//gridPanel.setDividerLocation(1.0);
2748	3575	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2775,10 +3602,31 @@
2775	3602	bigThree.ClearUI();
2776	3603	bigThree.add(centralPanel);
2777	3604	bigThree.FlushUI();
	3605	+
	3606	+ cameraView.requestFocusInWindow();
	3607	+
	3608	+// refreshContents(true);
	3609	+//
	3610	+// try
	3611	+// {
	3612	+// java.awt.Robot bot = new java.awt.Robot();
	3613	+// int mask = InputEvent.BUTTON1_MASK;
	3614	+// bot.mouseMove(100, 100);
	3615	+// bot.mousePress(mask);
	3616	+// bot.mouseRelease(mask);
	3617	+// }
	3618	+// catch (Exception e)
	3619	+// {
	3620	+//
	3621	+// }
	3622	+
2778	3623	} else
2779	3624	if (source == threeButton)
2780	3625	{
2781	3626	radio.layout = threeButton;
	3627	+
	3628	+ if (CameraPane.FULLSCREEN)
	3629	+ fullscreenLayout = radio.layout;
2782	3630
2783	3631	// bigThree.remove(scenePanel);
2784	3632	// bigThree.remove(centralPanel);
..	..	@@ -2808,13 +3656,18 @@
2808	3656	// centralPanel.setVisible(true);
2809	3657	// XYZPanel.setVisible(true);
2810	3658	bigThree.ClearUI();
	3659	+ bigThree.add(scenePanel);
2811	3660	bigThree.add(centralPanel);
2812		- bigThree.add(XYZPanel);
2813	3661	bigThree.FlushUI();
	3662	+
	3663	+ cameraView.requestFocusInWindow();
2814	3664	} else
2815	3665	if (source == fourButton)
2816	3666	{
2817	3667	radio.layout = fourButton;
	3668	+
	3669	+ if (CameraPane.FULLSCREEN)
	3670	+ fullscreenLayout = radio.layout;
2818	3671
2819	3672	// bigThree.remove(scenePanel);
2820	3673	// bigThree.remove(centralPanel);
..	..	@@ -2846,10 +3699,15 @@
2846	3699	bigThree.ClearUI();
2847	3700	bigThree.add(scenePanel);
2848	3701	bigThree.FlushUI();
	3702	+
	3703	+ cameraView.requestFocusInWindow();
2849	3704	} else
2850	3705	if (source == sixButton)
2851	3706	{
2852	3707	radio.layout = sixButton;
	3708	+
	3709	+ if (CameraPane.FULLSCREEN)
	3710	+ fullscreenLayout = radio.layout;
2853	3711
2854	3712	// bigThree.remove(scenePanel);
2855	3713	// bigThree.remove(centralPanel);
..	..	@@ -2879,13 +3737,18 @@
2879	3737	// centralPanel.setVisible(true);
2880	3738	// XYZPanel.setVisible(false);
2881	3739	bigThree.ClearUI();
2882		- bigThree.add(scenePanel);
2883	3740	bigThree.add(centralPanel);
	3741	+ bigThree.add(scenePanel);
2884	3742	bigThree.FlushUI();
	3743	+
	3744	+ cameraView.requestFocusInWindow();
2885	3745	} else
2886	3746	if (source == sevenButton)
2887	3747	{
2888	3748	radio.layout = sevenButton;
	3749	+
	3750	+ if (CameraPane.FULLSCREEN)
	3751	+ fullscreenLayout = radio.layout;
2889	3752
2890	3753	// bigThree.remove(scenePanel);
2891	3754	// bigThree.remove(centralPanel);
..	..	@@ -2919,6 +3782,8 @@
2919	3782	bigThree.add(centralPanel);
2920	3783	bigThree.add(XYZPanel);
2921	3784	bigThree.FlushUI();
	3785	+
	3786	+ cameraView.requestFocusInWindow();
2922	3787	} else
2923	3788	if (source == rootButton)
2924	3789	{
..	..	@@ -2930,6 +3795,7 @@
2930	3795	EditObject(obj);
2931	3796	}
2932	3797
	3798	+ cameraView.requestFocusInWindow();
2933	3799	refreshContents(true);
2934	3800	} else
2935	3801	if (source == closeButton)
..	..	@@ -2939,22 +3805,37 @@
2939	3805	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2940	3806	{
2941	3807	ab = (cRadio)e.nextElement();
2942		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3808	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2943	3809	{
	3810	+ // Patch to avoid bug with transparency.
	3811	+ if (!ab.hadMaterial)
	3812	+ {
	3813	+ ab.object.material = null;
	3814	+ }
	3815	+
2944	3816	buttonGroup.remove(ab);
2945	3817	radioPanel.remove(ab);
2946	3818
2947		- ab.GetObject().editWindow = null;
	3819	+ //ab.GetObject().editWindow = null;
	3820	+ ab.GetObject().manipWindow = null;
2948	3821	// ab.GetObject().objectUI = null; // ?????????
2949	3822
2950	3823	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2951	3824	break;
2952	3825	}
2953	3826	}
	3827	+
	3828	+ cameraView.requestFocusInWindow();
2954	3829	refreshContents(true);
2955	3830	} else
2956	3831	if (source == editItem \|\| source == editButton)
2957	3832	{
	3833	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3834	+ {
	3835	+ Object3D child = (Object3D)e.nextElement();
	3836	+ child.pinned = true;
	3837	+ }
	3838	+
2958	3839	EditSelection(false);
2959	3840	} else
2960	3841	if (source == uneditButton)
..	..	@@ -2963,11 +3844,12 @@
2963	3844	{
2964	3845	Object3D child = (Object3D)e.nextElement();
2965	3846	if(child.editWindow != null)
2966		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3847	+ child.pinned = false;
2967	3848	child.CloseUI();
2968	3849	listUI.remove(child);
	3850	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2969	3851
2970		- child.editWindow = null; // ???????????
	3852	+ //child.editWindow = null; // ???????????
2971	3853	}
2972	3854	objEditor.ctrlPanel.FlushUI();
2973	3855	//objEditor.jTree.clearSelection();
..	..	@@ -2980,16 +3862,18 @@
2980	3862	//copy.ClearUI();
2981	3863	for (Object3D obj : listUI)
2982	3864	{
	3865	+ obj.pinned = false;
2983	3866	obj.CloseUI();
2984	3867	}
2985	3868	listUI.clear();
	3869	+ SetPinStates(group.selection.size() > 0);
2986	3870	refreshContents(true);
2987	3871	} else
2988	3872	if (source == allParamsButton)
2989	3873	{
2990	3874	assert(copy == group);
2991	3875
2992		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3876	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2993	3877
2994	3878	for (Object3D obj : listUI)
2995	3879	{
..	..	@@ -3038,6 +3922,9 @@
3038	3922	}
3039	3923
3040	3924	copy = group;
	3925	+
	3926	+ SetUndoStates();
	3927	+
3041	3928	//Globals.theRenderer.object = group;
3042	3929	if(!useclient)
3043	3930	{
..	..	@@ -3053,20 +3940,49 @@
3053	3940	frontView.object = group;
3054	3941	sideView.object = group;
3055	3942	}
3056		- group.editWindow = this;
	3943	+
	3944	+// fix "+" issue
	3945	+ //group.editWindow = this;
	3946	+ group.manipWindow = this;
	3947	+
3057	3948	/*
3058	3949	currentLayout = radio.layout;
3059	3950	if (currentLayout == null)
3060	3951	currentLayout = sevenButton;
3061	3952	*/
3062	3953	radio.layout.doClick();
	3954	+
	3955	+ ClearUnpinned();
	3956	+
	3957	+ //Grafreed.Assert(group != null);
	3958	+ //Grafreed.Assert(group.selection != null);
	3959	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3960	+ if (group.selection == null \|\| group.selection.size() == 1)
	3961	+ EditSelection(false);
3063	3962	keepparent = group.parent;
3064	3963	// PARENT = NULL or not???
3065	3964	//group.parent = null; // ROOT
3066	3965	//group.attributes = -1;
3067	3966	ResetModel();
	3967	+
	3968	+ cameraView.requestFocusInWindow();
3068	3969	refreshContents(true);
3069		- }
	3970	+ } else if (event.getSource() == editCameraItem)
	3971	+ {
	3972	+ cameraView.ProtectCamera();
	3973	+ cameraView.requestFocusInWindow();
	3974	+ cameraView.repaint();
	3975	+ return;
	3976	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3977	+ {
	3978	+ cameraView.RevertCamera();
	3979	+ cameraView.requestFocusInWindow();
	3980	+ cameraView.repaint();
	3981	+ return;
	3982	+ // } else if (event.getSource() == textureButton)
	3983	+ // {
	3984	+ // return; // true;
	3985	+ }
3070	3986	else
3071	3987	{
3072	3988	//return super.action(event, arg);
..	..	@@ -3075,7 +3991,6 @@
3075	3991	}
3076	3992
3077	3993	boolean useclient = false;
3078		- cRadio radio;
3079	3994
3080	3995	void ToggleRoot()
3081	3996	{
..	..	@@ -3127,6 +4042,28 @@
3127	4042	refreshContents();
3128	4043	}
3129	4044
	4045	+ void TransformChildren()
	4046	+ {
	4047	+ Object3D obj;
	4048	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4049	+ {
	4050	+ obj = (Object3D)e.nextElement();
	4051	+ obj.KeepTextureMatrices();
	4052	+ obj.TransformChildren();
	4053	+ obj.RestoreTextureMatrices();
	4054	+
	4055	+// if (obj.parent == null)
	4056	+// {
	4057	+// System.out.println("NULL PARENT!");
	4058	+// new Exception().printStackTrace();
	4059	+// }
	4060	+// else
	4061	+// TouchTransform(obj);
	4062	+// //obj.parent.Touch();
	4063	+ }
	4064	+
	4065	+ refreshContents();
	4066	+ }
3130	4067
3131	4068	void ResetTransform()
3132	4069	{
..	..	@@ -3239,7 +4176,7 @@
3239	4176	refreshContents();
3240	4177	}
3241	4178
3242		- void ResetCentroid()
	4179	+ void ResetCentroid(boolean full)
3243	4180	{
3244	4181	Object3D obj;
3245	4182	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3254,12 +4191,16 @@
3254	4191	LA.matIdentity(Object3D.mat);
3255	4192	obj.getBounds(minima, maxima, false);
3256	4193	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3257		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4194	+ if (full)
	4195	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3258	4196	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3259	4197	obj.TransformMesh(Object3D.mat);
	4198	+
3260	4199	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3261		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4200	+ if (full)
	4201	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3262	4202	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4203	+
3263	4204	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3264	4205	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3265	4206	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3288,7 +4229,8 @@
3288	4229
3289	4230	int size = obj.MemorySize();
3290	4231
3291		- System.err.println((size/1024) + " KB is the size of " + obj);
	4232	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4233	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3292	4234	}
3293	4235	}
3294	4236	catch (Exception e)
..	..	@@ -3325,9 +4267,9 @@
3325	4267	obj = (Object3D)e.nextElement();
3326	4268
3327	4269	System.out.println("Object is: " + obj);
3328		- GrafreeD.AnalyzeObject(obj);
	4270	+ Grafreed.AnalyzeObject(obj);
3329	4271	System.out.println("Boundary rep: " + obj.bRep);
3330		- GrafreeD.AnalyzeObject(obj.bRep);
	4272	+ Grafreed.AnalyzeObject(obj.bRep);
3331	4273
3332	4274	// System.err.println((size/1024) + " KB is the size of " + obj);
3333	4275	}
..	..	@@ -3369,6 +4311,13 @@
3369	4311	void GenNormals(boolean crease)
3370	4312	{
3371	4313	group.GenNormalsS(crease);
	4314	+
	4315	+ refreshContents();
	4316	+ }
	4317	+
	4318	+ void GenNormalsMESH()
	4319	+ {
	4320	+ group.GenNormalsMeshS();
3372	4321
3373	4322	refreshContents();
3374	4323	}
..	..	@@ -3541,8 +4490,8 @@
3541	4490
3542	4491	void ParseVertices()
3543	4492	{
3544		- boolean epsequal = GrafreeD.epsequal;
3545		- GrafreeD.epsequal = true;
	4493	+ boolean epsequal = Grafreed.epsequal;
	4494	+ Grafreed.epsequal = true;
3546	4495
3547	4496	for (int i=0; i<group.selection.size(); i++)
3548	4497	{
..	..	@@ -3567,7 +4516,7 @@
3567	4516	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3568	4517	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3569	4518
3570		- g.add(GrafreeD.clipboard);
	4519	+ g.add(Grafreed.clipboard);
3571	4520
3572	4521	buffer.add(g);
3573	4522	}
..	..	@@ -3582,7 +4531,7 @@
3582	4531	makeSomething(buffer, i==group.selection.size()-1);
3583	4532	}
3584	4533
3585		- GrafreeD.epsequal = epsequal;
	4534	+ Grafreed.epsequal = epsequal;
3586	4535
3587	4536	refreshContents();
3588	4537	}
..	..	@@ -3600,7 +4549,16 @@
3600	4549	String pigment = Object3D.GetPigment(tex);
3601	4550	//String bump = Object3D.GetBump(tex);
3602	4551
3603		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4552	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4553	+
	4554	+ try
	4555	+ {
	4556	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4557	+ }
	4558	+ catch (Exception e)
	4559	+ {
	4560	+ System.err.println("FAIL: " + node);
	4561	+ }
3604	4562
3605	4563	double s = v.s;
3606	4564
..	..	@@ -3732,7 +4690,7 @@
3732	4690	return;
3733	4691
3734	4692	Object3D poses = group.selection.get(0);
3735		- Object3D ref = GrafreeD.clipboard.get(0);
	4693	+ Object3D ref = Grafreed.clipboard.get(0);
3736	4694
3737	4695	Object3D newgroup = new Object3D("Po:" + poses.name);
3738	4696
..	..	@@ -3926,9 +4884,9 @@
3926	4884
3927	4885	void ClipMesh()
3928	4886	{
3929		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4887	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3930	4888	{
3931		- Object3D content = GrafreeD.clipboard.get(0);
	4889	+ Object3D content = Grafreed.clipboard.get(0);
3932	4890
3933	4891	if (content instanceof cGroup && ((cGroup)content).transientlink )
3934	4892	content = ((cGroup)content).get(0);
..	..	@@ -3937,7 +4895,7 @@
3937	4895	// {
3938	4896	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3939	4897	// }
3940		- group.selection.ClipMesh(GrafreeD.clipboard);
	4898	+ group.selection.ClipMesh(Grafreed.clipboard);
3941	4899	}
3942	4900	// group.selection.ClipMesh(GrafreeD.clipboard);
3943	4901	System.out.println("DONE.");
..	..	@@ -3984,6 +4942,18 @@
3984	4942	void MarkLeaves(boolean hide)
3985	4943	{
3986	4944	group.selection.MarkLeaves(hide);
	4945	+ refreshContents();
	4946	+ }
	4947	+
	4948	+ void RewindLeaves(boolean hide)
	4949	+ {
	4950	+ group.selection.RewindLeaves(hide);
	4951	+ refreshContents();
	4952	+ }
	4953	+
	4954	+ void RandomLeaves(boolean hide)
	4955	+ {
	4956	+ group.selection.RandomLeaves(hide);
3987	4957	refreshContents();
3988	4958	}
3989	4959
..	..	@@ -4058,28 +5028,25 @@
4058	5028	// }
4059	5029	// }
4060	5030
4061		- static boolean allparams = true;
4062		-
4063		- static Vector<Object3D> listUI = new Vector<Object3D>();
4064		-
4065	5031	void EditSelection(boolean newWindow)
4066	5032	{
	5033	+ if (group.selection == null)
	5034	+ {
	5035	+ EditElement(group, newWindow); // ? new
	5036	+ return;
	5037	+ }
	5038	+
4067	5039	// aConstraints.gridy = 0;
4068	5040	for (int i=0; i<group.selection.size(); i++)
4069	5041	{
4070	5042	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4071	5043	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4072		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5044	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4073	5045
4074	5046	Object3D elem = (Object3D)group.selection.elementAt(i);
4075		- if(elem != group)
	5047	+ if(elem != group \|\| !newWindow)
4076	5048	{
4077		- // if (!(elem instanceof Composite))
4078		- // newWindow = false;
4079		- listUI.add(elem);
4080		- elem.openEditWindow(this, newWindow); //, false);
4081		- System.out.println("edit : " + elem);
4082		- elem.editWindow.refreshContents(true); // ? new
	5049	+ EditElement(elem, newWindow); // ? new
4083	5050	}
4084	5051	}
4085	5052	}
..	..	@@ -4142,9 +5109,7 @@
4142	5109
4143	5110	freezemodel = false;
4144	5111	}
4145		-
4146		- boolean flashIt = true;
4147		-
	5112	+
4148	5113	public void valueChanged(TreeSelectionEvent e)
4149	5114	//public boolean handleEvent(Event event)
4150	5115	{
..	..	@@ -4154,7 +5119,8 @@
4154	5119	//new Exception().printStackTrace();
4155	5120
4156	5121	freezemodel = true;
4157		-
	5122	+ ClearUnpinned();
	5123	+
4158	5124	/**/
4159	5125	//switch (event.id)
4160	5126	{
..	..	@@ -4162,7 +5128,6 @@
4162	5128	//case 702: // Event.LIST_DESELECT
4163	5129	group.deselectAll();
4164	5130	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4165		- objEditor.ClearInfo(); // .GetMaterial());
4166	5131	if (tps != null)
4167	5132	{
4168	5133	for (int i=0; i < tps.length; i++)
..	..	@@ -4171,10 +5136,8 @@
4171	5136
4172	5137	//if (child.parent != null)
4173	5138	//child.parent.addSelectee(child);
	5139	+ objEditor.SetMaterial(child);
4174	5140	group.addSelectee(child);
4175		- objEditor.SetMaterial(child); // .GetMaterial());
4176		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4177		- System.err.println("info : " + child.GetPath());
4178	5141	}
4179	5142	}
4180	5143	// else
..	..	@@ -4184,20 +5147,28 @@
4184	5147	// System.err.println("info : " + group.GetPath());
4185	5148	// }
4186	5149
4187		- objEditor.SetText(); // jan 2014
4188		-
4189		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5150	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4190	5151	CameraPane.flash = true;
4191	5152
4192		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5153	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4193	5154	// a camera
4194	5155	{
4195		- CameraPane.camerachangeframe = 0; // don't refuse it
4196		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5156	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5157	+ {
	5158	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5159	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5160	+ }
4197	5161	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4198	5162	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4199	5163	}
4200	5164
	5165	+ if (tps != null && tps.length == 1)
	5166	+ {
	5167	+ EditSelection(false);
	5168	+ }
	5169	+
	5170	+ SetPinStates(tps != null && tps.length > 0);
	5171	+
4201	5172	refreshContents();
4202	5173	//return true;
4203	5174	}
..	..	@@ -4206,6 +5177,37 @@
4206	5177
4207	5178	freezemodel = false;
4208	5179	}
	5180	+
	5181	+ void SetPinStates(boolean enabled)
	5182	+ {
	5183	+ editButton.setEnabled(enabled);
	5184	+ uneditButton.setEnabled(enabled);
	5185	+ //unselectButton.setEnabled(enabled);
	5186	+ flashSelectionButton.setEnabled(enabled);
	5187	+
	5188	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5189	+ }
	5190	+
	5191	+ void refreshContents(boolean cp)
	5192	+ {
	5193	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5194	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5195	+ {
	5196	+ objEditor.ClearInfo(); // .GetMaterial());
	5197	+
	5198	+ for (int i=0; i < group.selection.Size(); i++)
	5199	+ {
	5200	+ Object3D child = (Object3D) group.selection.get(i);
	5201	+
	5202	+ objEditor.AddInfo(child, this, true);
	5203	+ System.err.println("info : " + child.GetPath());
	5204	+ }
	5205	+
	5206	+ objEditor.SetText(); // jan 2014
	5207	+ }
	5208	+
	5209	+ super.refreshContents(cp);
	5210	+ }
4209	5211
4210	5212	void linkSomething(Object3D thing)
4211	5213	{
..	..	@@ -4277,16 +5279,19 @@
4277	5279	{
4278	5280	if (group.selection.isEmpty())
4279	5281	return;
4280		- GrafreeD.clipboardIsTempGroup = false;
	5282	+
	5283	+ Grafreed.clipboardIsTempGroup = false;
4281	5284	Composite tGroup = null;
4282	5285	if (group.selection.size() > 0) // 1)
4283	5286	{
4284	5287	tGroup = new cGroup();
4285		- GrafreeD.clipboardIsTempGroup = true;
	5288	+ Grafreed.clipboardIsTempGroup = true;
4286	5289	}
4287	5290
4288	5291	if (cut)
4289	5292	{
	5293	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5294	+// Save();
4290	5295	//int indices[] = jList.getSelectedIndices();
4291	5296	//for (int i = indices.length - 1; i >= 0; i--)
4292	5297	//jList.remove(indices[i]);
..	..	@@ -4322,16 +5327,16 @@
4322	5327	//System.out.println("cut " + child);
4323	5328	//System.out.println("parent = " + child.parent);
4324	5329	// tmp.addChild(child);
4325		- if (GrafreeD.clipboardIsTempGroup)
	5330	+ if (Grafreed.clipboardIsTempGroup)
4326	5331	tGroup.add/Child/(tmp);
4327	5332	else
4328		- GrafreeD.clipboard = tmp;
	5333	+ Grafreed.clipboard = tmp;
4329	5334	}
4330	5335	else
4331		- if (GrafreeD.clipboardIsTempGroup)
	5336	+ if (Grafreed.clipboardIsTempGroup)
4332	5337	tGroup.add/Child/(child);
4333	5338	else
4334		- GrafreeD.clipboard = child;
	5339	+ Grafreed.clipboard = child;
4335	5340	}
4336	5341
4337	5342	//ResetModel();
..	..	@@ -4363,21 +5368,23 @@
4363	5368	//System.out.println("cut " + elem);
4364	5369	//System.out.println("parent = " + elem.parent);
4365	5370	// tmp.addChild(elem);
4366		- if (GrafreeD.clipboardIsTempGroup)
	5371	+ if (Grafreed.clipboardIsTempGroup)
4367	5372	tGroup.add/Child/(tmp);
4368	5373	else
4369		- GrafreeD.clipboard = tmp;
	5374	+ Grafreed.clipboard = tmp;
4370	5375	}
4371	5376	else
4372		- if (GrafreeD.clipboardIsTempGroup)
	5377	+ if (Grafreed.clipboardIsTempGroup)
4373	5378	tGroup.add/Child/(child);
4374	5379	else
4375		- GrafreeD.clipboard = child;
	5380	+ Grafreed.clipboard = child;
4376	5381	}
4377	5382
4378	5383	}
4379		- if (GrafreeD.clipboardIsTempGroup)
4380		- GrafreeD.clipboard = tGroup;
	5384	+
	5385	+ if (Grafreed.clipboardIsTempGroup)
	5386	+ Grafreed.clipboard = tGroup;
	5387	+
4381	5388	if (cut)
4382	5389	{
4383	5390	ResetModel();
..	..	@@ -4387,11 +5394,15 @@
4387	5394
4388	5395	void paste(boolean expand)
4389	5396	{
	5397	+ if (Globals.REPLACEONMAKE)
	5398	+ Save();
	5399	+ boolean keep = Globals.REPLACEONMAKE;
	5400	+ Globals.REPLACEONMAKE = false;
4390	5401	// if (GrafreeD.clipboard == null)
4391	5402	// return;
4392	5403	boolean first = true;
4393	5404
4394		- if (GrafreeD.clipboardIsTempGroup)
	5405	+ if (Grafreed.clipboardIsTempGroup)
4395	5406	{
4396	5407	Composite temp;
4397	5408
..	..	@@ -4402,7 +5413,7 @@
4402	5413	temp = (Composite)Applet3D.clipboard.deepCopy();
4403	5414	*/
4404	5415	Object3D elem;
4405		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5416	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4406	5417	{
4407	5418	Object3D child = (Object3D)e.nextElement();
4408	5419
..	..	@@ -4436,16 +5447,17 @@
4436	5447	//Object3D cb = Applet3D.clipboard;
4437	5448	//temp.addChild(cb);
4438	5449	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4439		- assert(GrafreeD.clipboard.parent == null);
4440		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4441		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4442		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4443		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5450	+ assert(Grafreed.clipboard.parent == null);
	5451	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5452	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5453	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5454	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4444	5455	else
4445		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4446		- GrafreeD.clipboard.get(0).parent = keepparent;
	5456	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5457	+ Grafreed.clipboard.get(0).parent = keepparent;
4447	5458	}
4448	5459
	5460	+ Globals.REPLACEONMAKE = keep;
4449	5461	ResetModel();
4450	5462	refreshContents();
4451	5463	}
..	..	@@ -4492,9 +5504,9 @@
4492	5504	{
4493	5505	boolean first = true;
4494	5506
4495		- if (GrafreeD.clipboardIsTempGroup)
	5507	+ if (Grafreed.clipboardIsTempGroup)
4496	5508	{
4497		- Composite temp = (Composite)GrafreeD.clipboard;
	5509	+ Composite temp = (Composite)Grafreed.clipboard;
4498	5510	Object3D copy;
4499	5511	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4500	5512	{
..	..	@@ -4504,7 +5516,7 @@
4504	5516	}
4505	5517	} else
4506	5518	{
4507		- linkSomething(GrafreeD.clipboard); //.get(0));
	5519	+ linkSomething(Grafreed.clipboard); //.get(0));
4508	5520	}
4509	5521	}
4510	5522	}
..	..	@@ -4581,6 +5593,10 @@
4581	5593
4582	5594	void group(Object3D csg, boolean grab)
4583	5595	{
	5596	+ if (Globals.REPLACEONMAKE)
	5597	+ Save();
	5598	+ boolean keep = Globals.REPLACEONMAKE;
	5599	+ Globals.REPLACEONMAKE = false;
4584	5600	if (//false) // why??
4585	5601	!group.selection.isEmpty())
4586	5602	{
..	..	@@ -4694,10 +5710,15 @@
4694	5710	//node.add(csg);
4695	5711	//makeSomething(node);
4696	5712	makeSomething(csg);
	5713	+ Globals.REPLACEONMAKE = keep;
4697	5714	}
4698	5715
4699	5716	void Ungroup(Object3D g)
4700	5717	{
	5718	+ if (Globals.REPLACEONMAKE)
	5719	+ Save();
	5720	+ boolean keep = Globals.REPLACEONMAKE;
	5721	+ Globals.REPLACEONMAKE = false;
4701	5722	if (g instanceof HiddenObject)
4702	5723	{
4703	5724	HiddenObject h = (HiddenObject) g;
..	..	@@ -4714,6 +5735,7 @@
4714	5735	objEditor.makeSomething(g.get(i), false);
4715	5736	}
4716	5737	}
	5738	+ Globals.REPLACEONMAKE = keep;
4717	5739	}
4718	5740
4719	5741	void ungroup()
..	..	@@ -4909,21 +5931,6 @@
4909	5931	}
4910	5932	*/
4911	5933
4912		- void ImportGFD()
4913		- {
4914		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4915		- browser.show();
4916		- String filename = browser.getFile();
4917		- if (filename != null && filename.length() > 0)
4918		- {
4919		- String fullname = browser.getDirectory() + filename;
4920		-
4921		- //Object3D readobj =
4922		- objEditor.ReadGFD(fullname, objEditor);
4923		- //makeSomething(readobj);
4924		- }
4925		- }
4926		-
4927	5934	/*
4928	5935	public void Callback(Object obj)
4929	5936	{
..	..	@@ -4947,26 +5954,9 @@
4947	5954	}
4948	5955	*/
4949	5956
4950		- void ImportVRMLX3D()
4951		- {
4952		- if (GrafreeD.standAlone)
4953		- {
4954		- /**/
4955		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4956		- browser.show();
4957		- String filename = browser.getFile();
4958		- if (filename != null && filename.length() > 0)
4959		- {
4960		- String fullname = browser.getDirectory() + filename;
4961		- LoadVRMLX3D(fullname);
4962		- }
4963		- /**/
4964		- }
4965		- }
4966		-
4967	5957	String GetFile(String dialogName)
4968	5958	{
4969		- if (GrafreeD.standAlone)
	5959	+ if (Grafreed.standAlone)
4970	5960	{
4971	5961	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4972	5962	browser.show();
..	..	@@ -5034,7 +6024,43 @@
5034	6024	cButton clearpanelButton;
5035	6025	cButton unselectButton;
5036	6026
	6027	+ cButton restoreCameraButton;
	6028	+
5037	6029	cButton oneStepButton;
	6030	+
	6031	+ cButton groupButton;
	6032	+ cButton ungroupButton;
	6033	+ cButton compositeButton;
	6034	+ cButton switchButton;
	6035	+ cButton loopButton;
	6036	+ cButton textureButton;
	6037	+
	6038	+ cButton skybox1Button;
	6039	+ cButton skybox2Button;
	6040	+ cButton skybox3Button;
	6041	+ cButton skybox4Button;
	6042	+ cButton skybox5Button;
	6043	+ cButton skybox6Button;
	6044	+ cButton skybox7Button;
	6045	+
	6046	+ cButton skybox11Button;
	6047	+ cButton skybox12Button;
	6048	+ cButton skybox13Button;
	6049	+ cButton skybox14Button;
	6050	+ cButton skybox15Button;
	6051	+ cButton skybox16Button;
	6052	+ cButton skybox17Button;
	6053	+
	6054	+ cButton gridButton;
	6055	+ cButton boxButton;
	6056	+ cButton sphereButton;
	6057	+ cButton coneButton;
	6058	+ cButton torusButton;
	6059	+ cButton superButton;
	6060	+ cButton kleinButton;
	6061	+ cButton particlesButton;
	6062	+ cButton overlayButton;
	6063	+ cButton lightButton;
5038	6064
5039	6065	cButton screenfitButton;
5040	6066	cButton screenfitpointButton;
..	..	@@ -5047,14 +6073,6 @@
5047	6073
5048	6074	cButton setsupportButton;
5049	6075
5050		- cButton twoButton;
5051		- cButton sixButton;
5052		- cButton threeButton;
5053		- cButton sevenButton;
5054		- cButton fourButton; // full panel
5055		- cButton oneButton; // full XYZ
5056		- //cButton currentLayout;
5057		-
5058	6076	//
5059	6077	//Composite
5060	6078	Object3D // to do !!
..	..	@@ -5064,9 +6082,11 @@
5064	6082	//JTree jTree;
5065	6083	private MenuItem lookAtItem;
5066	6084	private MenuItem lookFromItem;
5067		- private MenuItem switchItem;
	6085	+ private MenuItem switchViewItem;
5068	6086	private MenuItem cutItem;
5069		- private MenuItem duplicateItem;
	6087	+ private MenuItem undoItem;
	6088	+ private MenuItem redoItem;
	6089	+ private JMenuItem duplicateItem;
5070	6090	private MenuItem cloneItem;
5071	6091	private MenuItem cloneSupportItem;
5072	6092	private MenuItem overwriteGeoItem;
..	..	@@ -5079,7 +6099,7 @@
5079	6099	private MenuItem linkverticesItem;
5080	6100	private MenuItem relinkverticesItem;
5081	6101	private MenuItem setMasterItem;
5082		- private MenuItem resetMeshItem;
	6102	+ private MenuItem resetAllItem;
5083	6103	private MenuItem stepAllItem;
5084	6104	private MenuItem revertMeshItem;
5085	6105	private MenuItem poseMeshItem;
..	..	@@ -5094,7 +6114,7 @@
5094	6114	private MenuItem pasteLinkItem;
5095	6115	private MenuItem pasteCloneItem;
5096	6116	private MenuItem pasteExpandItem;
5097		- private MenuItem clearItem;
	6117	+ private MenuItem deleteItem;
5098	6118	private MenuItem clearAllItem;
5099	6119	private MenuItem genUVItem;
5100	6120	private MenuItem genNormalsMESHItem;
..	..	@@ -5129,6 +6149,10 @@
5129	6149	private MenuItem showleavesItem;
5130	6150	private MenuItem markleavesItem;
5131	6151	private MenuItem unmarkleavesItem;
	6152	+ private MenuItem rewindleavesItem;
	6153	+ private MenuItem unrewindleavesItem;
	6154	+ private MenuItem randomleavesItem;
	6155	+ private MenuItem unrandomleavesItem;
5132	6156
5133	6157	private MenuItem flipVItem;
5134	6158	private MenuItem unflipVItem;
..	..	@@ -5140,15 +6164,17 @@
5140	6164	private MenuItem panoTexturesItem;
5141	6165
5142	6166	private MenuItem resetCentroidItem;
5143		- private MenuItem transformgeometryItem;
	6167	+ private MenuItem resetCentroidXZItem;
5144	6168	private MenuItem resetTransformItem;
	6169	+ private MenuItem transformGeometryItem;
	6170	+ private MenuItem transformChildrenItem;
5145	6171	private MenuItem hideItem;
5146	6172	private MenuItem grabItem;
5147	6173	private MenuItem backItem;
5148	6174	private MenuItem frontItem;
5149	6175	private MenuItem cameraItem;
5150	6176	private MenuItem compositeItem;
5151		- private MenuItem randomItem;
	6177	+ private MenuItem switchItem;
5152	6178	private MenuItem physicsItem;
5153	6179	private MenuItem frameselectorItem;
5154	6180	private MenuItem scriptNodeItem;
..	..	@@ -5172,6 +6198,8 @@
5172	6198	private MenuItem attachBumpItem;
5173	6199	private MenuItem detachBumpItem;
5174	6200	private MenuItem pigmentBumpItem;
	6201	+ private MenuItem embedTexturesItem;
	6202	+ private MenuItem deEmbedTexturesItem;
5175	6203
5176	6204	private MenuItem particleItem;
5177	6205	private MenuItem ragdollItem;
..	..	@@ -5210,11 +6238,6 @@
5210	6238	private MenuItem doubleItem;
5211	6239	private MenuItem tripleItem;
5212	6240
5213		- private MenuItem importGFDItem;
5214		- private MenuItem importVRMLX3DItem;
5215		- private MenuItem import3DSItem;
5216		- private MenuItem importOBJItem;
5217		-
5218	6241	private MenuItem computeAOItem;
5219	6242	private MenuItem recompileItem;
5220	6243	private MenuItem editScriptItem;
..	..	@@ -5224,4 +6247,8 @@
5224	6247	private MenuItem analyzeItem;
5225	6248	private MenuItem dumpItem;
5226	6249	//boolean freezemodel = false;
	6250	+
	6251	+ Menu cameraMenu;
	6252	+ MenuItem editCameraItem;
	6253	+ MenuItem restoreCameraItem;
5227	6254	}