Fix "+" issue

Normand Briere

2019-06-09 3ae9b1de47e51e7c150412f2bb14383cb6a5f8f8

 GroupEditor.java
..
..
@@ -98,14 +98,14 @@
98
98
 
99
99
     void CloneClipboard(boolean supports)
100
100
     {
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));
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));
106
106
         else
107
-            makeSomething(CloneObject(GrafreeD.clipboard, false));
108
-        GrafreeD.clipboard.get(0).parent = keepparent;
107
+            makeSomething(CloneObject(Grafreed.clipboard, false));
108
+        Grafreed.clipboard.get(0).parent = keepparent;
109
109
     }
110
110
     
111
111
     static Object3D CloneObject(Object3D obj, boolean supports)
..
..
@@ -119,7 +119,7 @@
119
119
         //               obj.support = null;
120
120
         if (!supports)
121
121
             obj.SaveSupports();
122
-        Object3D clone = (Object3D)GrafreeD.clone(obj);
122
+        Object3D clone = (Object3D)Grafreed.clone(obj);
123
123
         obj.parent = parent;
124
124
         //               obj.support = support;
125
125
         //               clone.support = support; // aout 2013
..
..
@@ -150,6 +150,8 @@
150
150
     
151
151
 	void SetupMenu2(ObjEditor oe)
152
152
 	{
153
+        if (Globals.ADVANCED)
154
+        {
153
155
 		oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154
156
 		//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155
157
 		//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..
..
@@ -161,17 +163,21 @@
161
163
 		lookAtItem.addActionListener(this);
162
164
 		//lookFromItem.addActinoListener(this);
163
165
 		//switchItem.addActionListener(this);
166
+        }
167
+        
164
168
 		Menu menu;
165
169
 		oe.menuBar.add(menu = new Menu("Edit"));
166
170
 		//editItem = menu.add(new MenuItem("Edit"));
167
171
 		//editItem.addActionListener(this);
168
172
 		duplicateItem = menu.add(new MenuItem("Duplicate"));
169
173
 		duplicateItem.addActionListener(this);
170
-		menu.add("-");
171
174
 		cloneItem = menu.add(new MenuItem("Clone"));
172
175
 		cloneItem.addActionListener(this);
176
+        if (Globals.ADVANCED)
177
+        {
173
178
 		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174
179
 		cloneSupportItem.addActionListener(this);
180
+        }
175
181
 		menu.add("-");
176
182
 		cutItem = menu.add(new MenuItem("Cut"));
177
183
 		cutItem.addActionListener(this);
..
..
@@ -179,27 +185,37 @@
179
185
 		copyItem.addActionListener(this);
180
186
 		pasteItem = menu.add(new MenuItem("Paste"));
181
187
 		pasteItem.addActionListener(this);
188
+		menu.add("-");
189
+                
190
+		menu.add("-");
191
+		pasteIntoItem = menu.add(new MenuItem("Paste into"));
192
+		pasteIntoItem.addActionListener(this);
182
193
 		pasteLinkItem = menu.add(new MenuItem("Paste link"));
183
194
 		pasteLinkItem.addActionListener(this);
184
195
 		pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185
196
 		pasteCloneItem.addActionListener(this);
186
197
 //		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187
198
 //		pasteExpandItem.addActionListener(this);
199
+		menu.add("-");
188
200
 		clearItem = menu.add(new MenuItem("Clear"));
189
201
 		clearItem.addActionListener(this);
202
+                
203
+        if (Globals.ADVANCED)
204
+        {
205
+                // Deletes the cameras...
190
206
 		clearAllItem = menu.add(new MenuItem("Clear All"));
191
207
 		clearAllItem.addActionListener(this);
208
+        }
192
209
 
193
210
 		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);
211
+        if (Globals.ADVANCED)
212
+        {
198
213
 		revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199
214
 		revertMeshItem.addActionListener(this);
200
215
 		resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201
216
 		resetreferencesItem.addActionListener(this);
202
217
 		menu.add("-");
218
+        }
203
219
 		overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204
220
 		overwriteGeoItem.addActionListener(this);
205
221
 		overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..
..
@@ -211,19 +227,26 @@
211
227
 		overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212
228
 		overwriteUVItem.addActionListener(this);
213
229
 		menu.add("-");
230
+        if (Globals.ADVANCED)
231
+        {
214
232
 		generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215
233
 		generateMeshItem.addActionListener(this);
216
234
 		poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217
235
 		poseMeshItem.addActionListener(this);
218
236
 		menu.add("-");
237
+        }
219
238
 		resetsupportItem = menu.add(new MenuItem("Reset support"));
220
239
 		resetsupportItem.addActionListener(this);
221
240
 		linkverticesItem = menu.add(new MenuItem("Link to Support"));
222
241
 		linkverticesItem.addActionListener(this);
223
242
 		relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224
243
 		relinkverticesItem.addActionListener(this);
244
+                
245
+        if (Globals.ADVANCED)
246
+        {
225
247
 		setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226
248
 		setMasterItem.addActionListener(this);
249
+        }
227
250
                 
228
251
 		oe.menuBar.add(menu = new Menu("Group"));
229
252
 		grabItem = menu.add(new MenuItem("Grab"));
..
..
@@ -234,27 +257,32 @@
234
257
 		frontItem.addActionListener(this);
235
258
 		compositeItem = menu.add(new MenuItem("Composite"));
236
259
 		compositeItem.addActionListener(this);
237
-		hideItem = menu.add(new MenuItem("Hide"));
260
+		hideItem = menu.add(new MenuItem("Hidden Group"));
238
261
 		hideItem.addActionListener(this);
239
262
 		ungroupItem = menu.add(new MenuItem("Ungroup"));
240
263
 		ungroupItem.addActionListener(this);
241
264
 		menu.add("-");
242
-		randomItem = menu.add(new MenuItem("Random"));
265
+		randomItem = menu.add(new MenuItem("Switch node"));
243
266
 		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);
248
267
 		switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249
268
 		switchGeoItem.addActionListener(this);
250
269
 		switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251
270
 		switchTransfoItem.addActionListener(this);
252
-		morphItem = menu.add(new MenuItem("Morph"));
271
+		morphItem = menu.add(new MenuItem("Morph Group"));
253
272
 		morphItem.addActionListener(this);
273
+                
274
+        if (Globals.ADVANCED)
275
+        {
276
+		menu.add("-");
277
+		physicsItem = menu.add(new MenuItem("Physics"));
278
+		physicsItem.addActionListener(this);
279
+		frameselectorItem = menu.add(new MenuItem("Frame Selector"));
280
+		frameselectorItem.addActionListener(this);
254
281
 		scriptNodeItem = menu.add(new MenuItem("Script Node"));
255
282
 		scriptNodeItem.addActionListener(this);
256
283
 		cameraItem = menu.add(new MenuItem("Camera"));
257
284
 		cameraItem.addActionListener(this);
285
+        }
258
286
                 
259
287
 		oe.menuBar.add(menu = new Menu("Object"));
260
288
 		textureItem = menu.add(new MenuItem("Texture"));
