~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,360 @@
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", !Globals.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : 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 AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,6 +415,16 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ assert(false);
	419	+
	420	+ if (copy.versionlist == null)
	421	+ {
	422	+ copy.versionlist = new Object3D[100];
	423	+ copy.versionindex = -1;
	424	+
	425	+ //Save(true);
	426	+ }
	427	+
63	428	if(ui)
64	429	SetupUI(objEditor);
65	430	}
..	..	@@ -74,16 +439,28 @@
74	439	this.copy = this.group = copy;
75	440	//selectees = this.group.selectees;
76	441
77		- SetupMenu2(objEditor);
	442	+ SetupMenu2(this); //objEditor);
78	443	SetupUI2(objEditor);
79	444	objEditor.SetupUI(true);
80	445	SetupViews(objEditor);
81	446
82	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	448	+
	449	+ if (copy.versionlist == null)
	450	+ {
	451	+ copy.versionlist = new Object3D[100];
	452	+ copy.versionindex = -1;
	453	+
	454	+ //Save(true);
	455	+ }
83	456	}
84	457
85	458	void CloneSelection(boolean supports)
86	459	{
	460	+ if (Globals.REPLACEONMAKE)
	461	+ Save();
	462	+ boolean keep = Globals.REPLACEONMAKE;
	463	+ Globals.REPLACEONMAKE = false;
87	464	// Object3D keep = GrafreeD.clipboard;
88	465	//Object3D obj;
89	466	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +471,19 @@
94	471
95	472	makeSomething(clone, i==group.selection.size()-1);
96	473	}
	474	+ Globals.REPLACEONMAKE = keep;
97	475	}
98	476
99	477	void CloneClipboard(boolean supports)
100	478	{
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));
	479	+ assert(Grafreed.clipboard.parent == null);
	480	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	481	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	482	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	483	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	484	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	485	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	486	+ Grafreed.clipboard.get(0).parent = keepparent;
109	487	}
110	488
111	489	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +497,7 @@
119	497	// obj.support = null;
120	498	if (!supports)
121	499	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	500	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	501	obj.parent = parent;
124	502	// obj.support = support;
125	503	// clone.support = support; // aout 2013
..	..	@@ -148,58 +526,153 @@
148	526
149	527	//JTextField nameField;
150	528
151		- void SetupMenu2(ObjEditor oe)
	529	+ void SetupMenu2(GroupEditor oe)
