~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,240 @@
23	23	DragGestureListener, DragSourceListener, DropTargetListener,
24	24	ItemListener // ListSelectionListener
25	25	{
	26	+
	27	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	28	+ {
	29	+ cButton skyboxButton;
	30	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	31	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	32	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	33	+ skyboxButton.setToolTipText(s);
	34	+ skyboxButton.addActionListener(new ActionListener()
	35	+ {
	36	+ @Override
	37	+ public void actionPerformed(ActionEvent e)
	38	+ {
	39	+ ChangeSkybox(path);
	40	+ }
	41	+ });
	42	+ }
	43	+
	44	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	45	+ {
	46	+ cGridBag tab0 = new cGridBag().setVertical(true);
	47	+
	48	+ tab0.setName("Urban");
	49	+ skyboxpanel.add(tab0);
	50	+
	51	+ cGridBag row0 = new cGridBag();
	52	+ cGridBag row1 = new cGridBag();
	53	+ cGridBag row2 = new cGridBag();
	54	+ cGridBag row3 = new cGridBag();
	55	+ cGridBag row4 = new cGridBag();
	56	+ cGridBag row5 = new cGridBag();
	57	+ cGridBag row6 = new cGridBag();
	58	+
	59	+ AddSkyboxButton("default", "rgb", row0);
	60	+ //AddSkyboxButton("default", "cornell", row0);
	61	+ AddSkyboxButton("penguins", "dust", row0);
	62	+ AddSkyboxButton("penguins", "tropic", row0);
	63	+ AddSkyboxButton("default", "skycube", row0);
	64	+
	65	+ AddSkyboxButton("default", "uffizi", row1);
	66	+ AddSkyboxButton("bridge", "Bridge", row1);
	67	+ AddSkyboxButton("bridge", "Bridge2", row1);
	68	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	69	+
	70	+ AddSkyboxButton("urban", "Parliament", row2);
	71	+ AddSkyboxButton("urban", "Roundabout", row2);
	72	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	74	+
	75	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	76	+ AddSkyboxButton("urban", "UnionSquare", row3);
	77	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	78	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	79	+
	80	+ AddSkyboxButton("park", "Buddha", row4);
	81	+ AddSkyboxButton("park", "CNTower2", row4);
	82	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	84	+
	85	+ AddSkyboxButton("park", "Park", row5);
	86	+ AddSkyboxButton("park", "Pond", row5);
	87	+ AddSkyboxButton("park", "Skansen", row5);
	88	+ AddSkyboxButton("park", "Skansen2", row5);
	89	+
	90	+ AddSkyboxButton("park", "Skansen3", row6);
	91	+ AddSkyboxButton("park", "Skansen4", row6);
	92	+ AddSkyboxButton("park", "Skansen5", row6);
	93	+ AddSkyboxButton("park", "Stairs", row6);
	94	+
	95	+ tab0.add(row0);
	96	+ tab0.add(row1);
	97	+ tab0.add(row2);
	98	+ tab0.add(row3);
	99	+ tab0.add(row4);
	100	+ tab0.add(row5);
	101	+ tab0.add(row6);
	102	+
	103	+ for (int i=5; --i>=0;)
	104	+ {
	105	+ //oe.toolboxPanel.Return();
	106	+ //tab0.add(new cGridBag());
	107	+ }
	108	+ }
	109	+
	110	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	111	+ {
	112	+ cGridBag tab0 = new cGridBag().setVertical(true);
	113	+
	114	+ tab0.setName("Nature");
	115	+ skyboxpanel.add(tab0);
	116	+
	117	+ cGridBag row0 = new cGridBag();
	118	+ cGridBag row1 = new cGridBag();
	119	+ cGridBag row2 = new cGridBag();
	120	+ cGridBag row3 = new cGridBag();
	121	+ cGridBag row4 = new cGridBag();
	122	+ cGridBag row5 = new cGridBag();
	123	+ cGridBag row6 = new cGridBag();
	124	+
	125	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	126	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	127	+ AddSkyboxButton("beach", "PalmTrees", row0);
	128	+ AddSkyboxButton("beach", "Tenerife", row0);
	129	+
	130	+ AddSkyboxButton("beach", "Tenerife2", row1);
	131	+ AddSkyboxButton("beach", "Tenerife3", row1);
	132	+ AddSkyboxButton("field", "FishPond", row1);
	133	+ AddSkyboxButton("field", "Footballfield", row1);
	134	+
	135	+ AddSkyboxButton("field", "Meadow", row2);
	136	+ AddSkyboxButton("field", "Sorsele", row2);
	137	+ AddSkyboxButton("field", "Sorsele2", row2);
	138	+ AddSkyboxButton("field", "Sorsele3", row2);
	139	+
	140	+ AddSkyboxButton("forest", "Brudslojan", row3);
	141	+ AddSkyboxButton("forest", "Langholmen2", row3);
	142	+ AddSkyboxButton("forest", "Plants", row3);
	143	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	144	+
	145	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	146	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	147	+ AddSkyboxButton("mountain", "Ryfjallet", row4);
	148	+ AddSkyboxButton("mountain", "Teide", row4);
	149	+ AddSkyboxButton("park", "Tantolunden4", row4);
	150	+
	151	+ AddSkyboxButton("penguins", "wrath", row5);
	152	+ AddSkyboxButton("penguins", "yonder", row5);
	153	+ AddSkyboxButton("rocky", "Langholmen", row5);
	154	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	155	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	156	+
	157	+ AddSkyboxButton("default", "CloudyHills", row6);
	158	+ AddSkyboxButton("daz", "Autumn", row6);
	159	+ AddSkyboxButton("daz", "Greenlands", row6);
	160	+ AddSkyboxButton("daz", "MountainTrail", row6);
	161	+ AddSkyboxButton("daz", "Oasis", row6);
	162	+ /*
	163	+Autumn
	164	+Greenlands
	165	+MountainTrail
	166	+Oasis
	167	+TheRock
	168	+TopOfTheWorld
	169	+Winter
	170	+ */
	171	+
	172	+ tab0.add(row0);
	173	+ tab0.add(row1);
	174	+ tab0.add(row2);
	175	+ tab0.add(row3);
	176	+ tab0.add(row4);
	177	+ tab0.add(row5);
	178	+ tab0.add(row6);
	179	+
	180	+ for (int i=5; --i>=0;)
	181	+ {
	182	+ //oe.toolboxPanel.Return();
	183	+ //tab0.add(new cGridBag());
	184	+ }
	185	+ }
	186	+
	187	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	188	+ {
	189	+ cGridBag tab0 = new cGridBag().setVertical(true);
	190	+
	191	+ tab0.setName("Night");
	192	+ skyboxpanel.add(tab0);
	193	+
	194	+ cGridBag row0 = new cGridBag();
	195	+ cGridBag row1 = new cGridBag();
	196	+ cGridBag row2 = new cGridBag();
	197	+ cGridBag row3 = new cGridBag();
	198	+ cGridBag row4 = new cGridBag();
	199	+ cGridBag row5 = new cGridBag();
	200	+ cGridBag row6 = new cGridBag();
	201	+
	202	+ AddSkyboxButton("night", "NightPath", row0);
	203	+ AddSkyboxButton("night", "PondNight", row0);
	204	+ AddSkyboxButton("night", "Powerlines", row0);
	205	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	206	+
	207	+ AddSkyboxButton("urban", "CNTower", row1);
	208	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	209	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	210	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	211	+
	212	+ AddSkyboxButton("penguins", "kenon_star", row2);
	213	+ AddSkyboxButton("indoors", "DallasW", row2);
	214	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row2);
	215	+ AddSkyboxButton("indoors", "Vasa", row2);
	216	+
	217	+ AddSkyboxButton("winter", "Backyard", row3);
	218	+ AddSkyboxButton("winter", "Creek", row3);
	219	+ AddSkyboxButton("winter", "FootballField3", row3);
	220	+ AddSkyboxButton("winter", "Forest", row3);
	221	+
	222	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	223	+ AddSkyboxButton("winter", "House", row4);
	224	+ AddSkyboxButton("winter", "IceLake", row4);
	225	+ AddSkyboxButton("winter", "IceRiver", row4);
	226	+
	227	+ AddSkyboxButton("winter", "Park3", row5);
	228	+ AddSkyboxButton("winter", "PondWinter", row5);
	229	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	230	+ AddSkyboxButton("winter", "Vindelalven", row5);
	231	+
	232	+ AddSkyboxButton("daz", "TheRock", row6);
	233	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	234	+ AddSkyboxButton("daz", "Winter", row6);
	235	+ AddSkyboxButton("penguins", "desertdawn", row6);
	236	+
	237	+ tab0.add(row0);
	238	+ tab0.add(row1);
	239	+ tab0.add(row2);
	240	+ tab0.add(row3);
	241	+ tab0.add(row4);
	242	+ tab0.add(row5);
	243	+ tab0.add(row6);
	244	+
	245	+ for (int i=5; --i>=0;)
	246	+ {
	247	+ //oe.toolboxPanel.Return();
	248	+ //tab0.add(new cGridBag());
	249	+ }
	250	+ }
	251	+
	252	+ public void ChangeSkybox(String name)
	253	+ {
	254	+ //cameraView.envyoff = false;
	255	+ group.skyboxname = name;
	256	+ group.skyboxext = "jpg";
	257	+ cameraView.repaint();
	258	+ }
	259	+