..
..
@@ -269,21 +297,29 @@
269
297
 		shadowYItem.addActionListener(this);
270
298
                 shadowZItem = menu.add(new MenuItem("Shadow Z"));
271
299
 		shadowZItem.addActionListener(this);
300
+        if (Globals.ADVANCED)
301
+        {
302
+		menu.add("-");
272
303
 		linkerItem = menu.add(new MenuItem("Linker"));
273
304
 		linkerItem.addActionListener(this);
274
-		templateItem = menu.add(new MenuItem("Template"));
275
-		templateItem.addActionListener(this);
276
305
 		attributeItem = menu.add(new MenuItem("Attribute"));
277
306
 		attributeItem.addActionListener(this);
307
+		templateItem = menu.add(new MenuItem("Template"));
308
+		templateItem.addActionListener(this);
278
309
 		pointflowItem = menu.add(new MenuItem("Point Flow"));
279
310
 		pointflowItem.addActionListener(this);
311
+        }
280
312
 		menu.add("-");
281
313
 		resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282
314
 		resetTransformItem.addActionListener(this);
283
315
 		resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284
316
 		resetCentroidItem.addActionListener(this);
285
-		transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286
-		transformgeometryItem.addActionListener(this);
317
+		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
318
+		resetCentroidXZItem.addActionListener(this);
319
+		transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
320
+		transformGeometryItem.addActionListener(this);
321
+		transformChildrenItem = menu.add(new MenuItem("Transform Children"));
322
+		transformChildrenItem.addActionListener(this);
287
323
                 
288
324
 		oe.menuBar.add(menu = new Menu("Geometry"));
289
325
 		genUVItem = menu.add(new MenuItem("Generate UV"));
..
..
@@ -294,8 +330,11 @@
294
330
 		genNormalsCADItem.addActionListener(this);
295
331
 		genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296
332
 		genNormalsMESHItem.addActionListener(this);
333
+        if (Globals.ADVANCED)
334
+        {
297
335
 		genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298
336
 		genNormalsMINEItem.addActionListener(this);
337
+        }
299
338
 		stripifyItem = menu.add(new MenuItem("Stripify"));
300
339
 		stripifyItem.addActionListener(this);
301
340
 		unstripifyItem = menu.add(new MenuItem("Unstripify"));
..
..
@@ -317,23 +356,34 @@
317
356
 		reduce34MeshItem.addActionListener(this);
318
357
 		increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319
358
 		increaseMeshItem.addActionListener(this);
320
-		smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321
-		smoothMeshItem.addActionListener(this);
322
359
 		clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323
360
 		clipMeshItem.addActionListener(this);
361
+                
362
+        if (Globals.ADVANCED)
363
+        {
364
+		smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
365
+		smoothMeshItem.addActionListener(this);
366
+        }
324
367
 
325
368
                 oe.menuBar.add(menu = new Menu("Attributes"));
326
369
 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327
370
 		clearMaterialsItem.addActionListener(this);
371
+                resetAllItem = menu.add(new MenuItem("Reset All"));
372
+		resetAllItem.addActionListener(this);
373
+		stepAllItem = menu.add(new MenuItem("Step All"));
374
+		stepAllItem.addActionListener(this);
328
375
 		menu.add("-");
329
376
 		liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330
377
 		liveleavesItem.addActionListener(this);
331
378
 		unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332
379
 		unliveleavesItem.addActionListener(this);
380
+        if (Globals.ADVANCED)
381
+        {
333
382
 		supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334
383
 		supportleavesItem.addActionListener(this);
335
384
 		unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336
385
 		unsupportleavesItem.addActionListener(this);
386
+        }
337
387
 		hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338
388
 		hideleavesItem.addActionListener(this);
339
389
 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
..
..
@@ -377,28 +427,34 @@
377
427
 		sortbynameItem = menu.add(new MenuItem("Sort by name"));
378
428
 		sortbynameItem.addActionListener(this);
379
429
 		menu.add("-");
430
+		shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
431
+		shareGeometriesItem.addActionListener(this);
432
+		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
433
+		mergeGeometriesItem.addActionListener(this);
434
+        if (Globals.ADVANCED)
435
+        {
436
+            // Pretty much the same as duplicate and clone.
380
437
 		extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381
438
 		extractGeometriesItem.addActionListener(this);
382
439
 		cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383
440
 		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);
441
+        }
388
442
                 
389
443
 		oe.menuBar.add(menu = new Menu("Insert"));
390
444
 		buildCreateMenu(menu);
391
445
                 
392
-               
393
446
                 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..."));
447
+		importOBJItem = menu.add(new MenuItem("OBJ file..."));
399
448
 		importOBJItem.addActionListener(this);
400
-		import3DSItem = menu.add(new MenuItem("3DS Object..."));
449
+		menu.add("-");
450
+		import3DSItem = menu.add(new MenuItem("3DS file..."));
401
451
 		import3DSItem.addActionListener(this);
452
+		menu.add("-");
453
+		importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
454
+		importVRMLX3DItem.addActionListener(this);
455
+		menu.add("-");
456
+		importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
457
+		importGFDItem.addActionListener(this);
402
458
 
403
459
                 oe.menuBar.add(menu = new Menu("Tools"));
404
460
 		buildToolsMenu(menu);
..
..
@@ -436,96 +492,96 @@
436
492
          */
437
493
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438
494
                 
439
-                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
440
-                liveCB.setToolTipText("Enabled animation");
495
+                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
496
+                liveCB.setToolTipText("Enable animation");
441
497
                                 liveCB.addItemListener(this);
442
498
 
443
-                oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
499
+		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
500
+                oneStepButton.setToolTipText("Animate one step forward");
501
+		oneStepButton.addActionListener(this);
502
+                
503
+                oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
504
+                fastCB.setToolTipText("Fast mode");
505
+                                fastCB.addItemListener(this);
506
+                                
507
+                oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
444
508
                 trackCB.setToolTipText("Enable tracking");
445
509
                                 trackCB.addItemListener(this);
446
510
 
447
-		oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
511
+		oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
448
512
                 screenfitButton.setToolTipText("Screen fit");
449
513
 		screenfitButton.addActionListener(this);
450
514
 
451
515
 //		oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
452
516
 //		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
517
 
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);
518
+                if (Globals.ADVANCED)
519
+                {
520
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521
+                        snapobjectButton.addActionListener(this);
522
+                        snapobjectButton.setToolTipText("Snap Object");
523
+                }
524
+
525
+		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
465
526
                 flashSelectionButton.setToolTipText("Show selection");
466
527
 		flashSelectionButton.addActionListener(this);
467
528
                 
468
529
 		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
469
530
                 
470
-		oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
531
+		oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
471
532
                 twoButton.setToolTipText("Show center view only");
472
533
 		twoButton.addActionListener(this);