152	530	{
153		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
156		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
157		- oe.cameraMenu.add("-");
158		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
159		- openWindowItem.addActionListener(this);
160		- editLeafItem.addActionListener(this);
161		- lookAtItem.addActionListener(this);
162		- //lookFromItem.addActinoListener(this);
163		- //switchItem.addActionListener(this);
	531	+ oe.jTree = new cTree();
	532	+
164	533	Menu menu;
165	534	oe.menuBar.add(menu = new Menu("Edit"));
166	535	//editItem = menu.add(new MenuItem("Edit"));
167	536	//editItem.addActionListener(this);
168		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	537	+
	538	+// undoItem = menu.add(new MenuItem("Undo"));
	539	+// undoItem.addActionListener(this);
	540	+// redoItem = menu.add(new MenuItem("Redo"));
	541	+// redoItem.addActionListener(this);
	542	+// menu.add("-");
	543	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
169	544	duplicateItem.addActionListener(this);
170		- menu.add("-");
171		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
172	547	cloneItem.addActionListener(this);
	548	+ //if (Globals.ADVANCED)
	549	+ {
173	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174	551	cloneSupportItem.addActionListener(this);
	552	+ }
	553	+ oe.jTree.popup.addSeparator();
175	554	menu.add("-");
176		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
177	556	cutItem.addActionListener(this);
178		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
179	558	copyItem.addActionListener(this);
180	559	pasteItem = menu.add(new MenuItem("Paste"));
181	560	pasteItem.addActionListener(this);
182		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	561	+
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
	565	+ pasteIntoItem.addActionListener(this);
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
183	567	pasteLinkItem.addActionListener(this);
184		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
185	569	pasteCloneItem.addActionListener(this);
186		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
187	571	// pasteExpandItem.addActionListener(this);
188		- clearItem = menu.add(new MenuItem("Clear"));
189		- clearItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
	574	+
	575	+ if (Globals.ADVANCED)
	576	+ {
	577	+ // Deletes the cameras...
190	578	clearAllItem = menu.add(new MenuItem("Clear All"));
191	579	clearAllItem.addActionListener(this);
	580	+ }
	581	+
	582	+ menuBar.add(cameraMenu = new Menu("View"));
	583	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	584	+ //zBufferItem.addActionListener(this);
	585	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	586	+ //normalLensItem.addActionListener(this);
	587	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	588	+ restoreCameraItem.addActionListener(this);
	589	+
	590	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	591	+// toggleFullScreenItem.addItemListener(this);
	592	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	593	+// cameraMenu.add("-");
	594	+//
	595	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	596	+// toggleTextureItem.addItemListener(this);
	597	+// toggleTextureItem.setState(CameraPane.textureon);
	598	+//
	599	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	600	+// toggleSwitchItem.addItemListener(this);
	601	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	602	+
	603	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	604	+ toggleHandleItem.addItemListener(this);
	605	+ toggleHandleItem.setState(CameraPane.HANDLES);
	606	+
	607	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	608	+ togglePaintItem.addItemListener(this);
	609	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	610	+
	611	+ if (Globals.ADVANCED)
	612	+ {
	613	+ cameraMenu.add("-");
	614	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	615	+ toggleLiveItem.addItemListener(this);
	616	+ toggleLiveItem.setState(Globals.isLIVE());
192	617
	618	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	619	+ stepItem.addActionListener(this);
	620	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	621	+ // toggleDLItem.addItemListener(this);
	622	+ // toggleDLItem.setState(false);
	623	+
	624	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	625	+ toggleRenderItem.addItemListener(this);
	626	+ toggleRenderItem.setState(!CameraPane.frozen);
	627	+
	628	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	629	+ toggleDebugItem.addItemListener(this);
	630	+ toggleDebugItem.setState(Globals.DEBUG);
	631	+
	632	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	633	+ toggleFrustumItem.addItemListener(this);
	634	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	635	+
	636	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	637	+ toggleFootContactItem.addItemListener(this);
	638	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	639	+
	640	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	641	+ toggleTimelineItem.addItemListener(this);
	642	+ }
	643	+
	644	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	645	+// toggleRootItem.addItemListener(this);
	646	+// toggleRootItem.setState(false);
	647	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	648	+// animationItem.addItemListener(this);
	649	+// animationItem.setState(CameraPane.ANIMATION);
	650	+ cameraMenu.add("-");
	651	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	652	+ editCameraItem.addActionListener(this);
	653	+
	654	+ if (Globals.ADVANCED)
	655	+ {
	656	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	657	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	658	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	659	+ oe.cameraMenu.add("-");
	660	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	661	+ openWindowItem.addActionListener(this);
	662	+ lookAtItem.addActionListener(this);
	663	+ //lookFromItem.addActinoListener(this);
	664	+ //switchViewItem.addActionListener(this);
	665	+ }
	666	+
193	667	oe.menuBar.add(menu = new Menu("Setting"));
194		- resetMeshItem = menu.add(new MenuItem("Reset All"));
195		- resetMeshItem.addActionListener(this);
196		- stepAllItem = menu.add(new MenuItem("Step All"));
197		- stepAllItem.addActionListener(this);
	668	+ if (Globals.ADVANCED)
	669	+ {
198	670	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	671	revertMeshItem.addActionListener(this);
200	672	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	673	resetreferencesItem.addActionListener(this);
202	674	menu.add("-");
	675	+ }
203	676	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	677	overwriteGeoItem.addActionListener(this);
205	678	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,79 +684,111 @@
211	684	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	685	overwriteUVItem.addActionListener(this);
213	686	menu.add("-");
	687	+ if (Globals.ADVANCED)
	688	+ {
214	689	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	690	generateMeshItem.addActionListener(this);
216	691	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	692	poseMeshItem.addActionListener(this);
218	693	menu.add("-");
	694	+ }
219	695	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	696	resetsupportItem.addActionListener(this);
221	697	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	698	linkverticesItem.addActionListener(this);
223	699	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	700	relinkverticesItem.addActionListener(this);
	701	+
	702	+ if (Globals.ADVANCED)
	703	+ {
225	704	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	705	setMasterItem.addActionListener(this);
	706	+ }
227	707
228		- oe.menuBar.add(menu = new Menu("Group"));
229		- grabItem = menu.add(new MenuItem("Grab"));
230		- grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
231	710	backItem = menu.add(new MenuItem("Back"));
232	711	backItem.addActionListener(this);
233	712	frontItem = menu.add(new MenuItem("Front"));
234	713	frontItem.addActionListener(this);
235		- compositeItem = menu.add(new MenuItem("Composite"));
236		- compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	714	+// compositeItem = menu.add(new MenuItem("Composite"));
	715	+// compositeItem.addActionListener(this);
	716	+
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
	720	+ if (Globals.ADVANCED)
	721	+ {
	722	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	723	hideItem.addActionListener(this);
239		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ }
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
240	726	ungroupItem.addActionListener(this);
241		- menu.add("-");
242		- randomItem = menu.add(new MenuItem("Random"));
243		- randomItem.addActionListener(this);
244		- physicsItem = menu.add(new MenuItem("Physics"));
245		- physicsItem.addActionListener(this);
246		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
247		- frameselectorItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
	732	+
	733	+// menu.add("-");
	734	+//
	735	+// switchItem = menu.add(new MenuItem("Switch node"));
	736	+// switchItem.addActionListener(this);
	737	+ if (Globals.ADVANCED)
	738	+ {
248	739	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249	740	switchGeoItem.addActionListener(this);
250	741	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251	742	switchTransfoItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
	743	+ morphItem = menu.add(new MenuItem("Morph Group"));
253	744	morphItem.addActionListener(this);
	745	+
	746	+ menu.add("-");
	747	+ physicsItem = menu.add(new MenuItem("Physics"));
	748	+ physicsItem.addActionListener(this);
	749	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	750	+ frameselectorItem.addActionListener(this);
254	751	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	752	scriptNodeItem.addActionListener(this);
256		- cameraItem = menu.add(new MenuItem("Camera"));
257		- cameraItem.addActionListener(this);
	753	+ }
258	754
259	755	oe.menuBar.add(menu = new Menu("Object"));
260		- textureItem = menu.add(new MenuItem("Texture"));
261		- textureItem.addActionListener(this);
	756	+// textureItem = menu.add(new MenuItem("Texture"));
	757	+// textureItem.addActionListener(this);
262	758	billboardItem = menu.add(new MenuItem("Billboard"));
263	759	billboardItem.addActionListener(this);
264	760	csgItem = menu.add(new MenuItem("CSG"));
265	761	csgItem.addActionListener(this);
266		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	762	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267	763	shadowXItem.addActionListener(this);
268		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	764	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269	765	shadowYItem.addActionListener(this);
270		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	766	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271	767	shadowZItem.addActionListener(this);
	768	+ attributeItem = menu.add(new MenuItem("Attribute"));
	769	+ attributeItem.addActionListener(this);
	770	+
	771	+ if (Globals.ADVANCED)
	772	+ {
	773	+ menu.add("-");
272	774	linkerItem = menu.add(new MenuItem("Linker"));
273	775	linkerItem.addActionListener(this);
274	776	templateItem = menu.add(new MenuItem("Template"));
275	777	templateItem.addActionListener(this);
276		- attributeItem = menu.add(new MenuItem("Attribute"));
277		- attributeItem.addActionListener(this);
278	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	779	pointflowItem.addActionListener(this);
	780	+ }
280	781	menu.add("-");
281	782	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	783	resetTransformItem.addActionListener(this);
283	784	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	785	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	786	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	787	+ resetCentroidXZItem.addActionListener(this);
	788	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	789	+ transformGeometryItem.addActionListener(this);
	790	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	791	+ transformChildrenItem.addActionListener(this);
287	792
288	793	oe.menuBar.add(menu = new Menu("Geometry"));
289	794	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +799,11 @@
294	799	genNormalsCADItem.addActionListener(this);
295	800	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	801	genNormalsMESHItem.addActionListener(this);
297		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	802	+ if (Globals.ADVANCED)
	803	+ {
	804	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
298	805	genNormalsMINEItem.addActionListener(this);
	806	+ }
299	807	stripifyItem = menu.add(new MenuItem("Stripify"));
300	808	stripifyItem.addActionListener(this);
301	809	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,31 +825,50 @@
317	825	reduce34MeshItem.addActionListener(this);
318	826	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	827	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	828	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	829	clipMeshItem.addActionListener(this);
	830	+
	831	+ if (Globals.ADVANCED)
	832	+ {
	833	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	834	+ smoothMeshItem.addActionListener(this);
	835	+ }
324	836
325	837	oe.menuBar.add(menu = new Menu("Attributes"));
326	838	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	839	clearMaterialsItem.addActionListener(this);
	840	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	841	+ resetAllItem.addActionListener(this);
	842	+ stepAllItem = menu.add(new MenuItem("Step All"));
	843	+ stepAllItem.addActionListener(this);
328	844	menu.add("-");
329	845	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	846	liveleavesItem.addActionListener(this);
331	847	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	848	unliveleavesItem.addActionListener(this);
	849	+ if (Globals.ADVANCED)
	850	+ {
333	851	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	852	supportleavesItem.addActionListener(this);
335	853	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	854	unsupportleavesItem.addActionListener(this);
	855	+ }
337	856	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	857	hideleavesItem.addActionListener(this);
339	858	showleavesItem = menu.add(new MenuItem("Show Leaves"));
340	859	showleavesItem.addActionListener(this);
341		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	860	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
342	861	markleavesItem.addActionListener(this);
343		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	862	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
344	863	unmarkleavesItem.addActionListener(this);
	864	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	865	+ rewindleavesItem.addActionListener(this);
	866	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	867	+ unrewindleavesItem.addActionListener(this);
	868	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	869	+ randomleavesItem.addActionListener(this);
	870	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	871	+ unrandomleavesItem.addActionListener(this);
345	872	menu.add("-");
346	873	flipVItem = menu.add(new MenuItem("Flip V"));
347	874	flipVItem.addActionListener(this);
..	..	@@ -367,53 +894,135 @@
367	894	attachBumpItem.addActionListener(this);
368	895	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
369	896	pigmentBumpItem.addActionListener(this);
	897	+ //embedTexturesItem
370	898	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
371	899	detachPigmentItem.addActionListener(this);
372	900	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
373	901	detachBumpItem.addActionListener(this);
	902	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	903	+ embedTexturesItem.addActionListener(this);
	904	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	905	+ deEmbedTexturesItem.addActionListener(this);
374	906	menu.add("-");
375	907	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
376	908	sortbysizeItem.addActionListener(this);
377	909	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	910	sortbynameItem.addActionListener(this);
379	911	menu.add("-");
	912	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	913	+ shareGeometriesItem.addActionListener(this);
	914	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	915	+ mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
	919	+ if (Globals.ADVANCED)
	920	+ {
	921	+ // Pretty much the same as duplicate and clone.
380	922	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	923	extractGeometriesItem.addActionListener(this);
382	924	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	925	cloneGeometriesItem.addActionListener(this);
384		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
385		- shareGeometriesItem.addActionListener(this);
386		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387		- mergeGeometriesItem.addActionListener(this);
	926	+ }
388	927
389	928	oe.menuBar.add(menu = new Menu("Insert"));
390	929	buildCreateMenu(menu);
391	930
392		-
393		- oe.menuBar.add(menu = new Menu("Include"));
394		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
395		- importGFDItem.addActionListener(this);
396		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
397		- importVRMLX3DItem.addActionListener(this);
398		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
399		- importOBJItem.addActionListener(this);
400		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
401		- import3DSItem.addActionListener(this);
402		-
403	931	oe.menuBar.add(menu = new Menu("Tools"));
404	932	buildToolsMenu(menu);
405	933	}
406	934
	935	+ JTabbedPane resourcecontainer;
	936	+ cGridBag currenttab;
	937	+ //boolean added; // patch for jar
	938	+
	939	+ int totalcount = 0;
	940	+
	941	+ int tabcount = 0;
	942	+ int colcount = 0;
	943	+ int rowcount = 0;
	944	+ int texturecount = 0;
	945	+
	946	+ int columns = 5;
	947	+ int rows = 7;
	948	+
	949	+ public void ResourceCallBack(String[] path)
	950	+ {
	951	+// for (int i = 0; i < path.length; i++)
	952	+// System.out.print(path[i] + "/");
	953	+// System.out.println();
	954	+
	955	+ if (//rowcount == 0 \|\|
	956	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	957	+ {
	958	+ currenttab = new cGridBag();
	959	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	960	+ currenttab.setName(tabname);
	961	+ //added = false;
	962	+ resourcecontainer.add(currenttab);
	963	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	964	+ rowcount = 1;
	965	+ colcount = 0;
	966	+ texturecount = 0;
	967	+ }
	968	+
	969	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	970	+ {
	971	+ //if (!added)
	972	+ {
	973	+ //added = true;
	974	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	975	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	976	+ }
	977	+
	978	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	979	+ totalcount++;
	980	+
	981	+ if (++colcount >= columns)
	982	+ {
	983	+ colcount = 0;
	984	+ currenttab.Return();
	985	+
	986	+ if (rowcount++ >= rows)
	987	+ {
	988	+ rowcount = 0;
	989	+ }
	990	+ }
	991	+ }
	992	+ else
	993	+ {
	994	+// if (!path[path.length-1].equals("icons"))
	995	+// resourcecontainer.Return();
	996	+ }
	997	+ }
	998	+
	999	+ void CreateTexturePanel(cGridBag container)
	1000	+ {
	1001	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1002	+ container.add(resourcecontainer);
	1003	+
	1004	+ Grafreed.ParseResources("textures", this);
	1005	+
	1006	+ // 935. System.out.println("Total = " + totalcount);
	1007	+ }
	1008	+
407	1009	void SetupUI2(ObjEditor oe)
408	1010	{
	1011	+ // June 2019
	1012	+ if (oe == null)
	1013	+ {
	1014	+ //super.SetupUI2(this);
	1015	+ //return;
	1016	+ }
	1017	+
	1018	+ if (copy != group)
	1019	+ {
	1020	+ //super.SetupUI2(this);
	1021	+ }
	1022	+
409	1023	//new Exception().printStackTrace();
410	1024
411	1025	oe.radioPanel = new JPanel(new GridBagLayout());
412		- oe.aConstraints.weightx = 1;
413		- oe.aConstraints.weighty = 0;
414		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
415		- oe.aConstraints.gridwidth = 100;
416		- oe.aConstraints.gridheight = 1;
417	1026	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
418	1027
419	1028	oe.buttonGroup = new ButtonGroup();
..	..	@@ -434,92 +1043,268 @@
434	1043	oe.radioPanel.add(dummyButton);
435	1044	oe.buttonGroup.add(dummyButton);
436	1045	*/
	1046	+ cGridBag versionManagerPanel = new cGridBag();
	1047	+
	1048	+ versionManagerPanel.preferredHeight = 4;
	1049	+
437	1050	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	1051
439		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440		- liveCB.setToolTipText("Enabled animation");
441		- liveCB.addItemListener(this);
442		-
443		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
444		- trackCB.setToolTipText("Enable tracking");
445		- trackCB.addItemListener(this);
446		-
447		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1052	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1053	+ //minButton.setToolTipText("Minimize window");
	1054	+ //minButton.addActionListener(this);
	1055	+
	1056	+ if (Globals.ADVANCED)
	1057	+ {
	1058	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+// maxButton.setToolTipText("Maximize window");
	1060	+// maxButton.addActionListener(this);
	1061	+ }
	1062	+
	1063	+ cButton gcButton;
	1064	+
	1065	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1066	+// gcButton.setToolTipText("Garbage collect");
	1067	+// gcButton.addActionListener(new ActionListener()
	1068	+// {
	1069	+// public void actionPerformed(ActionEvent e)
	1070	+// {
	1071	+// System.gc();
	1072	+// }
	1073	+// });
	1074	+
	1075	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1076	+ collapseButton.setToolTipText("Collapse toolbar");
	1077	+ collapseButton.addActionListener(this);
	1078	+
	1079	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1080	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1081	+ maximize3DButton.addActionListener(this);
	1082	+
	1083	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ twoButton.setToolTipText("Show 3D view only");
	1085	+ twoButton.addActionListener(this);
	1086	+ this.fullscreenLayout = twoButton;
	1087	+
	1088	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ threeButton.setToolTipText("Show controls and 3D view");
	1090	+ threeButton.addActionListener(this);
	1091	+ if (Globals.ADVANCED)
	1092	+ {
	1093	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1094	+ sixButton.setToolTipText("Show 3D view and controls");
	1095	+ sixButton.addActionListener(this);
	1096	+ }
	1097	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+// sevenButton.setToolTipText("3-column layout");
	1099	+// sevenButton.addActionListener(this);
	1100	+ //
	1101	+
	1102	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ fullButton.setToolTipText("Full-screen window");
	1104	+ fullButton.addActionListener(this);
	1105	+
	1106	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
448	1107	screenfitButton.setToolTipText("Screen fit");
449	1108	screenfitButton.addActionListener(this);
450	1109
	1110	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1111	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1112	+ restoreCameraButton.addActionListener(this);
	1113	+
	1114	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ saveVersionButton.setToolTipText("Duplicate current version");
	1116	+ saveVersionButton.addActionListener(this);
	1117	+
	1118	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ deleteVersionButton.setToolTipText("Delete current version");
	1120	+ deleteVersionButton.addActionListener(this);
	1121	+ deleteVersionButton.setEnabled(false);
	1122	+
	1123	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ previousVersionButton.setToolTipText("Previous version");
	1125	+ previousVersionButton.addActionListener(this);
	1126	+ previousVersionButton.setEnabled(false);
	1127	+
	1128	+ cGridBag updown = new cGridBag().setVertical(true);
	1129	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ restoreButton.setToolTipText("Undo (restore current version)");
	1131	+ restoreButton.addActionListener(this);
	1132	+ restoreButton.setEnabled(false);
	1133	+
	1134	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ replaceButton.setToolTipText("Save (replace current version)");
	1136	+ replaceButton.addActionListener(this);
	1137	+ replaceButton.setEnabled(false);
	1138	+
	1139	+ versionManagerPanel.add(updown);
	1140	+
	1141	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1142	+ nextVersionButton.setToolTipText("Next version");
	1143	+ nextVersionButton.addActionListener(this);
	1144	+ nextVersionButton.setEnabled(false);
	1145	+
	1146	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1147	+ oneStepButton.setToolTipText("Animate one step forward");
	1148	+ oneStepButton.addActionListener(this);
	1149	+
	1150	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1151	+ liveCB.setToolTipText("Enable animation");
	1152	+ liveCB.addItemListener(this);
	1153	+
	1154	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1155	+ fastCB.setToolTipText("Fast mode");
	1156	+ fastCB.addItemListener(this);
	1157	+
	1158	+ //oe.toolboxPanel.Return();
	1159	+
	1160	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1161	+// trackCB.setToolTipText("Enable tracking");
	1162	+// trackCB.addItemListener(this);
	1163	+
451	1164	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
452	1165	// screenfitpointButton.addActionListener(this);
453		-// oe.aConstraints.gridx += 1;
454		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
455		- snapobjectButton.addActionListener(this);
456		- snapobjectButton.setToolTipText("Snap Object");
457		- oe.aConstraints.gridx += 1;
458	1166
459		- //aConstraints.gridx = 0;
460		- //aConstraints.gridy += 1;
461		- oe.aConstraints.weighty = 0;
462		- oe.aConstraints.gridwidth = 1;
463		-
464		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
465		- flashSelectionButton.setToolTipText("Show selection");
466		- flashSelectionButton.addActionListener(this);
467		-
468		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
469		-
470		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
471		- twoButton.setToolTipText("Show center view only");
472		- twoButton.addActionListener(this);
473		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1167	+ if (Globals.ADVANCED)
	1168	+ {
	1169	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1170	+ snapobjectButton.addActionListener(this);
	1171	+ snapobjectButton.setToolTipText("Snap Object");
	1172	+
	1173	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
474	1174	fourButton.addActionListener(this);
475		- fourButton.setToolTipText("Show left panel only");
476		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
477		- sixButton.setToolTipText("2-column layout left");
478		- sixButton.addActionListener(this);
479		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
480		- threeButton.setToolTipText("2-column layout right");
481		- threeButton.addActionListener(this);
482		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
483		- sevenButton.setToolTipText("3-column layout");
484		- sevenButton.addActionListener(this);
485		- //
	1175	+ fourButton.setToolTipText("Show control panel only");
	1176	+ }
486	1177
487		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
488		- rootButton.setToolTipText("Edit selection in new tab");
	1178	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1179	+
	1180	+
	1181	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1182	+ rootButton.setToolTipText("Open selection in new tab");
489	1183	rootButton.addActionListener(this);
490	1184
491		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
492	1186	closeButton.setToolTipText("Close tab");
493	1187	closeButton.addActionListener(this);
494	1188	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
495	1189	//clearButton.addActionListener(this);
496		-
497		- cGridBag commandsPanel = new cGridBag();
	1190	+
	1191	+ cGridBag row1 = new cGridBag();
498	1192
499		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
500		- editButton.setToolTipText("Edit selection");
	1193	+ // INSERT
	1194	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ gridButton.setToolTipText("Create ground");
	1196	+ gridButton.addActionListener(this);
	1197	+
	1198	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ boxButton.setToolTipText("Create box");
	1200	+ boxButton.addActionListener(this);
	1201	+
	1202	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1203	+ superButton.setToolTipText("Create superellipsoid");
	1204	+ superButton.addActionListener(this);
	1205	+
	1206	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ sphereButton.setToolTipText("Create sphere");
	1208	+ sphereButton.addActionListener(this);
	1209	+
	1210	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ coneButton.setToolTipText("Create cone");
	1212	+ coneButton.addActionListener(this);
	1213	+
	1214	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ torusButton.setToolTipText("Create torus");
	1216	+ torusButton.addActionListener(this);
	1217	+
	1218	+ if (Globals.ADVANCED)
	1219	+ {
	1220	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1221	+ kleinButton.setToolTipText("Create Klein bottle");
	1222	+ kleinButton.addActionListener(this);
	1223	+ }
	1224	+
	1225	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ particlesButton.setToolTipText("Create particle system");
	1227	+ particlesButton.addActionListener(this);
	1228	+
	1229	+ oe.toolboxPanel.add(row1);
	1230	+
	1231	+ cGridBag row2 = new cGridBag();
	1232	+
	1233	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ groupButton.setToolTipText("Create group");
	1235	+ groupButton.addActionListener(this);
	1236	+
	1237	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1238	+ compositeButton.setToolTipText("Create composite");
	1239	+ compositeButton.addActionListener(this);
	1240	+
	1241	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1242	+ switchButton.setToolTipText("Create item switcher");
	1243	+ switchButton.addActionListener(this);
	1244	+
	1245	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ loopButton.setToolTipText("Create loop");
	1247	+ loopButton.addActionListener(this);
	1248	+
	1249	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ textureButton.setToolTipText("Create texture");
	1251	+ textureButton.addActionListener(this);
	1252	+
	1253	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1254	+ overlayButton.setToolTipText("Create overlay");
	1255	+ overlayButton.addActionListener(this);
	1256	+
	1257	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1258	+ lightButton.setToolTipText("Create light");
	1259	+ lightButton.addActionListener(this);
	1260	+
	1261	+ oe.toolboxPanel.add(row2);
	1262	+
	1263	+ cGridBag textures = new cGridBag();
	1264	+
	1265	+ CreateTexturePanel(textures);
	1266	+
	1267	+ int tabCount = resourcecontainer.getTabCount();
	1268	+
	1269	+ if (tabCount > 0)
	1270	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1271	+
	1272	+ oe.toolboxPanel.add(textures);
	1273	+
	1274	+ textures.preferredHeight = 100;
	1275	+
	1276	+ CreateSkyboxPanel(oe.skyboxPanel);
	1277	+
	1278	+ // EDIT panel
	1279	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1280	+ editButton.setToolTipText("Pin selection controls");
501	1281	editButton.addActionListener(this);
502	1282
503		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504		- uneditButton.setToolTipText("Unedit selection");
	1283	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1284	+ uneditButton.setToolTipText("Unpin and remove selection controls");
505	1285	uneditButton.addActionListener(this);
506	1286
507		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
508		- clearPanelButton.setToolTipText("Clear edit panel");
509		- clearPanelButton.addActionListener(this);
510		-
511		- commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
512		- allParamsButton.setToolTipText("All params??");
	1287	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1288	+ allParamsButton.setToolTipText("Show all controls");
513	1289	allParamsButton.addActionListener(this);
514	1290
515		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
516		- unselectButton.setToolTipText("Unselect");
517		- unselectButton.addActionListener(this);
	1291	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ clearPanelButton.setToolTipText("Clear all controls");
	1293	+ clearPanelButton.addActionListener(this);
518	1294
519		- commandsPanel.preferredHeight = 1;
	1295	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1296	+ //unselectButton.setToolTipText("Unselect");
	1297	+ //unselectButton.addActionListener(this);
	1298	+
	1299	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1300	+ flashSelectionButton.setToolTipText("Highlight selection");
	1301	+ flashSelectionButton.addActionListener(this);
520	1302
521		- oe.treePanel.add(commandsPanel);
522		- oe.treePanel.Return();
	1303	+ editCommandsPanel.preferredHeight = 1;
	1304	+
	1305	+ SetPinStates(false);
	1306	+// oe.treePanel.add(commandsPanel);
	1307	+// oe.treePanel.Return();
523	1308
524	1309	// oe.aConstraints.gridx += 1;
525	1310	// oe.aConstraints.weighty = 0;
..	..	@@ -534,34 +1319,24 @@
534	1319
535	1320	cGridBag jSPPanel = new cGridBag();
536	1321
	1322	+ jSPPanel.preferredHeight = 20;
	1323	+
537	1324	JScrollPane jSP;
538	1325	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
539		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1326	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
540	1327	ResetModel();
541	1328
542	1329	oe.treePanel.add(jSPPanel);
543	1330	oe.treePanel.Return();
544	1331
545		- cGridBag copyOptionsPanel = new cGridBag();
546		-
547		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
548		- colorCB.setToolTipText("Copy color when dropped");
549		- colorCB.addItemListener(this);
550		-
551		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
552		- materialCB.setToolTipText("Copy material when dropped");
553		- materialCB.addItemListener(this);
554		-
555		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
556		- textureCB.setToolTipText("Copy texture when dropped");
557		- textureCB.addItemListener(this);
558		-
559		- copyOptionsPanel.preferredHeight = 1;
560		- oe.treePanel.add(copyOptionsPanel);
	1332	+ oe.treePanel.add(versionManagerPanel);
561	1333	oe.treePanel.Return();
	1334	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1335	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1336	+ versionSliderPane.preferredHeight = 3;
562	1337
563		-// mainPanel.setDividerLocation(0.5); //1.0);
564		-// mainPanel.setResizeWeight(0.5);
	1338	+// mainPanel.setDividerLocation(0.1); //1.0);
	1339	+ mainPanel.setResizeWeight(0.4);
565	1340
566	1341	//jList.addListSelectionListener(this);
567	1342	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -569,7 +1344,7 @@
569	1344	//jTree.setEditable(true);
570	1345	oe.jTree.setDragEnabled(true);
571	1346	//jTree.setPreferredSize(new Dimension(10,10));
572		- jSP.setPreferredSize(new Dimension(100,200));
	1347	+ //jSP.setPreferredSize(new Dimension(100,200));
573	1348
574	1349	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
575	1350
..	..	@@ -581,53 +1356,70 @@
581	1356	dgr.addDragGestureListener(this);
582	1357	}catch(Exception e) {}
583	1358	*/
584		- radio.layout = sevenButton;
	1359	+ radio.layout = threeButton; // sixButton;
585	1360	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
586	1361	}
587	1362
588	1363	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
589	1364	{
590		- //constraints.gridx = 0;
591		- //constraints.gridy = 0;
592		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
593		- fastCB.setToolTipText("Fast mode");
594		- fastCB.addItemListener(this);
595		- //constraints.gridy += 1;
596		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
597		- supportCB.setToolTipText("Enabled rigging");
598		- supportCB.addItemListener(this);
	1365	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1366	+ colorCB.setToolTipText("Copy color when dropped");
	1367	+ colorCB.addItemListener(this);
599	1368
600		- // constraints.gridy += 1;
	1369	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1370	+ materialCB.setToolTipText("Copy material when dropped");
	1371	+ materialCB.addItemListener(this);
	1372	+
	1373	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1374	+ textureCB.setToolTipText("Copy texture when dropped");
	1375	+ textureCB.addItemListener(this);
	1376	+
	1377	+ panel.Return();
	1378	+
	1379	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1380	+ boxCB.setToolTipText("Display bounding boxes");
	1381	+ boxCB.addItemListener(this);
	1382	+
	1383	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1384	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1385	+ zoomBoxCB.addItemListener(this);
	1386	+
	1387	+ if (true) // Globals.ADVANCED)
	1388	+ {
	1389	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1390	+// supportCB.setToolTipText("Enable rigging");
	1391	+// supportCB.addItemListener(this);
	1392	+
	1393	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1394	+ freezeCB.setToolTipText("Fast moving camera");
	1395	+ freezeCB.addItemListener(this);
	1396	+
601	1397	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
602	1398	// localCB.addItemListener(this);
603	1399
604		- //constraints.gridy += 1;
	1400	+ panel.Return();
	1401	+
605	1402	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
606	1403	crowdCB.setToolTipText("Used for crowds");
607	1404	crowdCB.addItemListener(this);
608	1405
609		- //constraints.gridy += 1;
610	1406	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
611	1407	smoothCB.setToolTipText("Snapping delay");
612	1408	smoothCB.addItemListener(this);
613	1409
614		- //constraints.gridy += 1;
615		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
616		- slowCB.setToolTipText("Smooth interpolation");
617		- slowCB.addItemListener(this);
618		- //constraints.gridy += 1;
619		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
620		- boxCB.setToolTipText("Display bounding boxes");
621		- boxCB.addItemListener(this);
622		- //constraints.gridy += 1;
623		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
624		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
625		- zoomBoxCB.addItemListener(this);
626		-
	1410	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1411	+// slowCB.setToolTipText("Smooth interpolation");
	1412	+// slowCB.addItemListener(this);
	1413	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1414	+ minshaderCB.setToolTipText("Minimal fast shader");
	1415	+ minshaderCB.addItemListener(this);
	1416	+
627	1417	// constraints.gridy += 1;
628	1418	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
629	1419	// speakerMocapCB.addItemListener(this);
630	1420
	1421	+ panel.Return();
	1422	+
631	1423	if (false)
632	1424	{
633	1425	// handled in scripts
..	..	@@ -642,67 +1434,126 @@
642	1434	//constraints.gridy += 1;
643	1435	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
644	1436	smoothfocusCB.addItemListener(this);
	1437	+ panel.Return();
645	1438	}
646	1439
647	1440	//constraints.gridx += 1;
648	1441	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
649	1442	// debugCB.addItemListener(this);
650	1443
651		- //constraints.gridy += 1;
	1444	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1445	+ trackCB.setToolTipText("Enable tracking target");
	1446	+ trackCB.addItemListener(this);
	1447	+
652	1448	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1449	+ oeilCB.setToolTipText("Move camera when tracking");
653	1450	oeilCB.addItemListener(this);
654	1451
655		- //constraints.gridy += 1;
	1452	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1453	+ shadowCB.setToolTipText("When live compute shadows");
	1454	+ shadowCB.addItemListener(this);
	1455	+
	1456	+ panel.Return();
	1457	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1458	+ toggleTextureCB.setToolTipText("Load textures");
	1459	+ toggleTextureCB.addItemListener(this);
	1460	+
	1461	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1462	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1463	+ toggleSwitchCB.addItemListener(this);
	1464	+
	1465	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1466	+ autokeepCB.setToolTipText("On structure change");
	1467	+ autokeepCB.addItemListener(this);
	1468	+
	1469	+ panel.Return();
	1470	+ if (Globals.ADVANCED)
	1471	+ {
656	1472	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
657	1473	lookAtCB.setToolTipText("Look-at target");
658	1474	lookAtCB.addItemListener(this);
	1475	+ }
	1476	+
	1477	+ }
659	1478
660	1479	cGridBag fill = new cGridBag();
661		-
662	1480	fill.preferredHeight = 200;
	1481	+ cGridBag fill2 = new cGridBag();
	1482	+ fill2.preferredHeight = 200;
	1483	+ cGridBag fill3 = new cGridBag();
	1484	+ fill3.preferredHeight = 200;
663	1485
664	1486	panel.add(fill);
	1487	+ panel.add(fill2);
	1488	+ panel.add(fill3);
665	1489
666	1490	}
667	1491
668	1492	void EditObject(Object3D obj)
669	1493	{
	1494	+ assert(obj instanceof Composite);
	1495	+
	1496	+// if (obj.versionlist == null)
	1497	+// {
	1498	+// obj.versionlist = new Object3D[100];
	1499	+// obj.versionindex = -1;
	1500	+// }
	1501	+
670	1502	cRadio radioButton = new cRadio(obj.name);
	1503	+
	1504	+ // June 2019. Patch to avoid bug with transparency.
	1505	+ radioButton.hadMaterial = obj.material != null;
	1506	+ if (!radioButton.hadMaterial)
	1507	+ {
	1508	+ obj.material = new cMaterial();
	1509	+ }
	1510	+
671	1511	radioButton.SetObject(obj);
672		- radioButton.layout = sevenButton;
	1512	+ radioButton.layout = threeButton; // sixButton;
673	1513	radioButton.SetCamera(cameraView.renderCamera, false);
674	1514	radioButton.addActionListener(this);
675	1515	radioPanel.add(radioButton);
676	1516	buttonGroup.add(radioButton);
677	1517	radioButton.doClick();
678	1518	}
	1519	+