26	260	//ObjEditor objEditor;
27	261	public void closeUI2()
28	262	{
..	..	@@ -60,6 +294,12 @@
60	294	this.copy = this.group = group;
61	295	//selectees = this.group.selectees;
62	296
	297	+ if (copy.versions == null)
	298	+ {
	299	+ copy.versions = new byte[100][];
	300	+ copy.versionindex = -1;
	301	+ }
	302	+
63	303	if(ui)
64	304	SetupUI(objEditor);
65	305	}
..	..	@@ -80,14 +320,22 @@
80	320	SetupViews(objEditor);
81	321
82	322	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	323	+
	324	+ if (copy.versions == null)
	325	+ {
	326	+ copy.versions = new byte[100][];
	327	+ copy.versionindex = -1;
	328	+
	329	+ Save(true);
	330	+ }
83	331	}
84	332
85	333	void CloneSelection(boolean supports)
86	334	{
87		- if (Globals.SAVEONMAKE)
	335	+ if (Globals.REPLACEONMAKE)
88	336	Save();
89		- boolean keep = Globals.SAVEONMAKE;
90		- Globals.SAVEONMAKE = false;
	337	+ boolean keep = Globals.REPLACEONMAKE;
	338	+ Globals.REPLACEONMAKE = false;
91	339	// Object3D keep = GrafreeD.clipboard;
92	340	//Object3D obj;
93	341	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -98,7 +346,7 @@
98	346
99	347	makeSomething(clone, i==group.selection.size()-1);
100	348	}
101		- Globals.SAVEONMAKE = keep;
	349	+ Globals.REPLACEONMAKE = keep;