473
-		oe.toolbarPanel.add(fourButton = new cButton("+||", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
534
+		oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
474
535
 		fourButton.addActionListener(this);
475
536
                 fourButton.setToolTipText("Show left panel only");
476
-		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
537
+		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
477
538
                 sixButton.setToolTipText("2-column layout left");
478
539
 		sixButton.addActionListener(this);
479
-		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
540
+		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
480
541
                 threeButton.setToolTipText("2-column layout right");
481
542
 		threeButton.addActionListener(this);
482
-		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
543
+		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
483
544
                 sevenButton.setToolTipText("3-column layout");
484
545
 		sevenButton.addActionListener(this);
485
546
                 //
486
547
 
487
-		oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
488
-                rootButton.setToolTipText("Edit object in new tab");
548
+		oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
549
+                rootButton.setToolTipText("Edit selection in new tab");
489
550
 		rootButton.addActionListener(this);
490
-			oe.aConstraints.gridx += 1;
491
-		oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
551
+
552
+                oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492
553
                 closeButton.setToolTipText("Close tab");
493
554
 		closeButton.addActionListener(this);
494
555
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
495
556
 		//clearButton.addActionListener(this);
496
-			oe.aConstraints.gridx += 1;
497
557
                         
498
-		oe.aConstraints.gridx = 1; //
499
-		oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
558
+                cGridBag commandsPanel = new cGridBag();
559
+                
560
+		commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561
+                editButton.setToolTipText("Edit selection");
500
562
 		editButton.addActionListener(this);
501
-		oe.aConstraints.gridx += 1;
502
-		oe.aConstraints.weighty = 0;
503
-		oe.aConstraints.gridwidth = 1;
504
563
 
505
-		oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
564
+		commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565
+                uneditButton.setToolTipText("Unedit selection");
506
566
 		uneditButton.addActionListener(this);
507
567
 
508
-		oe.aConstraints.gridx += 1;
509
-		oe.aConstraints.weighty = 0;
510
-		oe.aConstraints.gridwidth = 1;
511
-                
512
-		oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
513
-		clearPanelButton.addActionListener(this);
514
-
515
-		oe.aConstraints.gridx += 1;
516
-		oe.aConstraints.weighty = 0;
517
-		oe.aConstraints.gridwidth = 1;
518
-                
519
-		oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
568
+		commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
569
+                allParamsButton.setToolTipText("Edit all params");
520
570
 		allParamsButton.addActionListener(this);
521
571
 
522
-		oe.aConstraints.gridx += 1;
523
-		oe.aConstraints.weighty = 0;
524
-		oe.aConstraints.gridwidth = 1;
525
-                
526
-		oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
572
+		commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573
+                clearPanelButton.setToolTipText("Clear edit panel");
574
+		clearPanelButton.addActionListener(this);
575
+
576
+		commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577
+                unselectButton.setToolTipText("Unselect");
527
578
 		unselectButton.addActionListener(this);
528
579
 
580
+                commandsPanel.preferredHeight = 1;
581
+                
582
+                oe.treePanel.add(commandsPanel);
583
+                oe.treePanel.Return();
584
+                
529
585
 //		oe.aConstraints.gridx += 1;
530
586
 //		oe.aConstraints.weighty = 0;
531
587
 //		oe.aConstraints.gridwidth = 1;
..
..
@@ -537,40 +593,37 @@
537
593
 //		oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
538
594
 //		gcButton.addActionListener(this);
539
595
                 
540
-                oe.aConstraints.gridx = 0;
541
-		oe.aConstraints.gridy += 1;
542
-                
543
-		//ctrlPanel.add(objList = new List(5, true));
544
-		oe.aConstraints.gridwidth = 100;
545
-	//	oe.aConstraints.gridheight = 100;
546
-		oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
547
-		oe.aConstraints.gridheight = 1;
548
-		oe.aConstraints.weighty = 0.5;
549
-		oe.aConstraints.gridx = 0;
550
-		JScrollPane jSP;
596
+                cGridBag jSPPanel = new cGridBag();
597
+
598
+                JScrollPane jSP;
551
599
 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
552
-		oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
600
+		jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
553
601
                 ResetModel();
554
-		oe.aConstraints.weighty = 0.5;
555
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
556
-		oe.aConstraints.gridy += 1;
557
-		oe.aConstraints.gridwidth = 1;
602
+                
603
+                oe.treePanel.add(jSPPanel);
604
+                oe.treePanel.Return();
558
605
 
559
-		oe.aConstraints.weighty = 0;
560
-		oe.aConstraints.gridwidth = 2;
561
-
562
-                oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
606
+                cGridBag copyOptionsPanel = new cGridBag();
607
+                
608
+                copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
609
+                colorCB.setToolTipText("Copy color when dropped");
563
610
                 colorCB.addItemListener(this);
564
-                oe.aConstraints.gridx += 2;
565
-                oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
611
+
612
+                copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
613
+                materialCB.setToolTipText("Copy material when dropped");
566
614
                 materialCB.addItemListener(this);
567
-                oe.aConstraints.gridx += 2;
568
-                oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
615
+
616
+                copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
617
+                textureCB.setToolTipText("Copy texture when dropped");
569
618
                 textureCB.addItemListener(this);
570
619
                         
571
-                oe.aConstraints.gridx = 0;
572
-		oe.aConstraints.gridy += 1;
620
+                copyOptionsPanel.preferredHeight = 1;
621
+                oe.treePanel.add(copyOptionsPanel);
622
+                oe.treePanel.Return();
573
623
                 
624
+//        mainPanel.setDividerLocation(0.5); //1.0);
625
+//        mainPanel.setResizeWeight(0.5);
626
+        
574
627
 		//jList.addListSelectionListener(this);
575
628
 		oe.jTree.addTreeSelectionListener(this);
576
629
 		//jTree.setRootVisible(false);
..
..
@@ -595,43 +648,35 @@
595
648
         
596
649
         void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
597
650
         {
598
-        	//constraints.gridx = 0;
599
-        	//constraints.gridy = 0;
600
-                panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
601
-                fastCB.setToolTipText("Fast mode");
602
-                                fastCB.addItemListener(this);
603
-        	//constraints.gridy += 1;
604
-                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
605
-                supportCB.setToolTipText("Enabled rigging");
606
-                                supportCB.addItemListener(this);
607
-
608
-        //	constraints.gridy += 1;
609
-        //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
610
-        //                        localCB.addItemListener(this);
611
-
612
-        	//constraints.gridy += 1;
613
-                panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
614
-                crowdCB.setToolTipText("Used for crowds");
615
-                                crowdCB.addItemListener(this);
616
-
617
-        	//constraints.gridy += 1;
618
-                panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
619
-                smoothCB.setToolTipText("Snapping delay");
620
-                                smoothCB.addItemListener(this);
621
-
622
-        	//constraints.gridy += 1;
623
-                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
624
-                slowCB.setToolTipText("Smooth interpolation");
625
-                                slowCB.addItemListener(this);
626
-        	//constraints.gridy += 1;
627
651
                 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
628
652
                 boxCB.setToolTipText("Display bounding boxes");
629
653
                                 boxCB.addItemListener(this);
630
-        	//constraints.gridy += 1;
654
+                                
631
655
                 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
632
656
                 zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
633
657
                                 zoomBoxCB.addItemListener(this);
634
658
 
659
+        if (true) // Globals.ADVANCED)
660
+        {
661
+                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
662
+                supportCB.setToolTipText("Enable rigging");
663
+                                supportCB.addItemListener(this);
664
+
665
+        //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
666
+        //                        localCB.addItemListener(this);
667
+
668
+                panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
669
+                crowdCB.setToolTipText("Used for crowds");
670
+                                crowdCB.addItemListener(this);
671
+
672
+                panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
673
+                smoothCB.setToolTipText("Snapping delay");
674
+                                smoothCB.addItemListener(this);
675
+
676
+                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
677
+                slowCB.setToolTipText("Smooth interpolation");
678
+                                slowCB.addItemListener(this);
679
+                                
635
680
 //        	constraints.gridy += 1;
636
681
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
637
682
 //                                speakerMocapCB.addItemListener(this);
..
..
@@ -656,14 +701,20 @@
656
701
 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
657
702
 //                debugCB.addItemListener(this);
658
703
 
659
-        	//constraints.gridy += 1;
660
704
                 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
661
705
                                 oeilCB.addItemListener(this);
662
706
 
663
-        	//constraints.gridy += 1;
664
707
                 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
665
708
                 lookAtCB.setToolTipText("Look-at target");
666
709
                                 lookAtCB.addItemListener(this);
710
+                
711
+        }
712
+                                
713
+                cGridBag fill = new cGridBag();
714
+                                
715
+                fill.preferredHeight = 200;
716
+                
717
+                panel.add(fill);
667
718
 
668
719
         }
669
720
 	
..
..
@@ -678,6 +729,7 @@
678
729
             buttonGroup.add(radioButton);
679
730
             radioButton.doClick();
680
731
         }
732
+        
681
733
         void SetupViews(ObjEditor oe)
682
734
         {
683
735
             oe.SetupViews();
..
..
@@ -894,7 +946,9 @@
894
946
 //                        objEditor.DropFile((java.io.File[]) object, true);
895
947
 //                        return;
896
948
 //                    }
897
-                    if (string.charAt(0) == '/')
949
+                    
950
+                    // File path for Mac and Windows
951
+                    if (string.charAt(0) == '/' || string.charAt(1) == ':')
898
952
                     {
899
953
                         // file(s)
900
954
                         String[] names = string.split("\n");
..
..
@@ -921,7 +975,7 @@
921
975
                     
922
976
                     flashIt = false;
923
977
                     CameraPane pane = (CameraPane) target;
924
-                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
978
+                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
925
979
                     pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
926
980
                     
927
981
                     if (group.selection.size() == 1)
..
..
@@ -948,11 +1002,11 @@
948
1002
             {
949
1003
                 loadClipboard(true);
950
1004
                 objEditor.jTree.setSelectionPath(destinationPath);
951
-                pasteInto(false);
1005
+                pasteInto(false, false);
952
1006
             } else {
953
1007
                 loadClipboard(false);
954
1008
                 objEditor.jTree.setSelectionPath(destinationPath);
955
-                pasteInto(false); // true); // ???
1009
+                pasteInto(false, false); // true); // ???
956
1010
             }
957
1011
 	}
958
1012
 	public void	dropActionChanged(DropTargetDragEvent dtde) 
..
..
@@ -1074,27 +1128,33 @@
1074
1128
 		kleinItem.addActionListener(this);
1075
1129
 		particleItem = menu.add(new MenuItem("Particle system"));
1076
1130
 		particleItem.addActionListener(this);
1131
+        if (Globals.ADVANCED)
1132
+        {
1077
1133
 		ragdollItem = menu.add(new MenuItem("Rag Walk"));
1078
1134
 		ragdollItem.addActionListener(this);
1079
1135
 		ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1080
1136
 		ragdoll2Item.addActionListener(this);
1137
+        }
1081
1138
 		menu.add("-");
1082
-		meshItem = menu.add(new MenuItem("Mesh"));
1139
+		meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1083
1140
 		meshItem.addActionListener(this);
1084
1141
 	//	meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1085
1142
 	//	meshGroupItem.addActionListener(this);
1143
+        if (Globals.ADVANCED)
1144
+        {
1086
1145
 		springItem = menu.add(new MenuItem("Spring"));
1087
1146
 		springItem.addActionListener(this);
1088
1147
 		flagItem = menu.add(new MenuItem("Flag"));
1089
1148
 		flagItem.addActionListener(this);
1090
-		bezierItem = menu.add(new MenuItem("Patch"));
1091
-		bezierItem.addActionListener(this);
1092
-		checkerItem = menu.add(new MenuItem("Checker"));
1093
-		checkerItem.addActionListener(this);
1094
1149
 		blobItem = menu.add(new MenuItem("Blob"));
1095
1150
 		blobItem.addActionListener(this);
1096
1151
 		latheItem = menu.add(new MenuItem("Lathe"));
1097
1152
 		latheItem.addActionListener(this);
1153
+        }
1154
+		bezierItem = menu.add(new MenuItem("Bezier Patch"));
1155
+		bezierItem.addActionListener(this);
1156
+		overlayItem = menu.add(new MenuItem("Overlay"));
1157
+		overlayItem.addActionListener(this);
1098
1158
 		lightItem = menu.add(new MenuItem("Light"));
1099
1159
 		lightItem.addActionListener(this);
1100
1160
 		menu.add("-");
..
..
@@ -1104,34 +1164,39 @@
1104
1164
 		loopItem.addActionListener(this);
1105
1165
 		doubleItem = menu.add(new MenuItem("Fork"));
1106
1166
 		doubleItem.addActionListener(this);
1167
+        if (Globals.ADVANCED)
1168
+        {
1107
1169
 		tripleItem = menu.add(new MenuItem("Trident"));
1108
1170
 		tripleItem.addActionListener(this);
1171
+        }
1109
1172
 	}
1110
1173
         
1111
1174
 	void buildToolsMenu(Menu menu)
1112
1175
 	{
1113
1176
 		menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1114
1177
 		animationItem.addItemListener(this);
1115
-                animationItem.setState(CameraPane.ANIMATION);
1178
+                animationItem.setState(Globals.ANIMATION);
1116
1179
                 
1117
1180
 		menu.add("-");
1118
1181
 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1119
1182
 		parseverticesItem.addActionListener(this);
1120
1183
 		textureFieldItem = menu.add(new MenuItem("Texture Field"));
1121
1184
 		textureFieldItem.addActionListener(this);
1122
-		alignItem = menu.add(new MenuItem("Align"));
1185
+		alignItem = menu.add(new MenuItem("Align Objects"));
1123
1186
 		alignItem.addActionListener(this);
1124
-		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1125
-		mirrorItem.addActionListener(this);
1126
1187
 		reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1127
1188
 		reduceMorphItem.addActionListener(this);
1128
1189
 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1129
1190
 		reduce34MorphItem.addActionListener(this);
1130
-                
1191
+		menu.add("-");
1131
1192
 		menu.add(computeAOItem = new MenuItem("Compute AO"));
1132
1193
 		computeAOItem.addActionListener(this);
1133
-		menu.add("-");
1134
1194
                 
1195
+        if (Globals.ADVANCED)
1196
+        {
1197
+		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1198
+		mirrorItem.addActionListener(this);
1199
+		menu.add("-");
1135
1200
 		menu.add(memoryItem = new MenuItem("Memory Usage"));
1136
1201
 		memoryItem.addActionListener(this);
1137
1202
 		menu.add(analyzeItem = new MenuItem("Analyze"));
..
..
@@ -1154,6 +1219,7 @@
1154
1219
 		menu.add("-");
1155
1220
 		menu.add(editScriptItem = new MenuItem("Edit Script..."));
1156
1221
 		editScriptItem.addActionListener(this);
1222
+        }
1157
1223
         }
1158
1224
         
1159
1225
         void ScreenFit()
..
..
@@ -1482,9 +1548,9 @@
1482
1548
     
1483
1549
     void Overwrite(int mask)
1484
1550
     {
1485
-        if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
1551
+        if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
1486
1552
         {
1487
-            Object3D content = GrafreeD.clipboard.get(0);
1553
+            Object3D content = Grafreed.clipboard.get(0);
1488
1554
 
1489
1555
             if (content instanceof cGroup && ((cGroup)content).transientlink )
1490
1556
                 content = ((cGroup)content).get(0);
..
..
@@ -1655,7 +1721,7 @@
1655
1721
 		{
1656
1722
 			makeSomething(new BezierSurface());
1657
1723
 		} else
1658
-		if (source == checkerItem)
1724
+		if (source == overlayItem)
1659
1725
 		{
1660
1726
                     /*
1661
1727
 			Object3D obj = new BezierSurface(5,8);
..
..
@@ -1804,7 +1870,15 @@
1804
1870
 		} else
1805
1871
 		if (source == importOBJItem)
1806
1872
 		{
1807
-			objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1873
+			//objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1874
+                            FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1875
+                            browser.setVisible(true);
1876
+                            String filename = browser.getFile();
1877
+                            if (filename != null && filename.length() > 0)
1878
+                            {
1879
+                                String fullname = browser.getDirectory() + filename;
1880
+                                makeSomething(ReadOBJ(fullname), true);
1881
+                            }
1808
1882
 		} else
1809
1883
 		if (source == computeAOItem)
1810
1884
 		{
..
..
@@ -1824,7 +1898,7 @@
1824
1898
 		if (source == invariantsItem)
1825
1899
 		{
1826
1900
                     System.out.println("Invariants:");
1827
-                    GrafreeD.grafreeD.universe.invariants();
1901
+                    Grafreed.grafreeD.universe.invariants();
1828
1902
 		} else
1829
1903
 		if (source == memoryItem)
1830
1904
 		{
..
..
@@ -1842,6 +1916,11 @@
1842
1916
 		if (source == dumpItem)
1843
1917
 		{
1844
1918
                     DumpObject();
1919
+		} else
1920
+		if (source == oneStepButton)
1921
+		{
1922
+                    Globals.ONESTEP = true;
1923
+                    cameraView.repaint();
1845
1924
 		} else
1846
1925
 		if (source == screenfitButton)
1847
1926
 		{
..
..
@@ -1894,10 +1973,10 @@
1894
1973
 		} else
1895
1974
 		if (source == duplicateItem)
1896
1975
 		{
1897
-                    Object3D keep = GrafreeD.clipboard;
1976
+                    Object3D keep = Grafreed.clipboard;
1898
1977
 			loadClipboard(false);
1899
1978
 			paste(false);
1900
-                    GrafreeD.clipboard = keep;
1979
+                    Grafreed.clipboard = keep;
1901
1980
 		} else
1902
1981
 		if (source == cloneItem)
1903
1982
 		{
..
..
@@ -1915,13 +1994,17 @@
1915
1994
 		{
1916
1995
 			paste(false);
1917
1996
 		} else
1997
+		if (source == pasteIntoItem)
1998
+		{
1999
+			pasteInto(true, false);
2000
+		} else
1918
2001
 		if (source == pasteLinkItem)
1919
2002
 		{
1920
-			pasteInto(false);
2003
+			pasteInto(false, false);
1921
2004
 		} else
1922
2005
 		if (source == pasteCloneItem)
1923
2006
 		{
1924
-			pasteInto(true);
2007
+			pasteInto(true, true);
1925
2008
 		} else
1926
2009
 		if (source == pasteExpandItem)
1927
2010
 		{
..
..
@@ -2113,9 +2196,9 @@
2113
2196
 //                        group.selection.get(0).setMasterThis(content); // should be identity
2114
2197
 //		refreshContents();
2115
2198
 //                    }
2116
-                    if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2199
+                    if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
2117
2200
                     {
2118
-                        Object3D content = GrafreeD.clipboard.get(0);
2201
+                        Object3D content = Grafreed.clipboard.get(0);
2119
2202
                         
2120
2203
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2121
2204
                             content = ((cGroup)content).get(0);
..
..
@@ -2123,11 +2206,11 @@
2123
2206
             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2124
2207
                         for (int i=0; i<group.selection.size(); i++)
2125
2208
                         {
2126
-                            boolean random = CameraPane.RANDOM;
2127
-                            CameraPane.RANDOM = false; // parse all random nodes
2209
+                            boolean random = CameraPane.SWITCH;
2210
+                            CameraPane.SWITCH = false; // parse all random nodes
2128
2211
                             group.selection.get(i).linkVerticesThis(content);
2129
2212
                       //      group.selection.get(i).setMasterThis(content); // should be identity
2130
-                            CameraPane.RANDOM = random;
2213
+                            CameraPane.SWITCH = random;
2131
2214
                         }
2132
2215
             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2133
2216
 		refreshContents();
..
..
@@ -2137,20 +2220,20 @@
2137
2220
 		{
2138
2221
                     for (int i=0; i<group.selection.size(); i++)
2139
2222
                     {
2140
-                        boolean random = CameraPane.RANDOM;
2141
-                        CameraPane.RANDOM = false; // parse all random nodes
2223
+                        boolean random = CameraPane.SWITCH;
2224
+                        CameraPane.SWITCH = false; // parse all random nodes
2142
2225
                         group.selection.get(i).linkVerticesThis(null);
2143
-                        CameraPane.RANDOM = random;
2226
+                        CameraPane.SWITCH = random;
2144
2227
                     }
2145
2228
 
2146
2229
                     refreshContents();
2147
2230
 		} else
2148
2231
 		if (source == relinkverticesItem)
2149
2232
 		{
2150
-                    boolean random = CameraPane.RANDOM;
2151
-                    CameraPane.RANDOM = false; // parse all random nodes
2233
+                    boolean random = CameraPane.SWITCH;
2234
+                    CameraPane.SWITCH = false; // parse all random nodes
2152
2235
                     group.selection.RelinkToSupport();
2153
-                    CameraPane.RANDOM = random;
2236
+                    CameraPane.SWITCH = random;
2154
2237
 
2155
2238
                     refreshContents();
2156
2239
 		} else
..
..
@@ -2165,9 +2248,9 @@
2165
2248
 		} else
2166
2249
 		if (source == setMasterItem)
2167
2250
 		{
2168
-                    if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2251
+                    if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2169
2252
                     {
2170
-                        Object3D content = GrafreeD.clipboard.get(0);
2253
+                        Object3D content = Grafreed.clipboard.get(0);
2171
2254
                         
2172
2255
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2173
2256
                             content = ((cGroup)content).get(0);
..
..
@@ -2180,9 +2263,9 @@
2180
2263
 		{
2181
2264
                     if (group.selection.size() == 1)
2182
2265
                     {
2183
-                        if (GrafreeD.clipboard.size() == 1)
2266
+                        if (Grafreed.clipboard.size() == 1)
2184
2267
                         {
2185
-                            Object3D content = GrafreeD.clipboard.get(0);
2268
+                            Object3D content = Grafreed.clipboard.get(0);
2186
2269
 
2187
2270
                             if (content instanceof cGroup && ((cGroup)content).transientlink )
2188
2271
                                 content = ((cGroup)content).get(0);
..
..
@@ -2199,7 +2282,7 @@
2199
2282
 		{
2200
2283
 			RevertMeshes();
2201
2284
 		} else
2202
-		if (source == resetMeshItem)
2285
+		if (source == resetAllItem)
2203
2286
 		{
2204
2287
 			ResetAll();
2205
2288
 		} else
..
..
@@ -2248,7 +2331,7 @@
2248
2331
                         RandomNode random = new RandomNode();
2249
2332
 			group(random);
2250
2333
                         if (random.size() > 0)
2251
-                            random.name = random.get(0).name + "Rnd";
2334
+                            random.name = random.get(0).name + "Switch";
2252
2335
 		} else
2253
2336
 		if (source == physicsItem)
2254
2337
                 {
..
..
@@ -2537,9 +2620,13 @@
2537
2620
                 {
2538
2621
 			SmoothMesh();
2539
2622
 		} else
2540
-		if (source == transformgeometryItem)
2623
+		if (source == transformGeometryItem)
2541
2624
 		{
2542
2625
                         TransformGeometry();
2626
+		} else
2627
+		if (source == transformChildrenItem)
2628
+		{
2629
+                        TransformChildren();
2543
2630
 		} else
2544
2631
 		if (source == resetTransformItem)
2545
2632
 		{
..
..
@@ -2547,7 +2634,11 @@
2547
2634
 		} else
2548
2635
 		if (source == resetCentroidItem)
2549
2636
 		{
2550
-                        ResetCentroid();
2637
+                        ResetCentroid(true);
2638
+		} else
2639
+		if (source == resetCentroidXZItem)
2640
+		{
2641
+                        ResetCentroid(false);
2551
2642
 		} else
2552
2643
 		if (source == resetParentItem)
2553
2644
 		{
..
..
@@ -2905,7 +2996,7 @@
2905
2996
                                 
2906
2997
                                 child.editWindow = null; // ???????????
2907
2998
 			}
2908
-			objEditor.ctrlPanel.validate();
2999
+			objEditor.ctrlPanel.FlushUI();
2909
3000
 			//objEditor.jTree.clearSelection();
2910
3001
 			//objEditor.ResetSliders();
2911
3002
                     refreshContents(true);
..
..
@@ -2989,7 +3080,9 @@
2989
3080
                         frontView.object = group;
2990
3081
                         sideView.object = group;
2991
3082
                     }
2992
-                    group.editWindow = this;
3083
+                    
3084
+// fix "+" issue                    group.editWindow = this;
3085
+                    
2993
3086
                     /*
2994
3087
                     currentLayout = radio.layout;
2995
3088
                     if (currentLayout == null)
..
..
@@ -3063,6 +3156,28 @@
3063
3156
             refreshContents();
3064
3157
         }
3065
3158
         
3159
+        void TransformChildren()
3160
+        {
3161
+            Object3D obj;
3162
+            for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3163
+            {
3164
+                    obj = (Object3D)e.nextElement();
3165
+                    obj.KeepTextureMatrices();
3166
+                    obj.TransformChildren();
3167
+                    obj.RestoreTextureMatrices();
3168
+                                        
3169
+//                    if (obj.parent == null)
3170
+//                    {
3171
+//                        System.out.println("NULL PARENT!");
3172
+//                        new Exception().printStackTrace();
3173
+//                    }
3174
+//                    else
3175
+//                        TouchTransform(obj);
3176
+//                        //obj.parent.Touch();
3177
+            }
3178
+
3179
+            refreshContents();
3180
+        }
3066
3181
         
3067
3182
         void ResetTransform()
3068
3183
         {
..
..
@@ -3175,7 +3290,7 @@
3175
3290
             refreshContents();
3176
3291
         }
3177
3292
         
3178
-        void ResetCentroid()
3293
+        void ResetCentroid(boolean full)
3179
3294
         {
3180
3295
             Object3D obj;
3181
3296
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -3190,12 +3305,16 @@
3190
3305
                     LA.matIdentity(Object3D.mat);
3191
3306
                     obj.getBounds(minima, maxima, false);
3192
3307
                     Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3193
-                    Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3308
+                    if (full)
3309
+                        Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3194
3310
                     Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3195
3311
                     obj.TransformMesh(Object3D.mat);
3312
+                    
3196
3313
                     Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3197
-                    Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3314
+                    if (full)
3315
+                        Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3198
3316
                     Object3D.mat[3][2] = (minima.z + maxima.z)/2;
3317
+                    
3199
3318
                     LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3200
3319
                     //Object3D.mat[3][0] = -Object3D.mat[3][0];
3201
3320
                     //Object3D.mat[3][1] = -Object3D.mat[3][1];
..
..
@@ -3261,9 +3380,9 @@
3261
3380
                     obj = (Object3D)e.nextElement();
3262
3381
                     
3263
3382
                     System.out.println("Object is: " + obj);
3264
-                    GrafreeD.AnalyzeObject(obj);
3383
+                    Grafreed.AnalyzeObject(obj);
3265
3384
                     System.out.println("Boundary rep: " + obj.bRep);
3266
-                    GrafreeD.AnalyzeObject(obj.bRep);
3385
+                    Grafreed.AnalyzeObject(obj.bRep);
3267
3386
                     
3268
3387
 //                    System.err.println((size/1024) + " KB is the size of " + obj);
3269
3388
                 }
..
..
@@ -3477,8 +3596,8 @@
3477
3596
 	
3478
3597
 	void ParseVertices()
3479
3598
 	{
3480
-            boolean epsequal = GrafreeD.epsequal;
3481
-            GrafreeD.epsequal = true;
3599
+            boolean epsequal = Grafreed.epsequal;
3600
+            Grafreed.epsequal = true;
3482
3601
             
3483
3602
             for (int i=0; i<group.selection.size(); i++)
3484
3603
             {
..
..
@@ -3503,7 +3622,7 @@
3503
3622
                                 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3504
3623
                                 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3505
3624
 
3506
-                                g.add(GrafreeD.clipboard);
3625
+                                g.add(Grafreed.clipboard);
3507
3626
 
3508
3627
                                 buffer.add(g);
3509
3628
                             }
..
..
@@ -3518,7 +3637,7 @@
3518
3637
                 makeSomething(buffer, i==group.selection.size()-1);
3519
3638
             }
3520
3639
             
3521
-            GrafreeD.epsequal = epsequal;
3640
+            Grafreed.epsequal = epsequal;
3522
3641
             
3523
3642
             refreshContents();
3524
3643
 	}
..
..
@@ -3536,7 +3655,16 @@
3536
3655
                             String pigment = Object3D.GetPigment(tex);
3537
3656
                             //String bump = Object3D.GetBump(tex);
3538
3657
                             
3539
-                            com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3658
+                            com.sun.opengl.util.texture.TextureData texturedata = null;
3659
+                            
3660
+                            try
3661
+                            {
3662
+                                texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3663
+                            }
3664
+                            catch (Exception e)
3665
+                            {
3666
+                                System.err.println("FAIL: " + node);
3667
+                            }
3540
3668
                             
3541
3669
                             double s = v.s;
3542
3670
                             
..
..
@@ -3624,11 +3752,11 @@
3624
3752
 
3625
3753
             SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3626
3754
 
3627
-            boolean random = CameraPane.RANDOM;
3628
-            CameraPane.RANDOM = false; // parse all random nodes
3755
+            boolean random = CameraPane.SWITCH;
3756
+            CameraPane.SWITCH = false; // parse all random nodes
3629
3757
             lowres.linkVerticesThis(null);
3630
3758
             lowres.linkVerticesThis(sn);
3631
-            CameraPane.RANDOM = random;
3759
+            CameraPane.SWITCH = random;
3632
3760
 
3633
3761
             System.err.flush();
3634
3762
 
..
..
@@ -3668,7 +3796,7 @@
3668
3796
                 return;
3669
3797
             
3670
3798
             Object3D poses = group.selection.get(0);
3671
-            Object3D ref = GrafreeD.clipboard.get(0);
3799
+            Object3D ref = Grafreed.clipboard.get(0);
3672
3800
             
3673
3801
             Object3D newgroup = new Object3D("Po:" + poses.name);
3674
3802
             
..
..
@@ -3862,9 +3990,9 @@
3862
3990
 	
3863
3991
 	void ClipMesh()
3864
3992
 	{
3865
-            if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
3993
+            if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
3866
3994
             {
3867
-                Object3D content = GrafreeD.clipboard.get(0);
3995
+                Object3D content = Grafreed.clipboard.get(0);
3868
3996
 
3869
3997
                 if (content instanceof cGroup && ((cGroup)content).transientlink )
3870
3998
                     content = ((cGroup)content).get(0);
..
..
@@ -3873,7 +4001,7 @@
3873
4001
 //                {
3874
4002
 //                    group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3875
4003
 //                }
3876
-                  group.selection.ClipMesh(GrafreeD.clipboard);
4004
+                  group.selection.ClipMesh(Grafreed.clipboard);
3877
4005
             }
3878
4006
 //		group.selection.ClipMesh(GrafreeD.clipboard);
3879
4007
             System.out.println("DONE.");
..
..
@@ -4008,7 +4136,7 @@
4008
4136
                     objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4009
4137
                     
4010
4138
 			Object3D elem = (Object3D)group.selection.elementAt(i);
4011
-                        if(elem != group)
4139
+                        if(elem != group || !newWindow)
4012
4140
                         {
4013
4141
                         //    if (!(elem instanceof Composite))
4014
4142
                         //        newWindow = false;
..
..
@@ -4113,12 +4241,12 @@
4113
4241
             System.err.println("info : " + child.GetPath());
4114
4242
 				}
4115
4243
 			}
4116
-			else
4117
-                        {
4118
-				objEditor.SetMaterial(group); // .GetMaterial());
4119
-				objEditor.AddInfo(group, this, true); // .GetMaterial());
4120
-            System.err.println("info : " + group.GetPath());
4121
-                        }
4244
+//			else
4245
+//                        {
4246
+//				objEditor.SetMaterial(group); // .GetMaterial());
4247
+//				objEditor.AddInfo(group, this, true); // .GetMaterial());
4248
+//            System.err.println("info : " + group.GetPath());
4249
+//                        }
4122
4250
 			
4123
4251
                         objEditor.SetText(); // jan 2014
4124
4252
                         
..
..
@@ -4213,12 +4341,12 @@
4213
4341
 	{
4214
4342
 		if (group.selection.isEmpty())
4215
4343
 			return;
4216
-		GrafreeD.clipboardIsTempGroup = false;
4344
+		Grafreed.clipboardIsTempGroup = false;
4217
4345
 		Composite tGroup = null;
4218
4346
 		if (group.selection.size() > 0) // 1)
4219
4347
 		{
4220
4348
 			tGroup = new cGroup();
4221
-			GrafreeD.clipboardIsTempGroup = true;
4349
+			Grafreed.clipboardIsTempGroup = true;
4222
4350
 		}
4223
4351
                 
4224
4352
 		if (cut)
..
..
@@ -4258,16 +4386,16 @@
4258
4386
 		//System.out.println("cut " + child);
4259
4387
 		//System.out.println("parent = " + child.parent);
4260
4388
                 //                   tmp.addChild(child);
4261
-                                    if (GrafreeD.clipboardIsTempGroup)
4389
+                                    if (Grafreed.clipboardIsTempGroup)
4262
4390
                                             tGroup.add/*Child*/(tmp);
4263
4391
                                     else
4264
-                                            GrafreeD.clipboard = tmp;
4392
+                                            Grafreed.clipboard = tmp;
4265
4393
                                 }
4266
4394
                                 else
4267
-                                    if (GrafreeD.clipboardIsTempGroup)
4395
+                                    if (Grafreed.clipboardIsTempGroup)
4268
4396
                                             tGroup.add/*Child*/(child);
4269
4397
                                     else
4270
-                                            GrafreeD.clipboard = child;
4398
+                                            Grafreed.clipboard = child;
4271
4399
 			}
4272
4400
 			
4273
4401
 			//ResetModel();
..
..
@@ -4299,21 +4427,21 @@
4299
4427
 		//System.out.println("cut " + elem);
4300
4428
 		//System.out.println("parent = " + elem.parent);
4301
4429
                 //                    tmp.addChild(elem);
4302
-                                    if (GrafreeD.clipboardIsTempGroup)
4430
+                                    if (Grafreed.clipboardIsTempGroup)
4303
4431
                                             tGroup.add/*Child*/(tmp);
4304
4432
                                     else
4305
-                                            GrafreeD.clipboard = tmp;
4433
+                                            Grafreed.clipboard = tmp;
4306
4434
                                 }
4307
4435
                                 else
4308
-                                    if (GrafreeD.clipboardIsTempGroup)
4436
+                                    if (Grafreed.clipboardIsTempGroup)
4309
4437
                                             tGroup.add/*Child*/(child);
4310
4438
                                     else
4311
-                                            GrafreeD.clipboard = child;
4439
+                                            Grafreed.clipboard = child;
4312
4440
 			}