679	1520	void SetupViews(ObjEditor oe)
680	1521	{
	1522	+ theFrame = this;
	1523	+
681	1524	oe.SetupViews();
682	1525
	1526	+ if (Globals.DEBUG)
683	1527	System.out.println("SetupViews");
684	1528	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
685	1529	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
686	1530	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
687	1531	}
688	1532
689		- JCheckBox liveCB;
690		- JCheckBox supportCB;
691		- JCheckBox localCB;
692		- JCheckBox crowdCB;
693		- JCheckBox smoothCB;
694		- JCheckBox fastCB;
695		- JCheckBox slowCB;
696		- JCheckBox boxCB;
697		- JCheckBox zoomBoxCB;
698		- JCheckBox trackCB;
699		- JCheckBox smoothfocusCB;
	1533	+ cToggleButton liveCB;
	1534	+ cCheckBox supportCB;
	1535	+ cCheckBox localCB;
	1536	+ cCheckBox crowdCB;
	1537	+ cCheckBox smoothCB;
	1538	+ cCheckBox minshaderCB;
	1539	+
	1540	+ cToggleButton fastCB;
	1541	+ cCheckBox slowCB;
	1542	+ cCheckBox boxCB;
	1543	+ cCheckBox zoomBoxCB;
	1544	+ cCheckBox freezeCB;
	1545	+ //cToggleButton trackCB;
	1546	+ cCheckBox trackCB;
	1547	+ cCheckBox smoothfocusCB;
700	1548	// JCheckBox speakerMocapCB;
701		- JCheckBox speakerCameraCB;
702		- JCheckBox speakerFocusCB;
703		- JCheckBox debugCB;
704		- JCheckBox oeilCB;
705		- JCheckBox lookAtCB;
	1549	+ cCheckBox speakerCameraCB;
	1550	+ cCheckBox speakerFocusCB;
	1551	+ cCheckBox debugCB;
	1552	+
	1553	+ cCheckBox oeilCB;
	1554	+ cCheckBox shadowCB;
	1555	+ cCheckBox autokeepCB;
	1556	+ cCheckBox lookAtCB;
706	1557
707	1558	// static int COLOR = 1;
708	1559	// static int MATERIAL = 2;
..	..	@@ -710,9 +1561,9 @@
710	1561
711	1562	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
712	1563
713		- JCheckBox colorCB;
714		- JCheckBox materialCB;
715		- JCheckBox textureCB;
	1564	+ cCheckBox colorCB;
	1565	+ cCheckBox materialCB;
	1566	+ cCheckBox textureCB;