102	350	}
103	351
104	352	void CloneClipboard(boolean supports)
..	..	@@ -194,8 +442,8 @@
194	442	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
195	443	// pasteExpandItem.addActionListener(this);
196	444	menu.add("-");
197		- clearItem = menu.add(new MenuItem("Clear"));
198		- clearItem.addActionListener(this);
	445	+ deleteItem = menu.add(new MenuItem("Delete"));
	446	+ deleteItem.addActionListener(this);
199	447
200	448	if (Globals.ADVANCED)
201	449	{
..	..	@@ -421,7 +669,7 @@
421	669	genNormalsMESHItem.addActionListener(this);
422	670	if (Globals.ADVANCED)
423	671	{
424		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	672	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
425	673	genNormalsMINEItem.addActionListener(this);
426	674	}
427	675	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -514,10 +762,15 @@
514	762	attachBumpItem.addActionListener(this);
515	763	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
516	764	pigmentBumpItem.addActionListener(this);
	765	+ //embedTexturesItem
517	766	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
518	767	detachPigmentItem.addActionListener(this);
519	768	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
520	769	detachBumpItem.addActionListener(this);
	770	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	771	+ embedTexturesItem.addActionListener(this);
	772	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	773	+ deEmbedTexturesItem.addActionListener(this);
521	774	menu.add("-");
522	775	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
523	776	sortbysizeItem.addActionListener(this);
..	..	@@ -544,6 +797,7 @@
544	797	buildToolsMenu(menu);
545	798	}
546	799
	800	+