4313
4441
 			
4314
4442
 		}
4315
-		if (GrafreeD.clipboardIsTempGroup)
4316
-			GrafreeD.clipboard = tGroup;
4443
+		if (Grafreed.clipboardIsTempGroup)
4444
+			Grafreed.clipboard = tGroup;
4317
4445
 		if (cut)
4318
4446
                 {
4319
4447
                     ResetModel();
..
..
@@ -4327,7 +4455,7 @@
4327
4455
 	//		return;
4328
4456
 		boolean first = true;
4329
4457
 		
4330
-		if (GrafreeD.clipboardIsTempGroup)
4458
+		if (Grafreed.clipboardIsTempGroup)
4331
4459
 		{
4332
4460
 			Composite temp;
4333
4461
 			
..
..
@@ -4338,7 +4466,7 @@
4338
4466
 				temp = (Composite)Applet3D.clipboard.deepCopy();
4339
4467
                          */
4340
4468
 			Object3D elem;
4341
-			for (Enumeration e = /*temp.children*/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4469
+			for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4342
4470
 			{
4343
4471
 				Object3D child = (Object3D)e.nextElement();
4344
4472
                                 
..
..
@@ -4372,21 +4500,21 @@
4372
4500
 			//Object3D cb = Applet3D.clipboard;
4373
4501
 			//temp.addChild(cb);
4374
4502
 			//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4375
-                    assert(GrafreeD.clipboard.parent == null);
4376
-                        Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
4377
-                        GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4378
-                        if (LA.isIdentity(GrafreeD.clipboard.toParent))
4379
-                            makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
4503
+                    assert(Grafreed.clipboard.parent == null);
4504
+                        Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
4505
+                        Grafreed.clipboard.get(0).parent = null; // Avoid copy?
4506
+                        if (LA.isIdentity(Grafreed.clipboard.toParent))
4507
+                            makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4380
4508
                         else
4381
-                            makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4382
-                        GrafreeD.clipboard.get(0).parent = keepparent;
4509
+                            makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
4510
+                        Grafreed.clipboard.get(0).parent = keepparent;
4383
4511
 		}
4384
4512
 		
4385
4513
 		ResetModel();
4386
4514
 		refreshContents();
4387
4515
 	}
4388
4516
 	
4389
-	void pasteInto(boolean copyit)
4517
+	void pasteInto(boolean copyit, boolean clone)
4390
4518
 	{
4391
4519
 //		if (GrafreeD.clipboard == null)
4392
4520
 //			return;
..
..
@@ -4415,15 +4543,22 @@
4415
4543
 		if (copyit)
4416
4544
 		{
4417
4545
 		//	paste(false);
4418
-                    CloneClipboard(false); // sept 2014
4546
+                        if (clone)
4547
+                        {
4548
+                            CloneClipboard(false); // sept 2014
4549
+                        }
4550
+                        else
4551
+                        {
4552
+                            paste(false);
4553
+                        }
4419
4554
 		}
4420
4555
 		else
4421
4556
 		{
4422
4557
 			boolean first = true;
4423
4558
 			
4424
-			if (GrafreeD.clipboardIsTempGroup)
4559
+			if (Grafreed.clipboardIsTempGroup)
4425
4560
 			{
4426
-				Composite temp = (Composite)GrafreeD.clipboard;
4561
+				Composite temp = (Composite)Grafreed.clipboard;
4427
4562
 				Object3D copy;
4428
4563
 				for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4429
4564
 				{
..
..
@@ -4433,7 +4568,7 @@
4433
4568
 				}
4434
4569
 			} else
4435
4570
 			{
4436
-				linkSomething(GrafreeD.clipboard); //.get(0));
4571
+				linkSomething(Grafreed.clipboard); //.get(0));
4437
4572
 			}
4438
4573
 		}
4439
4574
             }
..
..
@@ -4878,7 +5013,7 @@
4878
5013
 
4879
5014
 	void ImportVRMLX3D()
4880
5015
 	{
4881
-		if (GrafreeD.standAlone)
5016
+		if (Grafreed.standAlone)
4882
5017
 		{
4883
5018
                     /**/
4884
5019
 			FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..
..
@@ -4895,7 +5030,7 @@
4895
5030
 				
4896
5031
 	String GetFile(String dialogName)
4897
5032
 	{
4898
-		if (GrafreeD.standAlone)
5033
+		if (Grafreed.standAlone)
4899
5034
 		{
4900
5035
 			FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4901
5036
 			browser.show();
..
..
@@ -4959,10 +5094,12 @@
4959
5094
 	cButton flashSelectionButton;
4960
5095
 	cButton editButton;
4961
5096
 	cButton uneditButton;
5097
+	JCheckBox allParamsButton;
4962
5098
 	cButton clearpanelButton;
4963
-	cButton allParamsButton;
4964
5099
 	cButton unselectButton;
4965
5100
 	
5101
+	cButton oneStepButton;
5102
+        
4966
5103
 	cButton screenfitButton;
4967
5104
 	cButton screenfitpointButton;
4968
5105
 	cButton snapobjectButton;
..
..
@@ -5006,7 +5143,7 @@
5006
5143
 	private MenuItem linkverticesItem;
5007
5144
 	private MenuItem relinkverticesItem;
5008
5145
 	private MenuItem setMasterItem;
5009
-	private MenuItem resetMeshItem;
5146
+	private MenuItem resetAllItem;
5010
5147
 	private MenuItem stepAllItem;
5011
5148
 	private MenuItem revertMeshItem;
5012
5149
 	private MenuItem poseMeshItem;
..
..
@@ -5017,6 +5154,7 @@
5017
5154
 	private MenuItem mergeGeometriesItem;
5018
5155
 	private MenuItem copyItem;
5019
5156
 	private MenuItem pasteItem;
5157
+	private MenuItem pasteIntoItem;
5020
5158
 	private MenuItem pasteLinkItem;
5021
5159
 	private MenuItem pasteCloneItem;
5022
5160
 	private MenuItem pasteExpandItem;
..
..
@@ -5066,8 +5204,10 @@
5066
5204
 	private MenuItem panoTexturesItem;
5067
5205
         
5068
5206
 	private MenuItem resetCentroidItem;
5069
-	private MenuItem transformgeometryItem;
5207
+	private MenuItem resetCentroidXZItem;
5070
5208
 	private MenuItem resetTransformItem;
5209
+	private MenuItem transformGeometryItem;
5210
+	private MenuItem transformChildrenItem;
5071
5211
 	private MenuItem hideItem;
5072
5212
 	private MenuItem grabItem;
5073
5213
 	private MenuItem backItem;
..
..
@@ -5114,7 +5254,7 @@
5114
5254
 	private MenuItem blobItem;
5115
5255
 	private MenuItem latheItem;
5116
5256
 	private MenuItem bezierItem;
5117
-	private MenuItem checkerItem;
5257
+	private MenuItem overlayItem;
5118
5258
 	private MenuItem meshItem;
5119
5259
 //	private MenuItem meshGroupItem;
5120
5260
 	private MenuItem springItem;