716	1567
717	1568	public void itemStateChanged(ItemEvent e)
718	1569	{
..	..	@@ -740,6 +1591,7 @@
740	1591	} else if(e.getSource() == liveCB)
741	1592	{
742	1593	cameraView.ToggleLive();
	1594	+ refreshContents(false);
743	1595	}
744	1596	else if(e.getSource() == supportCB)
745	1597	{
..	..	@@ -755,6 +1607,12 @@
755	1607	{
756	1608	cameraView.ToggleInertia();
757	1609	cameraView.repaint();
	1610	+ }
	1611	+ else if(e.getSource() == minshaderCB)
	1612	+ {
	1613	+ Globals.MINSHADER ^= true;
	1614	+ cameraView.programInitialized = false;
	1615	+ cameraView.repaint();
758	1616	}
759	1617	else if(e.getSource() == localCB)
760	1618	{
..	..	@@ -804,6 +1662,18 @@
804	1662	{
805	1663	cameraView.ToggleOeil();
806	1664	}
	1665	+ else if(e.getSource() == shadowCB)
	1666	+ {
	1667	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1668	+ }
	1669	+ else if(e.getSource() == freezeCB)
	1670	+ {
	1671	+ Globals.FREEZEONMOVE ^= true;
	1672	+ }
	1673	+ else if(e.getSource() == autokeepCB)
	1674	+ {
	1675	+ Globals.REPLACEONMAKE ^= true;
	1676	+ }
807	1677	else if(e.getSource() == lookAtCB)
808	1678	{
809	1679	cameraView.ToggleLookAt();
..	..	@@ -820,7 +1690,8 @@
820	1690
821	1691	/**/
822	1692	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
823		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1693	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1694	+ TreePath path = objEditor.jTree.getSelectionPath();
824	1695	if ((path == null) \|\| (path.getPathCount() <= 1)) {
825	1696	// We can't move the root node or an empty selection
826	1697	return;
..	..	@@ -883,8 +1754,6 @@
883	1754	}
884	1755	}
885	1756
886		- String string = (String) object;
887		-
888	1757	System.out.println("Transfer = " + object + "; drop : " + target);
889	1758	// if( object instanceof java.io.File[])
890	1759	// {
..	..	@@ -892,7 +1761,11 @@
892	1761	// objEditor.DropFile((java.io.File[]) object, true);
893	1762	// return;
894	1763	// }
895		- if (string.charAt(0) == '/')
	1764	+
	1765	+ String string = object.toString();
	1766	+
	1767	+ // File path for Mac and Windows
	1768	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
896	1769	{
897	1770	// file(s)
898	1771	String[] names = string.split("\n");
..	..	@@ -919,7 +1792,7 @@
919	1792
920	1793	flashIt = false;
921	1794	CameraPane pane = (CameraPane) target;
922		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1795	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
923	1796	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
924	1797
925	1798	if (group.selection.size() == 1)
..	..	@@ -935,23 +1808,33 @@
935	1808
936	1809	assert target == objEditor.jTree;
937	1810	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1811	+ Object3D destinationLeaf;
938	1812	try {
939		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1813	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
940	1814	} catch (Exception e) {
941	1815	System.out.println("destinationPath : " + destinationPath);
942	1816	return;
943	1817	}
944	1818
945		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1819	+ for (int i=group.selection.size(); --i>=0;)
946	1820	{
	1821	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1822	+
	1823	+ // Cannot move into itself
	1824	+ if (child == destinationLeaf)
	1825	+ return;
	1826	+ }
	1827	+
	1828	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1829	+// {
947	1830	loadClipboard(true);
948	1831	objEditor.jTree.setSelectionPath(destinationPath);
949		- pasteInto(false);
950		- } else {
951		- loadClipboard(false);
952		- objEditor.jTree.setSelectionPath(destinationPath);
953		- pasteInto(false); // true); // ???
954		- }
	1832	+ pasteInto(false, false);
	1833	+// } else {
	1834	+// loadClipboard(false);
	1835	+// objEditor.jTree.setSelectionPath(destinationPath);
	1836	+// pasteInto(false, false); // true); // ???
	1837	+// }
955	1838	}
956	1839	public void dropActionChanged(DropTargetDragEvent dtde)
957	1840	// Called if the user has modified the current drop gesture
..	..	@@ -1007,7 +1890,12 @@
1007	1890	TreePath path;
1008	1891
1009	1892	public TransferableTreePath(TreePath tp) {
1010		- path = tp;
	1893	+ Object[] objs = new Object[tp.getPathCount()];
	1894	+ for (int i=0; i<objs.length; i++)
	1895	+ {
	1896	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1897	+ }
	1898	+ path = new TreePath(objs);
1011	1899	}
1012	1900
1013	1901	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1056,85 +1944,107 @@
1056	1944	{
1057	1945	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1058	1946	//heightFieldItem.addActionListener(this);
1059		- gridItem = menu.add(new MenuItem("Grid"));
1060		- gridItem.addActionListener(this);
1061		- rectoidItem = menu.add(new MenuItem("Box"));
1062		- rectoidItem.addActionListener(this);
1063		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1064		- ellipsoidItem.addActionListener(this);
1065		- coneItem = menu.add(new MenuItem("Cone"));
1066		- coneItem.addActionListener(this);
1067		- torusItem = menu.add(new MenuItem("Torus"));
1068		- torusItem.addActionListener(this);
1069		- superItem = menu.add(new MenuItem("Superellipsoid"));
1070		- superItem.addActionListener(this);
	1947	+// gridItem = menu.add(new MenuItem("Grid"));
	1948	+// gridItem.addActionListener(this);
	1949	+// rectoidItem = menu.add(new MenuItem("Box"));
	1950	+// rectoidItem.addActionListener(this);
	1951	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1952	+// ellipsoidItem.addActionListener(this);
	1953	+// coneItem = menu.add(new MenuItem("Cone"));
	1954	+// coneItem.addActionListener(this);
	1955	+// torusItem = menu.add(new MenuItem("Torus"));
	1956	+// torusItem.addActionListener(this);
	1957	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1958	+// superItem.addActionListener(this);
	1959	+
	1960	+ cameraItem = menu.add(new MenuItem("Camera"));
	1961	+ cameraItem.addActionListener(this);
	1962	+
	1963	+ if (!Globals.ADVANCED)
	1964	+ {
1071	1965	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1072	1966	kleinItem.addActionListener(this);
1073		- particleItem = menu.add(new MenuItem("Particle system"));
1074		- particleItem.addActionListener(this);
	1967	+ }
	1968	+
	1969	+// particleItem = menu.add(new MenuItem("Particle system"));
	1970	+// particleItem.addActionListener(this);
	1971	+ if (Globals.ADVANCED)
	1972	+ {
1075	1973	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1076	1974	ragdollItem.addActionListener(this);
1077	1975	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1078	1976	ragdoll2Item.addActionListener(this);
	1977	+ }
1079	1978	menu.add("-");
1080		- meshItem = menu.add(new MenuItem("Mesh"));
	1979	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1081	1980	meshItem.addActionListener(this);
1082	1981	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1083	1982	// meshGroupItem.addActionListener(this);
	1983	+ if (Globals.ADVANCED)
	1984	+ {
1084	1985	springItem = menu.add(new MenuItem("Spring"));
1085	1986	springItem.addActionListener(this);
1086	1987	flagItem = menu.add(new MenuItem("Flag"));
1087	1988	flagItem.addActionListener(this);
1088		- bezierItem = menu.add(new MenuItem("Patch"));
1089		- bezierItem.addActionListener(this);
1090		- checkerItem = menu.add(new MenuItem("Checker"));
1091		- checkerItem.addActionListener(this);
1092	1989	blobItem = menu.add(new MenuItem("Blob"));
1093	1990	blobItem.addActionListener(this);
1094	1991	latheItem = menu.add(new MenuItem("Lathe"));
1095	1992	latheItem.addActionListener(this);
1096		- lightItem = menu.add(new MenuItem("Light"));
1097		- lightItem.addActionListener(this);
	1993	+ }
	1994	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1995	+ bezierItem.addActionListener(this);
	1996	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1997	+// overlayItem.addActionListener(this);
	1998	+// lightItem = menu.add(new MenuItem("Light"));
	1999	+// lightItem.addActionListener(this);
1098	2000	menu.add("-");
1099	2001	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1100	2002	//superLoopItem.addActionListener(this);
1101		- loopItem = menu.add(new MenuItem("Loop"));
1102		- loopItem.addActionListener(this);
	2003	+// loopItem = menu.add(new MenuItem("Loop"));
	2004	+// loopItem.addActionListener(this);
1103	2005	doubleItem = menu.add(new MenuItem("Fork"));
1104	2006	doubleItem.addActionListener(this);
	2007	+ if (Globals.ADVANCED)
	2008	+ {
1105	2009	tripleItem = menu.add(new MenuItem("Trident"));
1106	2010	tripleItem.addActionListener(this);
	2011	+ }
1107	2012	}
1108	2013
1109	2014	void buildToolsMenu(Menu menu)
1110	2015	{
1111	2016	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1112	2017	animationItem.addItemListener(this);
1113		- animationItem.setState(CameraPane.ANIMATION);
	2018	+ animationItem.setState(Globals.ANIMATION);
	2019	+
	2020	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2021	+ archiveItem.addActionListener(this);
1114	2022
1115	2023	menu.add("-");
1116	2024	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1117	2025	parseverticesItem.addActionListener(this);
1118	2026	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1119	2027	textureFieldItem.addActionListener(this);
1120		- alignItem = menu.add(new MenuItem("Align"));
	2028	+ alignItem = menu.add(new MenuItem("Align Objects"));
1121	2029	alignItem.addActionListener(this);
1122		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1123		- mirrorItem.addActionListener(this);
1124	2030	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1125	2031	reduceMorphItem.addActionListener(this);
1126	2032	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1127	2033	reduce34MorphItem.addActionListener(this);
1128		-
1129		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1130		- computeAOItem.addActionListener(this);
1131	2034	menu.add("-");
1132		-
1133	2035	menu.add(memoryItem = new MenuItem("Memory Usage"));
1134	2036	memoryItem.addActionListener(this);
	2037	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	2038	+ computeAOItem.addActionListener(this);
	2039	+
	2040	+ if (Globals.ADVANCED)
	2041	+ {
	2042	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	2043	+ mirrorItem.addActionListener(this);
	2044	+ menu.add("-");
1135	2045	menu.add(analyzeItem = new MenuItem("Analyze"));
1136	2046	analyzeItem.addActionListener(this);
1137		- menu.add(dumpItem = new MenuItem("Dump"));
	2047	+ menu.add(dumpItem = new MenuItem("Print"));
1138	2048	dumpItem.addActionListener(this);
1139	2049	// menu.add(pathItem = new MenuItem("From-to path"));
1140	2050	// pathItem.addActionListener(this);
..	..	@@ -1152,6 +2062,7 @@
1152	2062	menu.add("-");
1153	2063	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1154	2064	editScriptItem.addActionListener(this);
	2065	+ }
1155	2066	}
1156	2067
1157	2068	void ScreenFit()
..	..	@@ -1274,9 +2185,38 @@
1274	2185	shadow.material = new cMaterial(obj.material);
1275	2186	shadow.material.diffuse = 0.0001f;
1276	2187	shadow.material.specular = 0.0001f;
	2188	+ shadow.material.opacity = 0.75f;
	2189	+
	2190	+ AllocProjectedVertices(shadow);
	2191	+
	2192	+ shadow.projectedVertices[1].x = 300;
1277	2193
1278	2194	makeSomething(shadow);
1279	2195	}
	2196	+
	2197	+ private void ClearUnpinned()
	2198	+ {
	2199	+ //for (Object3D obj : listUI)
	2200	+ for (int i=listUI.size(); --i>=0;)
	2201	+ {
	2202	+ Object3D obj = listUI.elementAt(i);
	2203	+ if (!obj.pinned)
	2204	+ {
	2205	+ obj.CloseUI();
	2206	+ listUI.remove(i);
	2207	+ }
	2208	+ }
	2209	+ }
	2210	+
	2211	+ private void EditElement(Object3D elem, boolean newWindow)
	2212	+ {
	2213	+ // if (!(elem instanceof Composite))
	2214	+ // newWindow = false;
	2215	+ listUI.add(elem);
	2216	+ elem.openEditWindow(this, newWindow); //, false);
	2217	+ System.out.println("edit : " + elem);
	2218	+ elem.editWindow.refreshContents(true); // ? new
	2219	+ }