547	801	void SetupUI2(ObjEditor oe)
548	802	{
549	803	// June 2019
..	..	@@ -588,7 +842,7 @@
588	842	*/
589	843	cGridBag copyOptionsPanel = new cGridBag();
590	844
591		- copyOptionsPanel.preferredHeight = 1;
	845	+ copyOptionsPanel.preferredHeight = 2;
592	846
593	847	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
594	848
..	..	@@ -615,29 +869,42 @@
615	869	restoreCameraButton.setToolTipText("Restore viewpoint");
616	870	restoreCameraButton.addActionListener(this);
617	871
	872	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	873	+ saveButton.setToolTipText("New version");
	874	+ saveButton.addActionListener(this);
	875	+
618	876	copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
619		- undoButton.setToolTipText("Undo changes");
	877	+ undoButton.setToolTipText("Previous version");
620	878	undoButton.addActionListener(this);
621	879	undoButton.setEnabled(false);
622	880
	881	+ cGridBag updown = new cGridBag().setVertical(true);
	882	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	883	+ restoreButton.setToolTipText("Restore current");
	884	+ restoreButton.addActionListener(this);
	885	+ restoreButton.setEnabled(false);
	886	+
	887	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	888	+ replaceButton.setToolTipText("Replace current");
	889	+ replaceButton.addActionListener(this);
	890	+ replaceButton.setEnabled(false);
	891	+
	892	+ copyOptionsPanel.add(updown);
	893	+
623	894	copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624		- redoButton.setToolTipText("Redo changes");
	895	+ redoButton.setToolTipText("Next version");
625	896	redoButton.addActionListener(this);
626	897	redoButton.setEnabled(false);
627	898
628		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- saveButton.setToolTipText("Save changes");
630		- saveButton.addActionListener(this);
631		-
632		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	899	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
633	900	liveCB.setToolTipText("Enable animation");
634	901	liveCB.addItemListener(this);
635	902
636		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	903	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637	904	oneStepButton.setToolTipText("Animate one step forward");
638	905	oneStepButton.addActionListener(this);
639	906
640		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	907	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
641	908	fastCB.setToolTipText("Fast mode");
642	909	fastCB.addItemListener(this);
643	910
..	..	@@ -655,31 +922,32 @@
655	922	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
656	923	snapobjectButton.addActionListener(this);
657	924	snapobjectButton.setToolTipText("Snap Object");
	925	+
	926	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	927	+ fourButton.addActionListener(this);
	928	+ fourButton.setToolTipText("Show control panel only");
658	929	}
659	930
660	931	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
661	932
662		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
663		- twoButton.setToolTipText("Show center view only");
	933	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	934	+ twoButton.setToolTipText("Show 3D view only");
664	935	twoButton.addActionListener(this);
665	936	this.fullscreenLayout = twoButton;
666	937
667		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668		- fourButton.addActionListener(this);
669		- fourButton.setToolTipText("Show left panel only");
670		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- sixButton.setToolTipText("2-column layout left");
672		- sixButton.addActionListener(this);
673		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674		- threeButton.setToolTipText("2-column layout right");
	938	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ threeButton.setToolTipText("Show controls and 3D view");
675	940	threeButton.addActionListener(this);
676		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
677		- sevenButton.setToolTipText("3-column layout");
678		- sevenButton.addActionListener(this);
	941	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	942	+ sixButton.setToolTipText("Show 3D view and controls");
	943	+ sixButton.addActionListener(this);
	944	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	945	+// sevenButton.setToolTipText("3-column layout");
	946	+// sevenButton.addActionListener(this);
679	947	//
680	948
681		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682		- rootButton.setToolTipText("Edit selection in new tab");
	949	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	950	+ rootButton.setToolTipText("Open selection in new tab");
683	951	rootButton.addActionListener(this);
684	952
685	953	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -688,28 +956,30 @@
688	956	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
689	957	//clearButton.addActionListener(this);
690	958
	959	+ cGridBag row1 = new cGridBag();
	960	+
691	961	// INSERT
692		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	962	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
693	963	gridButton.setToolTipText("Create grid");
694	964	gridButton.addActionListener(this);
695	965
696		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	966	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
697	967	boxButton.setToolTipText("Create box");
698	968	boxButton.addActionListener(this);
699	969
700		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	970	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
701	971	sphereButton.setToolTipText("Create sphere");
702	972	sphereButton.addActionListener(this);
703	973
704		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	974	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
705	975	coneButton.setToolTipText("Create cone");
706	976	coneButton.addActionListener(this);
707	977
708		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	978	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
709	979	torusButton.setToolTipText("Create torus");
710	980	torusButton.addActionListener(this);
711	981
712		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	982	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
713	983	superButton.setToolTipText("Create superellipsoid");
714	984	superButton.addActionListener(this);
715	985
..	..	@@ -720,51 +990,56 @@
720	990	kleinButton.addActionListener(this);
721	991	}
722	992
723		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	993	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
724	994	particlesButton.setToolTipText("Create particle system");
725	995	particlesButton.addActionListener(this);
726	996
727		- oe.toolboxPanel.Return();
	997	+ oe.toolboxPanel.add(row1);
728	998
729		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	999	+ cGridBag row2 = new cGridBag();
	1000	+
	1001	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730	1002	groupButton.setToolTipText("Create group");
