~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -29,7 +29,7 @@
29	29	{
30	30	cButton skyboxButton;
31	31	final String path = "cubemaps/" + f + "-skyboxes/" + s;
32		- row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
33	33	//row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
34	34	skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
35	35	skyboxButton.addActionListener(new ActionListener()
..	..	@@ -46,7 +46,7 @@
46	46	{
47	47	cButton textureButton;
48	48	final String path = "textures/" + f + "/" + c + "/"; // + t;
49		- row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
50	50	textureButton.setToolTipText(c + count);
51	51	textureButton.addActionListener(new ActionListener()
52	52	{
..	..	@@ -347,7 +347,7 @@
347	347
348	348	public void CreateSkyboxPanel(cGridBag skyboxPanel)
349	349	{
350		- JTabbedPane skyboxpane = new JTabbedPane();
	350	+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
351	351
352	352	AddSkyboxTab0(skyboxpane);
353	353	AddSkyboxTab1(skyboxpane);
..	..	@@ -415,13 +415,15 @@
415	415	this.copy = this.group = group;
416	416	//selectees = this.group.selectees;
417	417
418		- if (copy.versionlist == null)
419		- {
420		- copy.versionlist = new Object3D[100];
421		- copy.versionindex = -1;
422		-
423		- Save(true);
424		- }
	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	+// }
425	427
426	428	if(ui)
427	429	SetupUI(objEditor);
..	..	@@ -444,13 +446,13 @@
444	446
445	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
446	448
447		- if (copy.versionlist == null)
448		- {
449		- copy.versionlist = new Object3D[100];
450		- copy.versionindex = -1;
451		-
452		- Save(true);
453		- }
	449	+// if (copy.versionlist == null)
	450	+// {
	451	+// copy.versionlist = new Object3D[100];
	452	+// copy.versionindex = -1;
	453	+//
	454	+// //Save(true);
	455	+// }
454	456	}
455	457
456	458	void CloneSelection(boolean supports)
..	..	@@ -763,11 +765,11 @@
763	765	shadowYItem.addActionListener(this);
764	766	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
765	767	shadowZItem.addActionListener(this);
766		- attributeItem = menu.add(new MenuItem("Attribute"));
767		- attributeItem.addActionListener(this);
768	768
769	769	if (Globals.ADVANCED)
770	770	{
	771	+ attributeItem = menu.add(new MenuItem("Attribute"));
	772	+ attributeItem.addActionListener(this);
771	773	menu.add("-");
772	774	linkerItem = menu.add(new MenuItem("Linker"));
773	775	linkerItem.addActionListener(this);
..	..	@@ -777,11 +779,18 @@
777	779	pointflowItem.addActionListener(this);
778	780	}
779	781	menu.add("-");
	782	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	783	+ textureRatioRItem.addActionListener(this);
	784	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	785	+ textureRatioGItem.addActionListener(this);
	786	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	787	+ textureRatioBItem.addActionListener(this);
	788	+ menu.add("-");
780	789	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
781	790	resetTransformItem.addActionListener(this);
782	791	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
783	792	resetCentroidItem.addActionListener(this);
784		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	793	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
785	794	resetCentroidXZItem.addActionListener(this);
786	795	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
787	796	transformGeometryItem.addActionListener(this);
..	..	@@ -833,6 +842,8 @@
833	842	}
834	843
835	844	oe.menuBar.add(menu = new Menu("Attributes"));
	845	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	846	+ clearVersionsItem.addActionListener(this);
836	847	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
837	848	clearMaterialsItem.addActionListener(this);
838	849	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -855,9 +866,9 @@
855	866	hideleavesItem.addActionListener(this);
856	867	showleavesItem = menu.add(new MenuItem("Show Leaves"));
857	868	showleavesItem.addActionListener(this);
858		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	869	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
859	870	markleavesItem.addActionListener(this);
860		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	871	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
861	872	unmarkleavesItem.addActionListener(this);
862	873	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
863	874	rewindleavesItem.addActionListener(this);
..	..	@@ -934,6 +945,8 @@
934	945	cGridBag currenttab;
935	946	//boolean added; // patch for jar
936	947
	948	+ int totalcount = 0;
	949	+
937	950	int tabcount = 0;
938	951	int colcount = 0;
939	952	int rowcount = 0;
..	..	@@ -962,7 +975,7 @@
962	975	texturecount = 0;
963	976	}
964	977
965		- if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	978	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
966	979	{
967	980	//if (!added)
968	981	{
..	..	@@ -971,7 +984,8 @@
971	984	currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
972	985	}
973	986
974		- AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	987	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	988	+ totalcount++;
975	989
976	990	if (++colcount >= columns)
977	991	{
..	..	@@ -997,6 +1011,8 @@
997	1011	container.add(resourcecontainer);
998	1012
999	1013	Grafreed.ParseResources("textures", this);
	1014	+
	1015	+ // 935. System.out.println("Total = " + totalcount);
1000	1016	}
1001	1017
1002	1018	void SetupUI2(ObjEditor oe)
..	..	@@ -1036,9 +1052,9 @@
1036	1052	oe.radioPanel.add(dummyButton);
1037	1053	oe.buttonGroup.add(dummyButton);
1038	1054	*/
1039		- cGridBag copyOptionsPanel = new cGridBag();
	1055	+ cGridBag versionManagerPanel = new cGridBag();
1040	1056
1041		- copyOptionsPanel.preferredHeight = 2;
	1057	+ versionManagerPanel.preferredHeight = 4;
1042	1058
1043	1059	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1044	1060
..	..	@@ -1065,25 +1081,25 @@
1065	1081	// }
1066	1082	// });
1067	1083
1068		- oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1069	1085	collapseButton.setToolTipText("Collapse toolbar");
1070	1086	collapseButton.addActionListener(this);
1071	1087
1072		- oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1088	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1073	1089	maximize3DButton.setToolTipText("Maximize 3D view");
1074	1090	maximize3DButton.addActionListener(this);
1075	1091
1076		- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1092	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1077	1093	twoButton.setToolTipText("Show 3D view only");
1078	1094	twoButton.addActionListener(this);
1079	1095	this.fullscreenLayout = twoButton;
1080	1096
1081		- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1082	1098	threeButton.setToolTipText("Show controls and 3D view");
1083	1099	threeButton.addActionListener(this);
1084	1100	if (Globals.ADVANCED)
1085	1101	{
1086		- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1102	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1087	1103	sixButton.setToolTipText("Show 3D view and controls");
1088	1104	sixButton.addActionListener(this);
1089	1105	}
..	..	@@ -1092,50 +1108,51 @@
1092	1108	// sevenButton.addActionListener(this);
1093	1109	//
1094	1110
1095		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1111	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1096	1112	fullButton.setToolTipText("Full-screen window");
1097	1113	fullButton.addActionListener(this);
1098	1114
1099		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1100	1116	screenfitButton.setToolTipText("Screen fit");
1101	1117	screenfitButton.addActionListener(this);
1102	1118
1103		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1104	1120	restoreCameraButton.setToolTipText("Restore viewpoint");
1105	1121	restoreCameraButton.addActionListener(this);
1106	1122
1107		- copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1108	1124	saveVersionButton.setToolTipText("Duplicate current version");
1109	1125	saveVersionButton.addActionListener(this);
1110	1126
1111		- copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1127	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1112	1128	deleteVersionButton.setToolTipText("Delete current version");
1113	1129	deleteVersionButton.addActionListener(this);
	1130	+ deleteVersionButton.setEnabled(false);
1114	1131
1115		- copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1132	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1116	1133	previousVersionButton.setToolTipText("Previous version");
1117	1134	previousVersionButton.addActionListener(this);
1118	1135	previousVersionButton.setEnabled(false);
1119	1136
1120	1137	cGridBag updown = new cGridBag().setVertical(true);
1121		- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1138	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1122	1139	restoreButton.setToolTipText("Undo (restore current version)");
1123	1140	restoreButton.addActionListener(this);
1124		- //restoreButton.setEnabled(false);
	1141	+ restoreButton.setEnabled(false);
1125	1142
1126		- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1143	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1127	1144	replaceButton.setToolTipText("Save (replace current version)");
1128	1145	replaceButton.addActionListener(this);
1129		- //replaceButton.setEnabled(false);
	1146	+ replaceButton.setEnabled(false);
1130	1147
1131		- copyOptionsPanel.add(updown);
	1148	+ versionManagerPanel.add(updown);
1132	1149
1133		- copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1150	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1134	1151	nextVersionButton.setToolTipText("Next version");
1135	1152	nextVersionButton.addActionListener(this);
1136	1153	nextVersionButton.setEnabled(false);
1137	1154
1138		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1155	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1139	1156	oneStepButton.setToolTipText("Animate one step forward");
1140	1157	oneStepButton.addActionListener(this);
1141	1158
..	..	@@ -1158,11 +1175,11 @@
1158	1175
1159	1176	if (Globals.ADVANCED)
1160	1177	{
1161		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1178	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1162	1179	snapobjectButton.addActionListener(this);
1163	1180	snapobjectButton.setToolTipText("Snap Object");
1164	1181
1165		- oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1182	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1166	1183	fourButton.addActionListener(this);
1167	1184	fourButton.setToolTipText("Show control panel only");
1168	1185	}
..	..	@@ -1170,11 +1187,11 @@
1170	1187	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1171	1188
1172	1189
1173		- oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1174	1191	rootButton.setToolTipText("Open selection in new tab");
1175	1192	rootButton.addActionListener(this);
1176	1193
1177		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1178	1195	closeButton.setToolTipText("Close tab");
1179	1196	closeButton.addActionListener(this);
1180	1197	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..	..	@@ -1183,38 +1200,38 @@
1183	1200	cGridBag row1 = new cGridBag();
1184	1201
1185	1202	// INSERT
1186		- row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1203	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1187	1204	gridButton.setToolTipText("Create ground");
1188	1205	gridButton.addActionListener(this);
1189	1206
1190		- row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1191	1208	boxButton.setToolTipText("Create box");
1192	1209	boxButton.addActionListener(this);
1193	1210
1194		- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1195	1212	superButton.setToolTipText("Create superellipsoid");
1196	1213	superButton.addActionListener(this);
1197	1214
1198		- row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1199	1216	sphereButton.setToolTipText("Create sphere");
1200	1217	sphereButton.addActionListener(this);
1201	1218
1202		- row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1203	1220	coneButton.setToolTipText("Create cone");
1204	1221	coneButton.addActionListener(this);
1205	1222
1206		- row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1207	1224	torusButton.setToolTipText("Create torus");
1208	1225	torusButton.addActionListener(this);
1209	1226
1210		- if (Globals.ADVANCED)
	1227	+ if (false) //Globals.ADVANCED)
1211	1228	{
1212		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1213	1230	kleinButton.setToolTipText("Create Klein bottle");
1214	1231	kleinButton.addActionListener(this);
1215	1232	}
1216	1233
1217		- row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1218	1235	particlesButton.setToolTipText("Create particle system");
1219	1236	particlesButton.addActionListener(this);
1220	1237
..	..	@@ -1222,31 +1239,31 @@
1222	1239
1223	1240	cGridBag row2 = new cGridBag();
1224	1241
1225		- row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1242	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1226	1243	groupButton.setToolTipText("Create group");
1227	1244	groupButton.addActionListener(this);
1228	1245
1229		- row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1230	1247	compositeButton.setToolTipText("Create composite");
1231	1248	compositeButton.addActionListener(this);
1232	1249
1233		- row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1234	1251	switchButton.setToolTipText("Create item switcher");
1235	1252	switchButton.addActionListener(this);
1236	1253
1237		- row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1254	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1238	1255	loopButton.setToolTipText("Create loop");
1239	1256	loopButton.addActionListener(this);
1240	1257
1241		- row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1258	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1242	1259	textureButton.setToolTipText("Create texture");
1243	1260	textureButton.addActionListener(this);
1244	1261
1245		- row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1262	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1246	1263	overlayButton.setToolTipText("Create overlay");
1247	1264	overlayButton.addActionListener(this);
1248	1265
1249		- row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1266	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1250	1267	lightButton.setToolTipText("Create light");
1251	1268	lightButton.addActionListener(this);
1252	1269
..	..	@@ -1256,6 +1273,11 @@
1256	1273
1257	1274	CreateTexturePanel(textures);
1258	1275
	1276	+ int tabCount = resourcecontainer.getTabCount();
	1277	+
	1278	+ if (tabCount > 0)
	1279	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1280	+
1259	1281	oe.toolboxPanel.add(textures);
1260	1282
1261	1283	textures.preferredHeight = 100;
..	..	@@ -1263,11 +1285,11 @@
1263	1285	CreateSkyboxPanel(oe.skyboxPanel);
1264	1286
1265	1287	// EDIT panel
1266		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1288	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1267	1289	editButton.setToolTipText("Pin selection controls");
1268	1290	editButton.addActionListener(this);
1269	1291
1270		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1271	1293	uneditButton.setToolTipText("Unpin and remove selection controls");
1272	1294	uneditButton.addActionListener(this);
1273	1295
..	..	@@ -1275,7 +1297,7 @@
1275	1297	allParamsButton.setToolTipText("Show all controls");
1276	1298	allParamsButton.addActionListener(this);
1277	1299
1278		- editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1300	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1279	1301	clearPanelButton.setToolTipText("Clear all controls");
1280	1302	clearPanelButton.addActionListener(this);
1281	1303
..	..	@@ -1283,7 +1305,7 @@
1283	1305	//unselectButton.setToolTipText("Unselect");
1284	1306	//unselectButton.addActionListener(this);
1285	1307
1286		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1308	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1287	1309	flashSelectionButton.setToolTipText("Highlight selection");
1288	1310	flashSelectionButton.addActionListener(this);
1289	1311
..	..	@@ -1306,6 +1328,8 @@
1306	1328
1307	1329	cGridBag jSPPanel = new cGridBag();
1308	1330
	1331	+ jSPPanel.preferredHeight = 20;
	1332	+
1309	1333	JScrollPane jSP;
1310	1334	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1311	1335	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -1314,11 +1338,11 @@
1314	1338	oe.treePanel.add(jSPPanel);
1315	1339	oe.treePanel.Return();
1316	1340
1317		- oe.treePanel.add(copyOptionsPanel);
	1341	+ oe.treePanel.add(versionManagerPanel);
1318	1342	oe.treePanel.Return();
1319		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1320		- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1321		- sliderPane.preferredHeight = 1;
	1343	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1344	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1345	+ versionSliderPane.preferredHeight = 3;
1322	1346
1323	1347	// mainPanel.setDividerLocation(0.1); //1.0);
1324	1348	mainPanel.setResizeWeight(0.4);
..	..	@@ -1476,7 +1500,7 @@
1476	1500
1477	1501	void EditObject(Object3D obj)
1478	1502	{
1479		- assert(obj instanceof Composite);
	1503	+ //assert(obj instanceof Composite);
1480	1504
1481	1505	// if (obj.versionlist == null)
1482	1506	// {
..	..	@@ -2112,24 +2136,24 @@
2112	2136	switch(axis)
2113	2137	{
2114	2138	case 0 :
2115		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2116		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
2117		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2118		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2139	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2140	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2141	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2142	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
2119	2143	norm = cVector.X;
2120	2144	break;
2121	2145	case 1 :
2122		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2123		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2124		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2125		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2146	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2147	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2148	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2149	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
2126	2150	norm = cVector.Y;
2127	2151	break;
2128	2152	case 2 :
2129		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2130		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2131		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
2132		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2153	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2154	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2155	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2156	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
2133	2157	norm = cVector.Z;
2134	2158	break;
2135	2159	}
..	..	@@ -3451,6 +3475,10 @@
3451	3475	{
3452	3476	ClearMaterials();
3453	3477	} else
	3478	+ if (source == clearVersionsItem)
	3479	+ {
	3480	+ ClearVersions();
	3481	+ } else
3454	3482	if (source == liveleavesItem)
3455	3483	{
3456	3484	LiveLeaves(true);
..	..	@@ -3590,6 +3618,18 @@
3590	3618	if (source == transformChildrenItem)
3591	3619	{
3592	3620	TransformChildren();
	3621	+ } else
	3622	+ if (source == textureRatioRItem)
	3623	+ {
	3624	+ TextureRatio(0);
	3625	+ } else
	3626	+ if (source == textureRatioGItem)
	3627	+ {
	3628	+ TextureRatio(1);
	3629	+ } else
	3630	+ if (source == textureRatioBItem)
	3631	+ {
	3632	+ TextureRatio(2);
3593	3633	} else
3594	3634	if (source == resetTransformItem)
3595	3635	{
..	..	@@ -3963,6 +4003,9 @@
3963	4003	if (source == closeButton)
3964	4004	{
3965	4005	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4006	+ if (copy.versionlist != null)
	4007	+ Replace();
	4008	+
3966	4009	cRadio ab;
3967	4010	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3968	4011	{
..	..	@@ -4061,6 +4104,9 @@
4061	4104	} else
4062	4105	if(source instanceof cRadio)
4063	4106	{
	4107	+ if (copy.versionlist != null)
	4108	+ Replace();
	4109	+
4064	4110	group.parent = keepparent;
4065	4111	group.attributes = 0;
4066	4112	//group.editWindow = null;
..	..	@@ -4112,17 +4158,27 @@
4112	4158	*/
4113	4159	radio.layout.doClick();
4114	4160
4115		- assert(copy instanceof Composite);
	4161	+ //assert(copy instanceof Composite);
4116	4162
4117	4163	if (copy.versionlist == null)
4118	4164	{
4119		- copy.versionlist = new Object3D[100];
4120	4165	copy.versionindex = -1;
4121	4166
4122	4167	// Cannot work with loops
4123		- // To fix this issue, first mark all nodes above the root,
	4168	+ // To fix this issue, we first mark all nodes above the root,
4124	4169	// and check if any of these nodes are reachable below the root.
4125		- //Save(true);
	4170	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4171	+
	4172	+ if (copy instanceof Composite && copy.versionlist == null && !copy.HasTags())
	4173	+ {
	4174	+ copy.versionlist = new Object3D[100];
	4175	+
	4176	+ //Save(true);
	4177	+ }
	4178	+ else
	4179	+ copy.versionindex = -2;
	4180	+
	4181	+ Grafreed.grafreed.universe.TagObjects(copy, false);
4126	4182	}
4127	4183
4128	4184	SetVersionStates();
..	..	@@ -4240,6 +4296,18 @@
4240	4296	refreshContents();
4241	4297	}
4242	4298
	4299	+ void TextureRatio(int axis)
	4300	+ {
	4301	+ Object3D obj;
	4302	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4303	+ {
	4304	+ obj = (Object3D)e.nextElement();
	4305	+ obj.TextureRatio(axis);
	4306	+ }
	4307	+
	4308	+ refreshContents();
	4309	+ }
	4310	+
4243	4311	void ResetTransform()
4244	4312	{
4245	4313	ResetTransform(-1);
..	..	@@ -4255,42 +4323,8 @@
4255	4323	if (obj.toParent == null)
4256	4324	continue;
4257	4325
4258		- if (mask == -1)
4259		- {
4260		- if (obj instanceof Camera) // jan 2014
4261		- {
4262		- LA.matIdentity(obj.toParent);
4263		- LA.matIdentity(obj.fromParent);
4264		- }
4265		- else
4266		- {
4267		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
4268		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
4269		- }
4270		- TouchTransform(obj);
4271		- continue;
4272		- }
4273		- if ((mask&2) != 0) // Scale
4274		- {
4275		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4276		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
4277		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
4278		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4279		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4280		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4281		- }
4282		- if ((mask&4) != 0) // Rotation
4283		- {
4284		- // ?
4285		- }
4286		- if ((mask&1) != 0) // Translation
4287		- {
4288		- if (obj.toParent != null)
4289		- {
4290		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
4291		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
4292		- }
4293		- }
	4326	+ obj.ResetTransform(mask);
	4327	+
4294	4328	if (obj.parent == null)
4295	4329	{
4296	4330	System.out.println("NULL PARENT!");
..	..	@@ -4799,6 +4833,12 @@
4799	4833	{
4800	4834	Object3D obj = group.selection.get(i);
4801	4835
	4836	+ if (obj.toParent == null)
	4837	+ {
	4838	+ obj.toParent = LA.newMatrix();
	4839	+ obj.fromParent = LA.newMatrix();
	4840	+ }
	4841	+
4802	4842	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4803	4843	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4804	4844	}
..	..	@@ -5090,6 +5130,12 @@
5090	5130	refreshContents();
5091	5131	}
5092	5132
	5133	+ void ClearVersions()
	5134	+ {
	5135	+ group.selection.ClearVersions();
	5136	+ refreshContents();
	5137	+ }
	5138	+
5093	5139	void FlipV(boolean flip)
5094	5140	{
5095	5141	group.selection.FlipV(flip);
..	..	@@ -5375,11 +5421,12 @@
5375	5421	}
5376	5422	}
5377	5423
5378		- rootButton.setEnabled(allComposites);
	5424	+ rootButton.setEnabled(true); // allComposites);
5379	5425	}
5380	5426
5381	5427	void refreshContents(boolean cp)
5382	5428	{
	5429	+ if (Globals.ADVANCED)
5383	5430	//if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5384	5431	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5385	5432	{
..	..	@@ -6330,6 +6377,7 @@
6330	6377	private MenuItem clipMeshItem;
6331	6378	private MenuItem smoothMeshItem;
6332	6379	private MenuItem clearMaterialsItem;
	6380	+ private MenuItem clearVersionsItem;
6333	6381
6334	6382	private MenuItem liveleavesItem;
6335	6383	private MenuItem unliveleavesItem;
..	..	@@ -6353,6 +6401,9 @@
6353	6401	private MenuItem maxTexturesItem;
6354	6402	private MenuItem panoTexturesItem;
6355	6403
	6404	+ private MenuItem textureRatioRItem;
	6405	+ private MenuItem textureRatioGItem;
	6406	+ private MenuItem textureRatioBItem;
6356	6407	private MenuItem resetCentroidItem;
6357	6408	private MenuItem resetCentroidXZItem;
6358	6409	private MenuItem resetTransformItem;