1280	2220
1281	2221	/**
1282	2222	* applyExample
..	..	@@ -1480,9 +2420,9 @@
1480	2420
1481	2421	void Overwrite(int mask)
1482	2422	{
1483		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2423	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1484	2424	{
1485		- Object3D content = GrafreeD.clipboard.get(0);
	2425	+ Object3D content = Grafreed.clipboard.get(0);
1486	2426
1487	2427	if (content instanceof cGroup && ((cGroup)content).transientlink )
1488	2428	content = ((cGroup)content).get(0);
..	..	@@ -1521,7 +2461,7 @@
1521	2461	{
1522	2462	ScreenFit();
1523	2463	} else
1524		- if (source == switchItem)
	2464	+ if (source == switchViewItem)
1525	2465	{
1526	2466	cVector v1 = new cVector();
1527	2467	cVector v2 = new cVector();
..	..	@@ -1530,11 +2470,11 @@
1530	2470	objEditor.cameraView.renderCamera.setAim(v2, v1);
1531	2471	objEditor.cameraView.repaint();
1532	2472	} else
1533		- if (source == rectoidItem)
	2473	+ if (source == rectoidItem \|\| source == boxButton)
1534	2474	{
1535	2475	makeSomething(new Box());
1536	2476	} else
1537		- if (source == particleItem)
	2477	+ if (source == particleItem \|\| source == particlesButton)
1538	2478	{
1539	2479	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1540	2480	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1613,27 +2553,27 @@
1613	2553
1614	2554	makeSomething(obj);
1615	2555	} else
1616		- if (source == gridItem)
	2556	+ if (source == gridItem \|\| source == gridButton)
1617	2557	{
1618	2558	makeSomething(new Grid());
1619	2559	} else
1620		- if (source == ellipsoidItem)
	2560	+ if (source == ellipsoidItem \|\| source == sphereButton)
1621	2561	{
1622	2562	makeSomething(new Sphere());
1623	2563	} else
1624		- if (source == coneItem)
	2564	+ if (source == coneItem \|\| source == coneButton)
1625	2565	{
1626	2566	makeSomething(new Cone());
1627	2567	} else
1628		- if (source == torusItem)
	2568	+ if (source == torusItem \|\| source == torusButton)
1629	2569	{
1630	2570	makeSomething(new Torus());
1631	2571	} else
1632		- if (source == superItem)
	2572	+ if (source == superItem \|\| source == superButton)
1633	2573	{
1634	2574	makeSomething(new Superellipsoid());
1635	2575	} else
1636		- if (source == kleinItem)
	2576	+ if (source == kleinItem \|\| source == kleinButton)
1637	2577	{
1638	2578	makeSomething(new Klein());
1639	2579	} else
..	..	@@ -1653,7 +2593,7 @@
1653	2593	{
1654	2594	makeSomething(new BezierSurface());
1655	2595	} else
1656		- if (source == checkerItem)
	2596	+ if (source == overlayItem \|\| source == overlayButton)
1657	2597	{
1658	2598	/*
1659	2599	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1701,10 +2641,27 @@
1701	2641	s.setup();
1702	2642	makeSomething(s);
1703	2643	} else
1704		- if (source == lightItem)
	2644	+ if (source == lightItem \|\| source == lightButton)
1705	2645	{
1706	2646	makeSomething(new Light());
1707	2647	} else
	2648	+// if (source == skybox1Button \|\|
	2649	+// source == skybox2Button \|\|
	2650	+// source == skybox3Button \|\|
	2651	+// source == skybox4Button \|\|
	2652	+// source == skybox5Button \|\|
	2653	+// source == skybox6Button \|\|
	2654	+// source == skybox7Button \|\|
	2655	+// source == skybox11Button \|\|
	2656	+// source == skybox12Button \|\|
	2657	+// source == skybox13Button \|\|
	2658	+// source == skybox14Button \|\|
	2659	+// source == skybox15Button \|\|
	2660	+// source == skybox16Button \|\|
	2661	+// source == skybox17Button)
	2662	+// {
	2663	+// ChangeSkybox(source);
	2664	+// } else
1708	2665	if (source == csgItem)
1709	2666	{
1710	2667	group(new CSG());
..	..	@@ -1751,30 +2708,38 @@
1751	2708
1752	2709	group(g);
1753	2710	} else
1754		- if (source == loopItem)
	2711	+ if (source == loopItem \|\| source == loopButton)
1755	2712	{
	2713	+ if (!group.selection.isEmpty())
	2714	+ {
1756	2715	Composite csg = new GroupLeaf();
1757	2716	csg.count = 5;
1758		- group(csg);
1759		- Composite child = new cGroup();
	2717	+ Composite child = new cGroup("Branch");
1760	2718	csg.addChild(child);
1761	2719	child.addChild(csg);
	2720	+ group(csg);
	2721	+ }
1762	2722	} else
1763	2723	if (source == doubleItem)
1764	2724	{
1765		- Composite csg = new GroupLeaf();
	2725	+ if (!group.selection.isEmpty())
	2726	+ {
	2727	+ Composite csg = new GroupLeaf("Fork");
1766	2728	csg.count = 5;
	2729	+ Composite child = new cGroup("Branch A");
	2730	+ csg.addChild(child);
	2731	+ child.addChild(csg);
	2732	+ child = new cGroup("Branch B");
	2733	+ csg.addChild(child);
	2734	+ child.addChild(csg);
1767	2735	group(csg);
1768		- Composite child = new cGroup();
1769		- csg.addChild(child);
1770		- child.addChild(csg);
1771		- child = new cGroup();
1772		- csg.addChild(child);
1773		- child.addChild(csg);
	2736	+ }
1774	2737	} else
1775	2738	if (source == tripleItem)
1776	2739	{
1777		- Composite csg = new GroupLeaf();
	2740	+ if (!group.selection.isEmpty())
	2741	+ {
	2742	+ Composite csg = new GroupLeaf("Trident");
1778	2743	csg.count = 4;
1779	2744	group(csg);
1780	2745	Composite child = new cGroup();
..	..	@@ -1786,28 +2751,12 @@
1786	2751	child = new cGroup();
1787	2752	csg.addChild(child);
1788	2753	child.addChild(csg);
1789		- } else
1790		-
1791		- if (source == importGFDItem)
1792		- {
1793		- ImportGFD();
1794		- } else
1795		- if (source == importVRMLX3DItem)
1796		- {
1797		- ImportVRMLX3D();
1798		- } else
1799		- if (source == import3DSItem)
1800		- {
1801		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1802		- } else
1803		- if (source == importOBJItem)
1804		- {
1805		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	2754	+ }
1806	2755	} else
1807	2756	if (source == computeAOItem)
1808	2757	{
1809	2758	Globals.drawMode = CameraPane.OCCLUSION;
1810		- Globals.theRenderer.repaint();
	2759	+ cameraView.repaint();
1811	2760	} else
1812	2761	if (source == recompileItem)
1813	2762	{
..	..	@@ -1822,7 +2771,7 @@
1822	2771	if (source == invariantsItem)
1823	2772	{
1824	2773	System.out.println("Invariants:");
1825		- GrafreeD.grafreeD.universe.invariants();
	2774	+ Grafreed.grafreed.universe.invariants();
1826	2775	} else
1827	2776	if (source == memoryItem)
1828	2777	{
..	..	@@ -1841,19 +2790,80 @@
1841	2790	{
1842	2791	DumpObject();
1843	2792	} else
	2793	+ if (source == minButton)
	2794	+ {
	2795	+ Minimize();
	2796	+ } else
	2797	+ if (source == maxButton)
	2798	+ {
	2799	+ Maximize();
	2800	+ } else
	2801	+ if (source == fullButton)
	2802	+ {
	2803	+ ToggleFullScreen();
	2804	+ } else
	2805	+ if (source == collapseButton)
	2806	+ {
	2807	+ this.expandedLayout = radio.layout;
	2808	+ CollapseToolbar();
	2809	+ } else
	2810	+ if (source == maximize3DButton)
	2811	+ {
	2812	+ this.expandedLayout = radio.layout;
	2813	+ radio.layout = twoButton;
	2814	+ Show3DView();
	2815	+ CollapseToolbar();
	2816	+ } else
	2817	+ if (source == previousVersionButton)
	2818	+ {
	2819	+ // Go to previous version
	2820	+ //if (!Undo())
	2821	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2822	+ PreviousVersion();
	2823	+ } else
	2824	+ if (source == restoreButton)
	2825	+ {
	2826	+ // Restore current version
	2827	+ Restore();
	2828	+ //restoreButton.setEnabled(false);
	2829	+ } else
	2830	+ if (source == replaceButton)
	2831	+ {
	2832	+ // Overwrite current version
	2833	+ Replace();
	2834	+ //replaceButton.setEnabled(false);
	2835	+ } else
	2836	+ if (source == nextVersionButton)
	2837	+ {
	2838	+ // Go to next version
	2839	+ NextVersion();
	2840	+ } else
	2841	+ if (source == saveVersionButton)
	2842	+ {
	2843	+ // Save a new version
	2844	+ if (!Save(true))
	2845	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2846	+ } else
	2847	+ if (source == deleteVersionButton)
	2848	+ {
	2849	+ // Delete a new version
	2850	+ DeleteVersion();
	2851	+ } else
	2852	+ if (source == oneStepButton)
	2853	+ {
	2854	+ Globals.ONESTEP = true;
	2855	+ cameraView.repaint();
	2856	+ } else
1844	2857	if (source == screenfitButton)
1845	2858	{
1846		- //Reload(lastConverter, lastFilename, true);
1847	2859	ScreenFit();
1848	2860	} else
1849	2861	if (source == screenfitpointButton)
1850	2862	{
1851		- //Reload(lastConverter, lastFilename, true);
1852	2863	ScreenFitPoint();
1853	2864	} else
1854	2865	if (source == snapobjectButton)
1855	2866	{
1856		- //Reload(lastConverter, lastFilename, true);
1857	2867	SnapObject();
1858	2868	} else
1859	2869	// if (event.getSource() == recompileButton)
..	..	@@ -1890,12 +2900,20 @@
1890	2900	{
1891	2901	loadClipboard(true);
1892	2902	} else
	2903	+ if (source == undoItem)
	2904	+ {
	2905	+ PreviousVersion();
	2906	+ } else
	2907	+ if (source == redoItem)
	2908	+ {
	2909	+ NextVersion();
	2910	+ } else
1893	2911	if (source == duplicateItem)
1894	2912	{
1895		- Object3D keep = GrafreeD.clipboard;
	2913	+ Object3D keep = Grafreed.clipboard;
1896	2914	loadClipboard(false);
1897	2915	paste(false);
1898		- GrafreeD.clipboard = keep;
	2916	+ Grafreed.clipboard = keep;
1899	2917	} else
1900	2918	if (source == cloneItem)
1901	2919	{
..	..	@@ -1913,13 +2931,17 @@
1913	2931	{
1914	2932	paste(false);
1915	2933	} else
	2934	+ if (source == pasteIntoItem)
	2935	+ {
	2936	+ pasteInto(true, false);
	2937	+ } else
1916	2938	if (source == pasteLinkItem)
1917	2939	{
1918		- pasteInto(false);
	2940	+ pasteInto(false, false);
1919	2941	} else
1920	2942	if (source == pasteCloneItem)
1921	2943	{
1922		- pasteInto(true);
	2944	+ pasteInto(true, true);
1923	2945	} else
1924	2946	if (source == pasteExpandItem)
1925	2947	{
..	..	@@ -2111,9 +3133,9 @@
2111	3133	// group.selection.get(0).setMasterThis(content); // should be identity
2112	3134	// refreshContents();
2113	3135	// }
2114		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3136	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2115	3137	{
2116		- Object3D content = GrafreeD.clipboard.get(0);
	3138	+ Object3D content = Grafreed.clipboard.get(0);
2117	3139
2118	3140	if (content instanceof cGroup && ((cGroup)content).transientlink )
2119	3141	content = ((cGroup)content).get(0);
..	..	@@ -2121,11 +3143,11 @@
2121	3143	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2122	3144	for (int i=0; i<group.selection.size(); i++)
2123	3145	{
2124		- boolean random = CameraPane.RANDOM;
2125		- CameraPane.RANDOM = false; // parse all random nodes
	3146	+ boolean random = CameraPane.SWITCH;
	3147	+ CameraPane.SWITCH = false; // parse all random nodes
2126	3148	group.selection.get(i).linkVerticesThis(content);
2127	3149	// group.selection.get(i).setMasterThis(content); // should be identity
2128		- CameraPane.RANDOM = random;
	3150	+ CameraPane.SWITCH = random;
2129	3151	}
2130	3152	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2131	3153	refreshContents();
..	..	@@ -2135,20 +3157,20 @@
2135	3157	{
2136	3158	for (int i=0; i<group.selection.size(); i++)
2137	3159	{
2138		- boolean random = CameraPane.RANDOM;
2139		- CameraPane.RANDOM = false; // parse all random nodes
	3160	+ boolean random = CameraPane.SWITCH;
	3161	+ CameraPane.SWITCH = false; // parse all random nodes
2140	3162	group.selection.get(i).linkVerticesThis(null);
2141		- CameraPane.RANDOM = random;
	3163	+ CameraPane.SWITCH = random;
2142	3164	}
2143	3165
2144	3166	refreshContents();
2145	3167	} else
2146	3168	if (source == relinkverticesItem)
2147	3169	{
2148		- boolean random = CameraPane.RANDOM;
2149		- CameraPane.RANDOM = false; // parse all random nodes
	3170	+ boolean random = CameraPane.SWITCH;
	3171	+ CameraPane.SWITCH = false; // parse all random nodes
2150	3172	group.selection.RelinkToSupport();
2151		- CameraPane.RANDOM = random;
	3173	+ CameraPane.SWITCH = random;
2152	3174
2153	3175	refreshContents();
2154	3176	} else
..	..	@@ -2163,9 +3185,9 @@
2163	3185	} else
2164	3186	if (source == setMasterItem)
2165	3187	{
2166		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	3188	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2167	3189	{
2168		- Object3D content = GrafreeD.clipboard.get(0);
	3190	+ Object3D content = Grafreed.clipboard.get(0);
2169	3191
2170	3192	if (content instanceof cGroup && ((cGroup)content).transientlink )
2171	3193	content = ((cGroup)content).get(0);
..	..	@@ -2178,9 +3200,9 @@
2178	3200	{
2179	3201	if (group.selection.size() == 1)
2180	3202	{
2181		- if (GrafreeD.clipboard.size() == 1)
	3203	+ if (Grafreed.clipboard.size() == 1)
2182	3204	{
2183		- Object3D content = GrafreeD.clipboard.get(0);
	3205	+ Object3D content = Grafreed.clipboard.get(0);
2184	3206
2185	3207	if (content instanceof cGroup && ((cGroup)content).transientlink )
2186	3208	content = ((cGroup)content).get(0);
..	..	@@ -2197,7 +3219,7 @@
2197	3219	{
2198	3220	RevertMeshes();
2199	3221	} else
2200		- if (source == resetMeshItem)
	3222	+ if (source == resetAllItem)
2201	3223	{
2202	3224	ResetAll();
2203	3225	} else
..	..	@@ -2205,7 +3227,7 @@
2205	3227	{
2206	3228	StepAll();
2207	3229	} else
2208		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3230	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2209	3231	{
2210	3232	//int indices[] = jList.getSelectedIndices();
2211	3233	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2217,9 +3239,9 @@
2217	3239	{
2218	3240	ClearSelection(true);
2219	3241	} else
2220		- if (source == grabItem)
	3242	+ if (source == grabItem \|\| source == groupButton)
2221	3243	{
2222		- group(new cGroup(), true);
	3244	+ group(new cGroup(), false); // true);
2223	3245	} else
2224	3246	if (source == hideItem)
2225	3247	{
..	..	@@ -2237,16 +3259,16 @@
2237	3259	{
2238	3260	makeSomething(new Camera());
2239	3261	} else
2240		- if (source == compositeItem)
	3262	+ if (source == compositeItem \|\| source == compositeButton)
2241	3263	{
2242	3264	group(new Composite());
2243	3265	} else
2244		- if (source == randomItem)
	3266	+ if (source == switchItem \|\| source == switchButton)
2245	3267	{
2246	3268	RandomNode random = new RandomNode();
2247	3269	group(random);
2248	3270	if (random.size() > 0)
2249		- random.name = random.get(0).name + "Rnd";
	3271	+ random.name = random.get(0).name + "Switch";
2250	3272	} else
2251	3273	if (source == physicsItem)
2252	3274	{
..	..	@@ -2343,7 +3365,7 @@
2343	3365	{
2344	3366	group(new cLinker());
2345	3367	} else
2346		- if (source == textureItem)
	3368	+ if (source == textureItem \|\| source == textureButton)
2347	3369	{
2348	3370	group(new TextureNode());
2349	3371	} else
..	..	@@ -2363,17 +3385,42 @@
2363	3385	{
2364	3386	CastShadow(2);
2365	3387	} else
2366		- if (source == ungroupItem)
	3388	+ if (source == ungroupItem \|\| source == ungroupButton)
2367	3389	{
2368		- //ungroup();
	3390	+ boolean canUngroup = true;
	3391	+
2369	3392	for (int i=0; i<group.selection.size(); i++)
2370	3393	{
2371		- Ungroup(group.selection.get(i));
	3394	+ Object3D selectedItem = group.selection.get(i);
	3395	+
	3396	+ if (selectedItem.Size() == 0)
	3397	+ {
	3398	+ // Cannot ungroup leaves
	3399	+ canUngroup = false;
	3400	+ break;
	3401	+ }
	3402	+
	3403	+ if (selectedItem == group)
	3404	+ {
	3405	+ // Cannot ungroup root
	3406	+ canUngroup = false;
	3407	+ break;
	3408	+ }
2372	3409	}
2373	3410
2374		- ClearSelection(false);
2375		-
2376		- refreshContents();
	3411	+ if (canUngroup)
	3412	+ {
	3413	+ for (int i=0; i<group.selection.size(); i++)
	3414	+ {
	3415	+ Object3D selectedItem = group.selection.get(i);
	3416	+
	3417	+ Ungroup(selectedItem);
	3418	+ }
	3419	+
	3420	+ ClearSelection(false);
	3421	+
	3422	+ refreshContents();
	3423	+ }
2377	3424	} else
2378	3425	if (source == genUVItem)
2379	3426	{
..	..	@@ -2385,7 +3432,7 @@
2385	3432	} else
2386	3433	if (source == genNormalsMESHItem)
2387	3434	{
2388		- GenNormals(true); // TODO
	3435	+ GenNormalsMESH();
2389	3436	} else
2390	3437	if (source == genNormalsORGANItem)
2391	3438	{
..	..	@@ -2450,6 +3497,22 @@
2450	3497	if (source == unmarkleavesItem)
2451	3498	{
2452	3499	MarkLeaves(false);
	3500	+ } else
	3501	+ if (source == rewindleavesItem)
	3502	+ {
	3503	+ RewindLeaves(true);
	3504	+ } else
	3505	+ if (source == unrewindleavesItem)
	3506	+ {
	3507	+ RewindLeaves(false);
	3508	+ } else
	3509	+ if (source == randomleavesItem)
	3510	+ {
	3511	+ RandomLeaves(true);
	3512	+ } else
	3513	+ if (source == unrandomleavesItem)
	3514	+ {
	3515	+ RandomLeaves(false);
2453	3516	} else
2454	3517	if (source == flipVItem)
2455	3518	{
..	..	@@ -2535,9 +3598,13 @@
2535	3598	{
2536	3599	SmoothMesh();
2537	3600	} else
2538		- if (source == transformgeometryItem)
	3601	+ if (source == transformGeometryItem)
2539	3602	{
2540	3603	TransformGeometry();
	3604	+ } else
	3605	+ if (source == transformChildrenItem)
	3606	+ {
	3607	+ TransformChildren();
2541	3608	} else
2542	3609	if (source == resetTransformItem)
2543	3610	{
..	..	@@ -2545,7 +3612,11 @@
2545	3612	} else
2546	3613	if (source == resetCentroidItem)
2547	3614	{
2548		- ResetCentroid();
	3615	+ ResetCentroid(true);
	3616	+ } else
	3617	+ if (source == resetCentroidXZItem)
	3618	+ {
	3619	+ ResetCentroid(false);
2549	3620	} else
2550	3621	if (source == resetParentItem)
2551	3622	{
..	..	@@ -2650,7 +3721,7 @@
2650	3721	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2651	3722	{
2652	3723	obj = (Object3D)e.nextElement();
2653		- obj.SetBumpTexture(null);
	3724	+ obj.ResetBumpTexture();
2654	3725	}
2655	3726
2656	3727	refreshContents();
..	..	@@ -2666,6 +3737,31 @@
2666	3737
2667	3738	refreshContents();
2668	3739	} else
	3740	+ if (source == embedTexturesItem)
	3741	+ {
	3742	+ Object3D obj;
	3743	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3744	+ {
	3745	+ obj = (Object3D)e.nextElement();
	3746	+ obj.EmbedTextures(true);
	3747	+ }
	3748	+
	3749	+ refreshContents();
	3750	+ } else
	3751	+ if (source == deEmbedTexturesItem)
	3752	+ {
	3753	+ Object3D obj;
	3754	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3755	+ {
	3756	+ obj = (Object3D)e.nextElement();
	3757	+ obj.EmbedTextures(false);
	3758	+ }
	3759	+
	3760	+ CameraPane.texturepigment.clear();
	3761	+ CameraPane.texturebump.clear();
	3762	+
	3763	+ refreshContents();
	3764	+ } else
2669	3765	if (source == flashSelectionButton)
2670	3766	{
2671	3767	CameraPane.flash = true;
..	..	@@ -2677,42 +3773,36 @@
2677	3773	if (source == twoButton)
2678	3774	{
2679	3775	radio.layout = twoButton;
2680		- // bug
2681		- //gridPanel.setDividerLocation(1.0);
2682		- //bigPanel.setDividerLocation(0.0);
2683		-// bigThree.remove(scenePanel);
2684		-// bigThree.remove(centralPanel);
2685		-// bigThree.remove(XYZPanel);
2686		-// aWindowConstraints.gridx = 0;
2687		-// aWindowConstraints.gridy = 0;
2688		-// aWindowConstraints.gridwidth = 1;
2689		-// // aConstraints.gridheight = 3;
2690		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2691		-// aWindowConstraints.weightx = 0;
2692		-// aWindowConstraints.weighty = 1;
2693		-// //bigThree.add(jtp, aWindowConstraints);
2694		-// aWindowConstraints.weightx = 1;
2695		-// aWindowConstraints.gridwidth = 3;
2696		-// // aConstraints.gridheight = 3;
2697		-// aWindowConstraints.gridx = 1;
2698		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2699		-// bigThree.add(centralPanel, aWindowConstraints);
2700		-// aWindowConstraints.weightx = 0;
2701		-// aWindowConstraints.gridx = 4;
2702		-// aWindowConstraints.gridwidth = 1;
2703		-// // aConstraints.gridheight = 3;
2704		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2705		-// //bigThree.add(XYZPanel, aWindowConstraints);
2706		-// scenePanel.setVisible(false);
2707		-// centralPanel.setVisible(true);
2708		-// XYZPanel.setVisible(false);
2709		- bigThree.ClearUI();
2710		- bigThree.add(centralPanel);
2711		- bigThree.FlushUI();
	3776	+
	3777	+ if (CameraPane.FULLSCREEN)
	3778	+ fullscreenLayout = radio.layout;
	3779	+
	3780	+ Show3DView();
	3781	+
	3782	+ cameraView.requestFocusInWindow();
	3783	+
	3784	+// refreshContents(true);
	3785	+//
	3786	+// try
	3787	+// {
	3788	+// java.awt.Robot bot = new java.awt.Robot();
	3789	+// int mask = InputEvent.BUTTON1_MASK;
	3790	+// bot.mouseMove(100, 100);
	3791	+// bot.mousePress(mask);
	3792	+// bot.mouseRelease(mask);
	3793	+// }
	3794	+// catch (Exception e)
	3795	+// {
	3796	+//
	3797	+// }
	3798	+
2712	3799	} else
2713	3800	if (source == threeButton)
2714	3801	{
2715	3802	radio.layout = threeButton;
	3803	+
	3804	+ if (CameraPane.FULLSCREEN)
	3805	+ fullscreenLayout = radio.layout;
2716	3806
2717	3807	// bigThree.remove(scenePanel);
2718	3808	// bigThree.remove(centralPanel);
..	..	@@ -2742,13 +3832,18 @@
2742	3832	// centralPanel.setVisible(true);
2743	3833	// XYZPanel.setVisible(true);
2744	3834	bigThree.ClearUI();
	3835	+ bigThree.add(scenePanel);
2745	3836	bigThree.add(centralPanel);
2746		- bigThree.add(XYZPanel);
2747	3837	bigThree.FlushUI();
	3838	+
	3839	+ cameraView.requestFocusInWindow();
2748	3840	} else
2749	3841	if (source == fourButton)
2750	3842	{
2751	3843	radio.layout = fourButton;
	3844	+
	3845	+ if (CameraPane.FULLSCREEN)
	3846	+ fullscreenLayout = radio.layout;
2752	3847
2753	3848	// bigThree.remove(scenePanel);
2754	3849	// bigThree.remove(centralPanel);
..	..	@@ -2780,10 +3875,15 @@
2780	3875	bigThree.ClearUI();
2781	3876	bigThree.add(scenePanel);
2782	3877	bigThree.FlushUI();
	3878	+
	3879	+ cameraView.requestFocusInWindow();
2783	3880	} else
2784	3881	if (source == sixButton)
2785	3882	{
2786	3883	radio.layout = sixButton;
	3884	+
	3885	+ if (CameraPane.FULLSCREEN)
	3886	+ fullscreenLayout = radio.layout;
2787	3887
2788	3888	// bigThree.remove(scenePanel);
2789	3889	// bigThree.remove(centralPanel);
..	..	@@ -2813,13 +3913,18 @@
2813	3913	// centralPanel.setVisible(true);
2814	3914	// XYZPanel.setVisible(false);
2815	3915	bigThree.ClearUI();
2816		- bigThree.add(scenePanel);
2817	3916	bigThree.add(centralPanel);
	3917	+ bigThree.add(scenePanel);
2818	3918	bigThree.FlushUI();
	3919	+
	3920	+ cameraView.requestFocusInWindow();
2819	3921	} else
2820	3922	if (source == sevenButton)
2821	3923	{
2822	3924	radio.layout = sevenButton;
	3925	+
	3926	+ if (CameraPane.FULLSCREEN)
	3927	+ fullscreenLayout = radio.layout;
2823	3928
2824	3929	// bigThree.remove(scenePanel);
2825	3930	// bigThree.remove(centralPanel);
..	..	@@ -2853,9 +3958,12 @@
2853	3958	bigThree.add(centralPanel);
2854	3959	bigThree.add(XYZPanel);
2855	3960	bigThree.FlushUI();
	3961	+
	3962	+ cameraView.requestFocusInWindow();
2856	3963	} else
2857	3964	if (source == rootButton)
2858	3965	{
	3966	+ Replace();
2859	3967	Object3D obj;
2860	3968	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2861	3969	{
..	..	@@ -2864,31 +3972,49 @@
2864	3972	EditObject(obj);
2865	3973	}
2866	3974
	3975	+ cameraView.requestFocusInWindow();
2867	3976	refreshContents(true);
2868	3977	} else
2869	3978	if (source == closeButton)
2870	3979	{
2871	3980	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3981	+ Replace();
	3982	+
2872	3983	cRadio ab;
2873	3984	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2874	3985	{
2875	3986	ab = (cRadio)e.nextElement();
2876		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3987	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2877	3988	{
	3989	+ // Patch to avoid bug with transparency.
	3990	+ if (!ab.hadMaterial)
	3991	+ {
	3992	+ ab.object.material = null;
	3993	+ }
	3994	+
2878	3995	buttonGroup.remove(ab);
2879	3996	radioPanel.remove(ab);
2880	3997
2881		- ab.GetObject().editWindow = null;
	3998	+ //ab.GetObject().editWindow = null;
	3999	+ ab.GetObject().manipWindow = null;
2882	4000	// ab.GetObject().objectUI = null; // ?????????
2883	4001
2884	4002	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2885	4003	break;
2886	4004	}
2887	4005	}
	4006	+
	4007	+ cameraView.requestFocusInWindow();
2888	4008	refreshContents(true);
2889	4009	} else
2890	4010	if (source == editItem \|\| source == editButton)
2891	4011	{
	4012	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4013	+ {
	4014	+ Object3D child = (Object3D)e.nextElement();
	4015	+ child.pinned = true;
	4016	+ }
	4017	+
2892	4018	EditSelection(false);
2893	4019	} else
2894	4020	if (source == uneditButton)
..	..	@@ -2897,13 +4023,14 @@
2897	4023	{
2898	4024	Object3D child = (Object3D)e.nextElement();
2899	4025	if(child.editWindow != null)
2900		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4026	+ child.pinned = false;
2901	4027	child.CloseUI();
2902	4028	listUI.remove(child);
	4029	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2903	4030
2904		- child.editWindow = null; // ???????????
	4031	+ //child.editWindow = null; // ???????????
2905	4032	}
2906		- objEditor.ctrlPanel.validate();
	4033	+ objEditor.ctrlPanel.FlushUI();
2907	4034	//objEditor.jTree.clearSelection();
2908	4035	//objEditor.ResetSliders();
2909	4036	refreshContents(true);
..	..	@@ -2914,16 +4041,18 @@
2914	4041	//copy.ClearUI();
2915	4042	for (Object3D obj : listUI)
2916	4043	{
	4044	+ obj.pinned = false;
2917	4045	obj.CloseUI();
2918	4046	}
2919	4047	listUI.clear();
	4048	+ SetPinStates(group.selection.size() > 0);
2920	4049	refreshContents(true);
2921	4050	} else
2922	4051	if (source == allParamsButton)
2923	4052	{
2924	4053	assert(copy == group);
2925	4054
2926		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4055	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2927	4056
2928	4057	for (Object3D obj : listUI)
2929	4058	{
..	..	@@ -2949,6 +4078,8 @@
2949	4078	} else
2950	4079	if(source instanceof cRadio)
2951	4080	{
	4081	+ Replace();
	4082	+
2952	4083	group.parent = keepparent;
2953	4084	group.attributes = 0;
2954	4085	//group.editWindow = null;
..	..	@@ -2972,6 +4103,7 @@
2972	4103	}
2973	4104
2974	4105	copy = group;
	4106	+
2975	4107	//Globals.theRenderer.object = group;
2976	4108	if(!useclient)
2977	4109	{
..	..	@@ -2987,20 +4119,72 @@
2987	4119	frontView.object = group;
2988	4120	sideView.object = group;
2989	4121	}
2990		- group.editWindow = this;
	4122	+
	4123	+// fix "+" issue
	4124	+ //group.editWindow = this;
	4125	+ group.manipWindow = this;
	4126	+
2991	4127	/*
2992	4128	currentLayout = radio.layout;
2993	4129	if (currentLayout == null)
2994	4130	currentLayout = sevenButton;
2995	4131	*/
2996	4132	radio.layout.doClick();
	4133	+
	4134	+ assert(copy instanceof Composite);
	4135	+
	4136	+ if (copy.versionlist == null)
	4137	+ {
	4138	+ copy.versionindex = -1;
	4139	+
	4140	+ // Cannot work with loops
	4141	+ // To fix this issue, we first mark all nodes above the root,
	4142	+ // and check if any of these nodes are reachable below the root.
	4143	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4144	+
	4145	+ if (!copy.HasTags())
	4146	+ {
	4147	+ copy.versionlist = new Object3D[100];
	4148	+
	4149	+ Save(true);
	4150	+ }
	4151	+
	4152	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4153	+ }
	4154	+
	4155	+ SetVersionStates();
	4156	+
	4157	+ ClearUnpinned();
	4158	+
	4159	+ //Grafreed.Assert(group != null);
	4160	+ //Grafreed.Assert(group.selection != null);
	4161	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4162	+ if (group.selection == null \|\| group.selection.size() == 1)
	4163	+ EditSelection(false);