731	1003	groupButton.addActionListener(this);
732	1004
733		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1005	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
734	1006	compositeButton.setToolTipText("Create composite");
735	1007	compositeButton.addActionListener(this);
736	1008
737		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1009	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
738	1010	switchButton.setToolTipText("Create item switcher");
739	1011	switchButton.addActionListener(this);
740	1012
741		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1013	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
742	1014	loopButton.setToolTipText("Create loop");
743	1015	loopButton.addActionListener(this);
744	1016
745		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1017	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
746	1018	textureButton.setToolTipText("Create texture");
747	1019	textureButton.addActionListener(this);
748	1020
749		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1021	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
750	1022	overlayButton.setToolTipText("Create overlay");
751	1023	overlayButton.addActionListener(this);
752	1024
753		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1025	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
754	1026	lightButton.setToolTipText("Create light");
755	1027	lightButton.addActionListener(this);
756	1028
757		- for (int i=6; --i>=0;)
758		- {
759		- oe.toolboxPanel.Return();
760		- oe.toolboxPanel.add(new cGridBag());
761		- oe.toolboxPanel.add(new cGridBag());
762		- oe.toolboxPanel.add(new cGridBag());
763		- oe.toolboxPanel.add(new cGridBag());
764		- oe.toolboxPanel.add(new cGridBag());
765		- oe.toolboxPanel.add(new cGridBag());
766		- oe.toolboxPanel.add(new cGridBag());
767		- }
	1029	+ oe.toolboxPanel.add(row2);
	1030	+
	1031	+ // ENVYMAPS
	1032	+ cGridBag skyboxpane = new cGridBag();
	1033	+ skyboxpane.preferredHeight = 100;
	1034	+
	1035	+ oe.toolboxPanel.add(skyboxpane);
	1036	+
	1037	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1038	+ skyboxpane.add(skyboxpanel);
	1039	+
	1040	+ AddSkyboxTab0(skyboxpanel);
	1041	+ AddSkyboxTab1(skyboxpanel);
	1042	+ AddSkyboxTab2(skyboxpanel);
768	1043
769	1044	// EDIT panel
770	1045	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -820,9 +1095,12 @@
820	1095
821	1096	oe.treePanel.add(copyOptionsPanel);
822	1097	oe.treePanel.Return();
	1098	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1099	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1100	+ sliderPane.preferredHeight = 1;
823	1101
824		-// mainPanel.setDividerLocation(0.5); //1.0);
825		-// mainPanel.setResizeWeight(0.5);
	1102	+// mainPanel.setDividerLocation(0.1); //1.0);
	1103	+ mainPanel.setResizeWeight(0.4);
826	1104
827	1105	//jList.addListSelectionListener(this);
828	1106	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -830,7 +1108,7 @@
830	1108	//jTree.setEditable(true);
831	1109	oe.jTree.setDragEnabled(true);
832	1110	//jTree.setPreferredSize(new Dimension(10,10));
833		- jSP.setPreferredSize(new Dimension(100,200));
	1111	+ //jSP.setPreferredSize(new Dimension(100,200));
834	1112
835	1113	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
836	1114
..	..	@@ -842,7 +1120,7 @@
842	1120	dgr.addDragGestureListener(this);
843	1121	}catch(Exception e) {}
844	1122	*/
845		- radio.layout = sevenButton;
	1123	+ radio.layout = sixButton; // sevenButton;
846	1124	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
847	1125	}
848	1126
..	..	@@ -945,9 +1223,9 @@
945	1223	toggleSwitchCB.setToolTipText("Choose a single item");
946	1224	toggleSwitchCB.addItemListener(this);
947	1225
948		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
949		- autosaveCB.setToolTipText("On structure change");
950		- autosaveCB.addItemListener(this);
	1226	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1227	+ autokeepCB.setToolTipText("On structure change");
	1228	+ autokeepCB.addItemListener(this);
951	1229
952	1230	panel.Return();
953	1231	if (Globals.ADVANCED)
..	..	@@ -984,7 +1262,7 @@
984	1262	}
985	1263
986	1264	radioButton.SetObject(obj);
987		- radioButton.layout = sevenButton;
	1265	+ radioButton.layout = sixButton; // sevenButton;
988	1266	radioButton.SetCamera(cameraView.renderCamera, false);
989	1267	radioButton.addActionListener(this);
990	1268	radioPanel.add(radioButton);
..	..	@@ -1024,7 +1302,7 @@
1024	1302
1025	1303	cCheckBox oeilCB;
1026	1304	cCheckBox shadowCB;
1027		- cCheckBox autosaveCB;
	1305	+ cCheckBox autokeepCB;