2997	4164	keepparent = group.parent;
2998	4165	// PARENT = NULL or not???
2999	4166	//group.parent = null; // ROOT
3000	4167	//group.attributes = -1;
3001	4168	ResetModel();
	4169	+
	4170	+ cameraView.requestFocusInWindow();
3002	4171	refreshContents(true);
3003		- }
	4172	+ } else if (event.getSource() == editCameraItem)
	4173	+ {
	4174	+ cameraView.ProtectCamera();
	4175	+ cameraView.requestFocusInWindow();
	4176	+ cameraView.repaint();
	4177	+ return;
	4178	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4179	+ {
	4180	+ cameraView.RevertCamera();
	4181	+ cameraView.requestFocusInWindow();
	4182	+ cameraView.repaint();
	4183	+ return;
	4184	+ // } else if (event.getSource() == textureButton)
	4185	+ // {
	4186	+ // return; // true;
	4187	+ }
3004	4188	else
3005	4189	{
3006	4190	//return super.action(event, arg);
..	..	@@ -3009,7 +4193,6 @@
3009	4193	}
3010	4194
3011	4195	boolean useclient = false;
3012		- cRadio radio;
3013	4196
3014	4197	void ToggleRoot()
3015	4198	{
..	..	@@ -3061,6 +4244,28 @@
3061	4244	refreshContents();
3062	4245	}
3063	4246
	4247	+ void TransformChildren()
	4248	+ {
	4249	+ Object3D obj;
	4250	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4251	+ {
	4252	+ obj = (Object3D)e.nextElement();
	4253	+ obj.KeepTextureMatrices();
	4254	+ obj.TransformChildren();
	4255	+ obj.RestoreTextureMatrices();
	4256	+
	4257	+// if (obj.parent == null)
	4258	+// {
	4259	+// System.out.println("NULL PARENT!");
	4260	+// new Exception().printStackTrace();
	4261	+// }
	4262	+// else
	4263	+// TouchTransform(obj);
	4264	+// //obj.parent.Touch();
	4265	+ }
	4266	+
	4267	+ refreshContents();
	4268	+ }
3064	4269
3065	4270	void ResetTransform()
3066	4271	{
..	..	@@ -3092,7 +4297,7 @@
3092	4297	TouchTransform(obj);
3093	4298	continue;
3094	4299	}
3095		- if ((mask&2) != 0) // Scale
	4300	+ if ((mask&2) != 0) // Scale/rotation
3096	4301	{
3097	4302	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3098	4303	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -3100,10 +4305,6 @@
3100	4305	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3101	4306	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3102	4307	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3103		- }
3104		- if ((mask&4) != 0) // Rotation
3105		- {
3106		- // ?
3107	4308	}
3108	4309	if ((mask&1) != 0) // Translation
3109	4310	{
..	..	@@ -3173,7 +4374,7 @@
3173	4374	refreshContents();
3174	4375	}
3175	4376
3176		- void ResetCentroid()
	4377	+ void ResetCentroid(boolean full)
3177	4378	{
3178	4379	Object3D obj;
3179	4380	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3188,12 +4389,16 @@
3188	4389	LA.matIdentity(Object3D.mat);
3189	4390	obj.getBounds(minima, maxima, false);
3190	4391	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3191		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4392	+ if (full)
	4393	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3192	4394	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3193	4395	obj.TransformMesh(Object3D.mat);
	4396	+
3194	4397	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3195		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4398	+ if (full)
	4399	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3196	4400	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4401	+
3197	4402	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3198	4403	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3199	4404	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3222,7 +4427,8 @@
3222	4427
3223	4428	int size = obj.MemorySize();
3224	4429
3225		- System.err.println((size/1024) + " KB is the size of " + obj);
	4430	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4431	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3226	4432	}
3227	4433	}
3228	4434	catch (Exception e)
..	..	@@ -3259,9 +4465,9 @@
3259	4465	obj = (Object3D)e.nextElement();
3260	4466
3261	4467	System.out.println("Object is: " + obj);
3262		- GrafreeD.AnalyzeObject(obj);
	4468	+ Grafreed.AnalyzeObject(obj);
3263	4469	System.out.println("Boundary rep: " + obj.bRep);
3264		- GrafreeD.AnalyzeObject(obj.bRep);
	4470	+ Grafreed.AnalyzeObject(obj.bRep);
3265	4471
3266	4472	// System.err.println((size/1024) + " KB is the size of " + obj);
3267	4473	}
..	..	@@ -3303,6 +4509,13 @@
3303	4509	void GenNormals(boolean crease)
3304	4510	{
3305	4511	group.GenNormalsS(crease);
	4512	+
	4513	+ refreshContents();
	4514	+ }
	4515	+
	4516	+ void GenNormalsMESH()
	4517	+ {
	4518	+ group.GenNormalsMeshS();
3306	4519
3307	4520	refreshContents();
3308	4521	}
..	..	@@ -3475,8 +4688,8 @@
3475	4688
3476	4689	void ParseVertices()
3477	4690	{
3478		- boolean epsequal = GrafreeD.epsequal;
3479		- GrafreeD.epsequal = true;
	4691	+ boolean epsequal = Grafreed.epsequal;
	4692	+ Grafreed.epsequal = true;
3480	4693
3481	4694	for (int i=0; i<group.selection.size(); i++)
3482	4695	{
..	..	@@ -3501,7 +4714,7 @@
3501	4714	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3502	4715	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3503	4716
3504		- g.add(GrafreeD.clipboard);
	4717	+ g.add(Grafreed.clipboard);
3505	4718
3506	4719	buffer.add(g);
3507	4720	}
..	..	@@ -3516,7 +4729,7 @@
3516	4729	makeSomething(buffer, i==group.selection.size()-1);
3517	4730	}
3518	4731
3519		- GrafreeD.epsequal = epsequal;
	4732	+ Grafreed.epsequal = epsequal;
3520	4733
3521	4734	refreshContents();
3522	4735	}
..	..	@@ -3534,7 +4747,16 @@
3534	4747	String pigment = Object3D.GetPigment(tex);
3535	4748	//String bump = Object3D.GetBump(tex);
3536	4749
3537		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4750	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4751	+
	4752	+ try
	4753	+ {
	4754	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4755	+ }
	4756	+ catch (Exception e)
	4757	+ {
	4758	+ System.err.println("FAIL: " + node);
	4759	+ }
3538	4760
3539	4761	double s = v.s;
3540	4762
..	..	@@ -3622,11 +4844,11 @@
3622	4844
3623	4845	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3624	4846
3625		- boolean random = CameraPane.RANDOM;
3626		- CameraPane.RANDOM = false; // parse all random nodes
	4847	+ boolean random = CameraPane.SWITCH;
	4848	+ CameraPane.SWITCH = false; // parse all random nodes
3627	4849	lowres.linkVerticesThis(null);
3628	4850	lowres.linkVerticesThis(sn);
3629		- CameraPane.RANDOM = random;
	4851	+ CameraPane.SWITCH = random;
3630	4852
3631	4853	System.err.flush();
3632	4854
..	..	@@ -3666,7 +4888,7 @@
3666	4888	return;
3667	4889
3668	4890	Object3D poses = group.selection.get(0);
3669		- Object3D ref = GrafreeD.clipboard.get(0);
	4891	+ Object3D ref = Grafreed.clipboard.get(0);
3670	4892
3671	4893	Object3D newgroup = new Object3D("Po:" + poses.name);
3672	4894
..	..	@@ -3860,9 +5082,9 @@
3860	5082
3861	5083	void ClipMesh()
3862	5084	{
3863		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	5085	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3864	5086	{
3865		- Object3D content = GrafreeD.clipboard.get(0);
	5087	+ Object3D content = Grafreed.clipboard.get(0);
3866	5088
3867	5089	if (content instanceof cGroup && ((cGroup)content).transientlink )
3868	5090	content = ((cGroup)content).get(0);
..	..	@@ -3871,7 +5093,7 @@
3871	5093	// {
3872	5094	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3873	5095	// }
3874		- group.selection.ClipMesh(GrafreeD.clipboard);
	5096	+ group.selection.ClipMesh(Grafreed.clipboard);
3875	5097	}
3876	5098	// group.selection.ClipMesh(GrafreeD.clipboard);
3877	5099	System.out.println("DONE.");
..	..	@@ -3918,6 +5140,18 @@
3918	5140	void MarkLeaves(boolean hide)
3919	5141	{
3920	5142	group.selection.MarkLeaves(hide);
	5143	+ refreshContents();
	5144	+ }
	5145	+
	5146	+ void RewindLeaves(boolean hide)
	5147	+ {
	5148	+ group.selection.RewindLeaves(hide);
	5149	+ refreshContents();
	5150	+ }
	5151	+
	5152	+ void RandomLeaves(boolean hide)
	5153	+ {
	5154	+ group.selection.RandomLeaves(hide);
3921	5155	refreshContents();
3922	5156	}
3923	5157
..	..	@@ -3992,28 +5226,25 @@
3992	5226	// }
3993	5227	// }
3994	5228
3995		- static boolean allparams = true;
3996		-
3997		- static Vector<Object3D> listUI = new Vector<Object3D>();
3998		-
3999	5229	void EditSelection(boolean newWindow)
4000	5230	{
	5231	+ if (group.selection == null)
	5232	+ {
	5233	+ EditElement(group, newWindow); // ? new
	5234	+ return;
	5235	+ }
	5236	+
4001	5237	// aConstraints.gridy = 0;
4002	5238	for (int i=0; i<group.selection.size(); i++)
4003	5239	{
4004	5240	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4005	5241	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4006		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5242	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4007	5243
4008	5244	Object3D elem = (Object3D)group.selection.elementAt(i);
4009		- if(elem != group)
	5245	+ if(elem != group \|\| !newWindow)
4010	5246	{
4011		- // if (!(elem instanceof Composite))
4012		- // newWindow = false;
4013		- listUI.add(elem);
4014		- elem.openEditWindow(this, newWindow); //, false);
4015		- System.out.println("edit : " + elem);
4016		- elem.editWindow.refreshContents(true); // ? new
	5247	+ EditElement(elem, newWindow); // ? new
4017	5248	}
4018	5249	}
4019	5250	}
..	..	@@ -4076,9 +5307,7 @@
4076	5307
4077	5308	freezemodel = false;
4078	5309	}
4079		-
4080		- boolean flashIt = true;
4081		-
	5310	+
4082	5311	public void valueChanged(TreeSelectionEvent e)
4083	5312	//public boolean handleEvent(Event event)
4084	5313	{
..	..	@@ -4088,7 +5317,8 @@
4088	5317	//new Exception().printStackTrace();
4089	5318
4090	5319	freezemodel = true;
4091		-
	5320	+ ClearUnpinned();
	5321	+
4092	5322	/**/
4093	5323	//switch (event.id)
4094	5324	{
..	..	@@ -4096,7 +5326,6 @@
4096	5326	//case 702: // Event.LIST_DESELECT
4097	5327	group.deselectAll();
4098	5328	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4099		- objEditor.ClearInfo(); // .GetMaterial());
4100	5329	if (tps != null)
4101	5330	{
4102	5331	for (int i=0; i < tps.length; i++)
..	..	@@ -4105,10 +5334,8 @@
4105	5334
4106	5335	//if (child.parent != null)
4107	5336	//child.parent.addSelectee(child);
	5337	+ objEditor.SetMaterial(child);
4108	5338	group.addSelectee(child);
4109		- objEditor.SetMaterial(child); // .GetMaterial());
4110		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4111		- System.err.println("info : " + child.GetPath());
4112	5339	}
4113	5340	}
4114	5341	// else
..	..	@@ -4118,20 +5345,28 @@
4118	5345	// System.err.println("info : " + group.GetPath());
4119	5346	// }
4120	5347
4121		- objEditor.SetText(); // jan 2014
4122		-
4123		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5348	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4124	5349	CameraPane.flash = true;
4125	5350
4126		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5351	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4127	5352	// a camera
4128	5353	{
4129		- CameraPane.camerachangeframe = 0; // don't refuse it
4130		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5354	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5355	+ {
	5356	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5357	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5358	+ }
4131	5359	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4132	5360	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4133	5361	}
4134	5362
	5363	+ if (tps != null && tps.length == 1)
	5364	+ {
	5365	+ EditSelection(false);
	5366	+ }
	5367	+
	5368	+ SetPinStates(tps != null && tps.length > 0);
	5369	+
4135	5370	refreshContents();
4136	5371	//return true;
4137	5372	}
..	..	@@ -4140,6 +5375,53 @@
4140	5375
4141	5376	freezemodel = false;
4142	5377	}
	5378	+
	5379	+ void SetPinStates(boolean enabled)
	5380	+ {
	5381	+ editButton.setEnabled(enabled);
	5382	+ uneditButton.setEnabled(enabled);
	5383	+ //unselectButton.setEnabled(enabled);
	5384	+ flashSelectionButton.setEnabled(enabled);
	5385	+
	5386	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5387	+
	5388	+ boolean allComposites = true;
	5389	+
	5390	+ if (group.selection != null)
	5391	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5392	+ {
	5393	+ Object next = e.nextElement();
	5394	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5395	+ {
	5396	+ allComposites = false;
	5397	+ break;
	5398	+ }
	5399	+ }
	5400	+
	5401	+ rootButton.setEnabled(allComposites);
	5402	+ }
	5403	+
	5404	+ void refreshContents(boolean cp)
	5405	+ {
	5406	+ if (Globals.ADVANCED)
	5407	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5408	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5409	+ {
	5410	+ objEditor.ClearInfo(); // .GetMaterial());
	5411	+
	5412	+ for (int i=0; i < group.selection.Size(); i++)
	5413	+ {
	5414	+ Object3D child = (Object3D) group.selection.get(i);
	5415	+
	5416	+ objEditor.AddInfo(child, this, true);
	5417	+// System.err.println("info : " + child.GetPath());
	5418	+ }
	5419	+
	5420	+ objEditor.SetText(); // jan 2014
	5421	+ }
	5422	+
	5423	+ super.refreshContents(cp);
	5424	+ }
4143	5425
4144	5426	void linkSomething(Object3D thing)
4145	5427	{
..	..	@@ -4211,16 +5493,19 @@
4211	5493	{
4212	5494	if (group.selection.isEmpty())
4213	5495	return;
4214		- GrafreeD.clipboardIsTempGroup = false;
	5496	+
	5497	+ Grafreed.clipboardIsTempGroup = false;
4215	5498	Composite tGroup = null;
4216	5499	if (group.selection.size() > 0) // 1)
4217	5500	{
4218	5501	tGroup = new cGroup();
4219		- GrafreeD.clipboardIsTempGroup = true;
	5502	+ Grafreed.clipboardIsTempGroup = true;
4220	5503	}
4221	5504
4222	5505	if (cut)
4223	5506	{
	5507	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5508	+// Save();
4224	5509	//int indices[] = jList.getSelectedIndices();
4225	5510	//for (int i = indices.length - 1; i >= 0; i--)
4226	5511	//jList.remove(indices[i]);
..	..	@@ -4256,16 +5541,16 @@
4256	5541	//System.out.println("cut " + child);
4257	5542	//System.out.println("parent = " + child.parent);
4258	5543	// tmp.addChild(child);
4259		- if (GrafreeD.clipboardIsTempGroup)
	5544	+ if (Grafreed.clipboardIsTempGroup)
4260	5545	tGroup.add/Child/(tmp);
4261	5546	else
4262		- GrafreeD.clipboard = tmp;
	5547	+ Grafreed.clipboard = tmp;
4263	5548	}
4264	5549	else
4265		- if (GrafreeD.clipboardIsTempGroup)
	5550	+ if (Grafreed.clipboardIsTempGroup)
4266	5551	tGroup.add/Child/(child);
4267	5552	else
4268		- GrafreeD.clipboard = child;
	5553	+ Grafreed.clipboard = child;
4269	5554	}
4270	5555
4271	5556	//ResetModel();
..	..	@@ -4297,21 +5582,23 @@
4297	5582	//System.out.println("cut " + elem);
4298	5583	//System.out.println("parent = " + elem.parent);
4299	5584	// tmp.addChild(elem);
4300		- if (GrafreeD.clipboardIsTempGroup)
	5585	+ if (Grafreed.clipboardIsTempGroup)
4301	5586	tGroup.add/Child/(tmp);
4302	5587	else
4303		- GrafreeD.clipboard = tmp;
	5588	+ Grafreed.clipboard = tmp;
4304	5589	}
4305	5590	else
4306		- if (GrafreeD.clipboardIsTempGroup)
	5591	+ if (Grafreed.clipboardIsTempGroup)
4307	5592	tGroup.add/Child/(child);
4308	5593	else
4309		- GrafreeD.clipboard = child;
	5594	+ Grafreed.clipboard = child;