1028	1306	cCheckBox lookAtCB;
1029	1307
1030	1308	// static int COLOR = 1;
..	..	@@ -1136,9 +1414,9 @@
1136	1414	{
1137	1415	Globals.FREEZEONMOVE ^= true;
1138	1416	}
1139		- else if(e.getSource() == autosaveCB)
	1417	+ else if(e.getSource() == autokeepCB)
1140	1418	{
1141		- Globals.SAVEONMAKE ^= true;
	1419	+ Globals.REPLACEONMAKE ^= true;
1142	1420	}
1143	1421	else if(e.getSource() == lookAtCB)
1144	1422	{
..	..	@@ -1664,6 +1942,16 @@
1664	1942	}
1665	1943	}
1666	1944	}
	1945	+
	1946	+ private void EditElement(Object3D elem, boolean newWindow)
	1947	+ {
	1948	+ // if (!(elem instanceof Composite))
	1949	+ // newWindow = false;
	1950	+ listUI.add(elem);
	1951	+ elem.openEditWindow(this, newWindow); //, false);
	1952	+ System.out.println("edit : " + elem);
	1953	+ elem.editWindow.refreshContents(true); // ? new
	1954	+ }
1667	1955
1668	1956	/**
1669	1957	* applyExample
..	..	@@ -2092,6 +2380,23 @@
2092	2380	{
2093	2381	makeSomething(new Light());
2094	2382	} else
	2383	+// if (source == skybox1Button \|\|
	2384	+// source == skybox2Button \|\|
	2385	+// source == skybox3Button \|\|
	2386	+// source == skybox4Button \|\|
	2387	+// source == skybox5Button \|\|
	2388	+// source == skybox6Button \|\|
	2389	+// source == skybox7Button \|\|
	2390	+// source == skybox11Button \|\|
	2391	+// source == skybox12Button \|\|
	2392	+// source == skybox13Button \|\|
	2393	+// source == skybox14Button \|\|
	2394	+// source == skybox15Button \|\|
	2395	+// source == skybox16Button \|\|
	2396	+// source == skybox17Button)
	2397	+// {
	2398	+// ChangeSkybox(source);
	2399	+// } else
2095	2400	if (source == csgItem)
2096	2401	{
2097	2402	group(new CSG());
..	..	@@ -2177,7 +2482,7 @@
2177	2482	if (source == computeAOItem)
2178	2483	{
2179	2484	Globals.drawMode = CameraPane.OCCLUSION;
2180		- Globals.theRenderer.repaint();
	2485	+ cameraView.repaint();
2181	2486	} else
2182	2487	if (source == recompileItem)
2183	2488	{
..	..	@@ -2225,15 +2530,29 @@
2225	2530	} else
2226	2531	if (source == undoButton)
2227	2532	{
2228		- if (!Undo())
2229		- java.awt.Toolkit.getDefaultToolkit().beep();
	2533	+ // Go to previous version
	2534	+ //if (!Undo())
	2535	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2536	+ Undo();
	2537	+ } else
	2538	+ if (source == restoreButton)
	2539	+ {
	2540	+ // Restore current version
	2541	+ Restore();
	2542	+ } else
	2543	+ if (source == replaceButton)
	2544	+ {
	2545	+ // Overwrite current version
	2546	+ Replace();
2230	2547	} else
2231	2548	if (source == redoButton)
2232	2549	{
	2550	+ // Go to next version
2233	2551	Redo();
2234	2552	} else
2235	2553	if (source == saveButton)
2236	2554	{
	2555	+ // Save a new version
2237	2556	if (!Save(true))
2238	2557	java.awt.Toolkit.getDefaultToolkit().beep();
2239	2558	} else
..	..	@@ -2615,7 +2934,7 @@
2615	2934	{
2616	2935	StepAll();
2617	2936	} else
2618		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2937	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2619	2938	{
2620	2939	//int indices[] = jList.getSelectedIndices();
2621	2940	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -3097,7 +3416,7 @@
3097	3416	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3098	3417	{
3099	3418	obj = (Object3D)e.nextElement();
3100		- obj.SetBumpTexture(null);
	3419	+ obj.ResetBumpTexture();
3101	3420	}
3102	3421
3103	3422	refreshContents();
..	..	@@ -3111,6 +3430,31 @@
3111	3430	obj.SetBumpTexture(obj.GetPigmentTexture());
3112	3431	}
3113	3432
	3433	+ refreshContents();
	3434	+ } else
	3435	+ if (source == embedTexturesItem)
	3436	+ {
	3437	+ Object3D obj;
	3438	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3439	+ {
	3440	+ obj = (Object3D)e.nextElement();
	3441	+ obj.EmbedTextures(true);
	3442	+ }
	3443	+
	3444	+ refreshContents();
	3445	+ } else
	3446	+ if (source == deEmbedTexturesItem)
	3447	+ {
	3448	+ Object3D obj;
	3449	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3450	+ {
	3451	+ obj = (Object3D)e.nextElement();
	3452	+ obj.EmbedTextures(false);
	3453	+ }
	3454	+
	3455	+ CameraPane.texturepigment.clear();
	3456	+ CameraPane.texturebump.clear();
	3457	+
3114	3458	refreshContents();
3115	3459	} else
3116	3460	if (source == flashSelectionButton)
..	..	@@ -3214,8 +3558,8 @@
3214	3558	// centralPanel.setVisible(true);
3215	3559	// XYZPanel.setVisible(true);
3216	3560	bigThree.ClearUI();
	3561	+ bigThree.add(scenePanel);
3217	3562	bigThree.add(centralPanel);
3218		- bigThree.add(XYZPanel);
3219	3563	bigThree.FlushUI();
3220	3564
3221	3565	cameraView.requestFocusInWindow();
..	..	@@ -3295,8 +3639,8 @@
3295	3639	// centralPanel.setVisible(true);
3296	3640	// XYZPanel.setVisible(false);
3297	3641	bigThree.ClearUI();
3298		- bigThree.add(scenePanel);
3299	3642	bigThree.add(centralPanel);
	3643	+ bigThree.add(scenePanel);
3300	3644	bigThree.FlushUI();
3301	3645
3302	3646	cameraView.requestFocusInWindow();
..	..	@@ -3479,6 +3823,9 @@
3479	3823	}
3480	3824
3481	3825	copy = group;
	3826	+
	3827	+ SetUndoStates();
	3828	+
3482	3829	//Globals.theRenderer.object = group;
3483	3830	if(!useclient)
3484	3831	{
..	..	@@ -3507,8 +3854,10 @@
3507	3854	radio.layout.doClick();
3508	3855
3509	3856	ClearUnpinned();
3510		- SetPinStates(group.selection.size() > 0);
3511		- if (group.selection.size() == 1)
	3857	+ //Grafreed.Assert(group != null);
	3858	+ //Grafreed.Assert(group.selection != null);
	3859	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3860	+ if (group.selection == null \|\| group.selection.size() == 1)
3512	3861	EditSelection(false);
3513	3862	keepparent = group.parent;
3514	3863	// PARENT = NULL or not???
..	..	@@ -4102,7 +4451,7 @@
4102	4451
4103	4452	try
4104	4453	{
4105		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4454	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4106	4455	}
4107	4456	catch (Exception e)
4108	4457	{
..	..	@@ -4579,6 +4928,12 @@
4579	4928
4580	4929	void EditSelection(boolean newWindow)
4581	4930	{
	4931	+ if (group.selection == null)
	4932	+ {
	4933	+ EditElement(group, newWindow); // ? new
	4934	+ return;
	4935	+ }
	4936	+
4582	4937	// aConstraints.gridy = 0;
4583	4938	for (int i=0; i<group.selection.size(); i++)
4584	4939	{
..	..	@@ -4589,12 +4944,7 @@
4589	4944	Object3D elem = (Object3D)group.selection.elementAt(i);
4590	4945	if(elem != group \|\| !newWindow)
4591	4946	{
4592		- // if (!(elem instanceof Composite))
4593		- // newWindow = false;
4594		- listUI.add(elem);
4595		- elem.openEditWindow(this, newWindow); //, false);
4596		- System.out.println("edit : " + elem);
4597		- elem.editWindow.refreshContents(true); // ? new
	4947	+ EditElement(elem, newWindow); // ? new
4598	4948	}
4599	4949	}
4600	4950	}
..	..	@@ -4738,7 +5088,7 @@
4738	5088
4739	5089	void refreshContents(boolean cp)
4740	5090	{
4741		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	5091	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4742	5092	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4743	5093	{
4744	5094	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4942,10 +5292,10 @@
4942	5292
4943	5293	void paste(boolean expand)
4944	5294	{
4945		- if (Globals.SAVEONMAKE)
	5295	+ if (Globals.REPLACEONMAKE)
4946	5296	Save();
4947		- boolean keep = Globals.SAVEONMAKE;
4948		- Globals.SAVEONMAKE = false;
	5297	+ boolean keep = Globals.REPLACEONMAKE;
	5298	+ Globals.REPLACEONMAKE = false;
4949	5299	// if (GrafreeD.clipboard == null)
4950	5300	// return;
4951	5301	boolean first = true;
..	..	@@ -5005,7 +5355,7 @@
5005	5355	Grafreed.clipboard.get(0).parent = keepparent;
5006	5356	}
5007	5357
5008		- Globals.SAVEONMAKE = keep;
	5358	+ Globals.REPLACEONMAKE = keep;
5009	5359	ResetModel();
5010	5360	refreshContents();
5011	5361	}
..	..	@@ -5141,10 +5491,10 @@
5141	5491
5142	5492	void group(Object3D csg, boolean grab)
5143	5493	{
5144		- if (Globals.SAVEONMAKE)
	5494	+ if (Globals.REPLACEONMAKE)
5145	5495	Save();
5146		- boolean keep = Globals.SAVEONMAKE;
5147		- Globals.SAVEONMAKE = false;
	5496	+ boolean keep = Globals.REPLACEONMAKE;
	5497	+ Globals.REPLACEONMAKE = false;
5148	5498	if (//false) // why??
5149	5499	!group.selection.isEmpty())
5150	5500	{
..	..	@@ -5258,15 +5608,15 @@
5258	5608	//node.add(csg);
5259	5609	//makeSomething(node);
5260	5610	makeSomething(csg);
5261		- Globals.SAVEONMAKE = keep;
	5611	+ Globals.REPLACEONMAKE = keep;
5262	5612	}
5263	5613
5264	5614	void Ungroup(Object3D g)
5265	5615	{
5266		- if (Globals.SAVEONMAKE)
	5616	+ if (Globals.REPLACEONMAKE)
5267	5617	Save();
5268		- boolean keep = Globals.SAVEONMAKE;
5269		- Globals.SAVEONMAKE = false;
	5618	+ boolean keep = Globals.REPLACEONMAKE;
	5619	+ Globals.REPLACEONMAKE = false;
5270	5620	if (g instanceof HiddenObject)
5271	5621	{
5272	5622	HiddenObject h = (HiddenObject) g;
..	..	@@ -5283,7 +5633,7 @@
5283	5633	objEditor.makeSomething(g.get(i), false);
5284	5634	}
5285	5635	}
5286		- Globals.SAVEONMAKE = keep;
	5636	+ Globals.REPLACEONMAKE = keep;
5287	5637	}
5288	5638
5289	5639	void ungroup()
..	..	@@ -5584,6 +5934,22 @@
5584	5934	cButton loopButton;
5585	5935	cButton textureButton;
5586	5936
	5937	+ cButton skybox1Button;
	5938	+ cButton skybox2Button;
	5939	+ cButton skybox3Button;
	5940	+ cButton skybox4Button;
	5941	+ cButton skybox5Button;
	5942	+ cButton skybox6Button;
	5943	+ cButton skybox7Button;
	5944	+
	5945	+ cButton skybox11Button;
	5946	+ cButton skybox12Button;
	5947	+ cButton skybox13Button;
	5948	+ cButton skybox14Button;
	5949	+ cButton skybox15Button;
	5950	+ cButton skybox16Button;
	5951	+ cButton skybox17Button;
	5952	+
5587	5953	cButton gridButton;
5588	5954	cButton boxButton;
5589	5955	cButton sphereButton;
..	..	@@ -5647,7 +6013,7 @@
5647	6013	private MenuItem pasteLinkItem;
5648	6014	private MenuItem pasteCloneItem;
5649	6015	private MenuItem pasteExpandItem;
5650		- private MenuItem clearItem;
	6016	+ private MenuItem deleteItem;
5651	6017	private MenuItem clearAllItem;
5652	6018	private MenuItem genUVItem;
5653	6019	private MenuItem genNormalsMESHItem;
..	..	@@ -5731,6 +6097,8 @@
5731	6097	private MenuItem attachBumpItem;
5732	6098	private MenuItem detachBumpItem;
5733	6099	private MenuItem pigmentBumpItem;
	6100	+ private MenuItem embedTexturesItem;
	6101	+ private MenuItem deEmbedTexturesItem;
5734	6102
5735	6103	private MenuItem particleItem;
5736	6104	private MenuItem ragdollItem;