4310	5595	}
4311	5596
4312	5597	}
4313		- if (GrafreeD.clipboardIsTempGroup)
4314		- GrafreeD.clipboard = tGroup;
	5598	+
	5599	+ if (Grafreed.clipboardIsTempGroup)
	5600	+ Grafreed.clipboard = tGroup;
	5601	+
4315	5602	if (cut)
4316	5603	{
4317	5604	ResetModel();
..	..	@@ -4321,11 +5608,15 @@
4321	5608
4322	5609	void paste(boolean expand)
4323	5610	{
	5611	+ if (Globals.REPLACEONMAKE)
	5612	+ Save();
	5613	+ boolean keep = Globals.REPLACEONMAKE;
	5614	+ Globals.REPLACEONMAKE = false;
4324	5615	// if (GrafreeD.clipboard == null)
4325	5616	// return;
4326	5617	boolean first = true;
4327	5618
4328		- if (GrafreeD.clipboardIsTempGroup)
	5619	+ if (Grafreed.clipboardIsTempGroup)
4329	5620	{
4330	5621	Composite temp;
4331	5622
..	..	@@ -4336,7 +5627,7 @@
4336	5627	temp = (Composite)Applet3D.clipboard.deepCopy();
4337	5628	*/
4338	5629	Object3D elem;
4339		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5630	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4340	5631	{
4341	5632	Object3D child = (Object3D)e.nextElement();
4342	5633
..	..	@@ -4370,21 +5661,22 @@
4370	5661	//Object3D cb = Applet3D.clipboard;
4371	5662	//temp.addChild(cb);
4372	5663	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4373		- assert(GrafreeD.clipboard.parent == null);
4374		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4375		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4376		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4377		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5664	+ assert(Grafreed.clipboard.parent == null);
	5665	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5666	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5667	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5668	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4378	5669	else
4379		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4380		- GrafreeD.clipboard.get(0).parent = keepparent;
	5670	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5671	+ Grafreed.clipboard.get(0).parent = keepparent;
4381	5672	}
4382	5673
	5674	+ Globals.REPLACEONMAKE = keep;
4383	5675	ResetModel();
4384	5676	refreshContents();
4385	5677	}
4386	5678
4387		- void pasteInto(boolean copyit)
	5679	+ void pasteInto(boolean copyit, boolean clone)
4388	5680	{
4389	5681	// if (GrafreeD.clipboard == null)
4390	5682	// return;
..	..	@@ -4413,15 +5705,22 @@
4413	5705	if (copyit)
4414	5706	{
4415	5707	// paste(false);
4416		- CloneClipboard(false); // sept 2014
	5708	+ if (clone)
	5709	+ {
	5710	+ CloneClipboard(false); // sept 2014
	5711	+ }
	5712	+ else
	5713	+ {
	5714	+ paste(false);
	5715	+ }
4417	5716	}
4418	5717	else
4419	5718	{
4420	5719	boolean first = true;
4421	5720
4422		- if (GrafreeD.clipboardIsTempGroup)
	5721	+ if (Grafreed.clipboardIsTempGroup)
4423	5722	{
4424		- Composite temp = (Composite)GrafreeD.clipboard;
	5723	+ Composite temp = (Composite)Grafreed.clipboard;
4425	5724	Object3D copy;
4426	5725	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4427	5726	{
..	..	@@ -4431,7 +5730,7 @@
4431	5730	}
4432	5731	} else
4433	5732	{
4434		- linkSomething(GrafreeD.clipboard); //.get(0));
	5733	+ linkSomething(Grafreed.clipboard); //.get(0));
4435	5734	}
4436	5735	}
4437	5736	}
..	..	@@ -4508,6 +5807,10 @@
4508	5807
4509	5808	void group(Object3D csg, boolean grab)
4510	5809	{
	5810	+ if (Globals.REPLACEONMAKE)
	5811	+ Save();
	5812	+ boolean keep = Globals.REPLACEONMAKE;
	5813	+ Globals.REPLACEONMAKE = false;
4511	5814	if (//false) // why??
4512	5815	!group.selection.isEmpty())
4513	5816	{
..	..	@@ -4621,10 +5924,15 @@
4621	5924	//node.add(csg);
4622	5925	//makeSomething(node);
4623	5926	makeSomething(csg);
	5927	+ Globals.REPLACEONMAKE = keep;
4624	5928	}
4625	5929
4626	5930	void Ungroup(Object3D g)
4627	5931	{
	5932	+ if (Globals.REPLACEONMAKE)
	5933	+ Save();
	5934	+ boolean keep = Globals.REPLACEONMAKE;
	5935	+ Globals.REPLACEONMAKE = false;
4628	5936	if (g instanceof HiddenObject)
4629	5937	{
4630	5938	HiddenObject h = (HiddenObject) g;
..	..	@@ -4641,6 +5949,7 @@
4641	5949	objEditor.makeSomething(g.get(i), false);
4642	5950	}
4643	5951	}
	5952	+ Globals.REPLACEONMAKE = keep;
4644	5953	}
4645	5954
4646	5955	void ungroup()
..	..	@@ -4836,21 +6145,6 @@
4836	6145	}
4837	6146	*/
4838	6147
4839		- void ImportGFD()
4840		- {
4841		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4842		- browser.show();
4843		- String filename = browser.getFile();
4844		- if (filename != null && filename.length() > 0)
4845		- {
4846		- String fullname = browser.getDirectory() + filename;
4847		-
4848		- //Object3D readobj =
4849		- objEditor.ReadGFD(fullname, objEditor);
4850		- //makeSomething(readobj);
4851		- }
4852		- }
4853		-
4854	6148	/*
4855	6149	public void Callback(Object obj)
4856	6150	{
..	..	@@ -4874,26 +6168,9 @@
4874	6168	}
4875	6169	*/
4876	6170
4877		- void ImportVRMLX3D()
4878		- {
4879		- if (GrafreeD.standAlone)
4880		- {
4881		- /**/
4882		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4883		- browser.show();
4884		- String filename = browser.getFile();
4885		- if (filename != null && filename.length() > 0)
4886		- {
4887		- String fullname = browser.getDirectory() + filename;
4888		- LoadVRMLX3D(fullname);
4889		- }
4890		- /**/
4891		- }
4892		- }
4893		-
4894	6171	String GetFile(String dialogName)
4895	6172	{
4896		- if (GrafreeD.standAlone)
	6173	+ if (Grafreed.standAlone)
4897	6174	{
4898	6175	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4899	6176	browser.show();
..	..	@@ -4957,10 +6234,48 @@
4957	6234	cButton flashSelectionButton;
4958	6235	cButton editButton;
4959	6236	cButton uneditButton;
	6237	+ JCheckBox allParamsButton;
4960	6238	cButton clearpanelButton;
4961		- cButton allParamsButton;
4962	6239	cButton unselectButton;
4963	6240
	6241	+ cButton restoreCameraButton;
	6242	+
	6243	+ cButton oneStepButton;
	6244	+
	6245	+ cButton groupButton;
	6246	+ cButton ungroupButton;
	6247	+ cButton compositeButton;
	6248	+ cButton switchButton;
	6249	+ cButton loopButton;
	6250	+ cButton textureButton;
	6251	+
	6252	+ cButton skybox1Button;
	6253	+ cButton skybox2Button;
	6254	+ cButton skybox3Button;
	6255	+ cButton skybox4Button;
	6256	+ cButton skybox5Button;
	6257	+ cButton skybox6Button;
	6258	+ cButton skybox7Button;
	6259	+
	6260	+ cButton skybox11Button;
	6261	+ cButton skybox12Button;
	6262	+ cButton skybox13Button;
	6263	+ cButton skybox14Button;
	6264	+ cButton skybox15Button;
	6265	+ cButton skybox16Button;
	6266	+ cButton skybox17Button;
	6267	+
	6268	+ cButton gridButton;
	6269	+ cButton boxButton;
	6270	+ cButton sphereButton;
	6271	+ cButton coneButton;
	6272	+ cButton torusButton;
	6273	+ cButton superButton;
	6274	+ cButton kleinButton;
	6275	+ cButton particlesButton;
	6276	+ cButton overlayButton;
	6277	+ cButton lightButton;
	6278	+
4964	6279	cButton screenfitButton;
4965	6280	cButton screenfitpointButton;
4966	6281	cButton snapobjectButton;
..	..	@@ -4972,14 +6287,6 @@
4972	6287
4973	6288	cButton setsupportButton;
4974	6289
4975		- cButton twoButton;
4976		- cButton sixButton;
4977		- cButton threeButton;
4978		- cButton sevenButton;
4979		- cButton fourButton; // full panel
4980		- cButton oneButton; // full XYZ
4981		- //cButton currentLayout;
4982		-
4983	6290	//
4984	6291	//Composite
4985	6292	Object3D // to do !!
..	..	@@ -4989,10 +6296,12 @@
4989	6296	//JTree jTree;
4990	6297	private MenuItem lookAtItem;
4991	6298	private MenuItem lookFromItem;
4992		- private MenuItem switchItem;
4993		- private MenuItem cutItem;
4994		- private MenuItem duplicateItem;
4995		- private MenuItem cloneItem;
	6299	+ private MenuItem switchViewItem;
	6300	+ private JMenuItem cutItem;
	6301	+ private MenuItem undoItem;
	6302	+ private MenuItem redoItem;
	6303	+ private JMenuItem duplicateItem;
	6304	+ private JMenuItem cloneItem;
4996	6305	private MenuItem cloneSupportItem;
4997	6306	private MenuItem overwriteGeoItem;
4998	6307	private MenuItem overwriteMatItem;
..	..	@@ -5004,7 +6313,7 @@
5004	6313	private MenuItem linkverticesItem;
5005	6314	private MenuItem relinkverticesItem;
5006	6315	private MenuItem setMasterItem;
5007		- private MenuItem resetMeshItem;
	6316	+ private MenuItem resetAllItem;
5008	6317	private MenuItem stepAllItem;
5009	6318	private MenuItem revertMeshItem;
5010	6319	private MenuItem poseMeshItem;
..	..	@@ -5013,12 +6322,13 @@
5013	6322	private MenuItem cloneGeometriesItem;
5014	6323	private MenuItem shareGeometriesItem;
5015	6324	private MenuItem mergeGeometriesItem;
5016		- private MenuItem copyItem;
	6325	+ private JMenuItem copyItem;
5017	6326	private MenuItem pasteItem;
5018		- private MenuItem pasteLinkItem;
5019		- private MenuItem pasteCloneItem;
5020		- private MenuItem pasteExpandItem;
5021		- private MenuItem clearItem;
	6327	+ private JMenuItem pasteIntoItem;
	6328	+ private JMenuItem pasteLinkItem;
	6329	+ private JMenuItem pasteCloneItem;
	6330	+ private JMenuItem pasteExpandItem;
	6331	+ private JMenuItem deleteItem;
5022	6332	private MenuItem clearAllItem;
5023	6333	private MenuItem genUVItem;
5024	6334	private MenuItem genNormalsMESHItem;
..	..	@@ -5053,6 +6363,10 @@
5053	6363	private MenuItem showleavesItem;
5054	6364	private MenuItem markleavesItem;
5055	6365	private MenuItem unmarkleavesItem;
	6366	+ private MenuItem rewindleavesItem;
	6367	+ private MenuItem unrewindleavesItem;
	6368	+ private MenuItem randomleavesItem;
	6369	+ private MenuItem unrandomleavesItem;
5056	6370
5057	6371	private MenuItem flipVItem;
5058	6372	private MenuItem unflipVItem;
..	..	@@ -5064,15 +6378,17 @@
5064	6378	private MenuItem panoTexturesItem;
5065	6379
5066	6380	private MenuItem resetCentroidItem;
5067		- private MenuItem transformgeometryItem;
	6381	+ private MenuItem resetCentroidXZItem;
5068	6382	private MenuItem resetTransformItem;
	6383	+ private MenuItem transformGeometryItem;
	6384	+ private MenuItem transformChildrenItem;
5069	6385	private MenuItem hideItem;
5070		- private MenuItem grabItem;
	6386	+ private JMenuItem grabItem;
5071	6387	private MenuItem backItem;
5072	6388	private MenuItem frontItem;
5073	6389	private MenuItem cameraItem;
5074	6390	private MenuItem compositeItem;
5075		- private MenuItem randomItem;
	6391	+ private MenuItem switchItem;
5076	6392	private MenuItem physicsItem;
5077	6393	private MenuItem frameselectorItem;
5078	6394	private MenuItem scriptNodeItem;
..	..	@@ -5080,7 +6396,7 @@
5080	6396	private MenuItem switchTransfoItem;
5081	6397	private MenuItem morphItem;
5082	6398	private MenuItem linkerItem;
5083		- private MenuItem ungroupItem;
	6399	+ private JMenuItem ungroupItem;
5084	6400	private MenuItem editItem;
5085	6401	private MenuItem openWindowItem;
5086	6402	private MenuItem editLeafItem;
..	..	@@ -5096,6 +6412,8 @@
5096	6412	private MenuItem attachBumpItem;
5097	6413	private MenuItem detachBumpItem;
5098	6414	private MenuItem pigmentBumpItem;
	6415	+ private MenuItem embedTexturesItem;
	6416	+ private MenuItem deEmbedTexturesItem;
5099	6417
5100	6418	private MenuItem particleItem;
5101	6419	private MenuItem ragdollItem;
..	..	@@ -5112,7 +6430,7 @@
5112	6430	private MenuItem blobItem;
5113	6431	private MenuItem latheItem;
5114	6432	private MenuItem bezierItem;
5115		- private MenuItem checkerItem;
	6433	+ private MenuItem overlayItem;
5116	6434	private MenuItem meshItem;
5117	6435	// private MenuItem meshGroupItem;
5118	6436	private MenuItem springItem;
..	..	@@ -5134,11 +6452,6 @@
5134	6452	private MenuItem doubleItem;
5135	6453	private MenuItem tripleItem;
5136	6454
5137		- private MenuItem importGFDItem;
5138		- private MenuItem importVRMLX3DItem;
5139		- private MenuItem import3DSItem;
5140		- private MenuItem importOBJItem;
5141		-
5142	6455	private MenuItem computeAOItem;
5143	6456	private MenuItem recompileItem;
5144	6457	private MenuItem editScriptItem;
..	..	@@ -5148,4 +6461,8 @@
5148	6461	private MenuItem analyzeItem;
5149	6462	private MenuItem dumpItem;
5150	6463	//boolean freezemodel = false;
	6464	+
	6465	+ Menu cameraMenu;
	6466	+ MenuItem editCameraItem;
	6467	+ MenuItem restoreCameraItem;
5151	6468	}