Fix ZIP issue

Normand Briere

2019-06-09 989407a46041b80c71fd906bff6b97528e6f3350

 GroupEditor.java
..
..
@@ -210,10 +210,6 @@
210
210
 		oe.menuBar.add(menu = new Menu("Setting"));
211
211
         if (Globals.ADVANCED)
212
212
         {
213
-                resetMeshItem = menu.add(new MenuItem("Reset All"));
214
-		resetMeshItem.addActionListener(this);
215
-		stepAllItem = menu.add(new MenuItem("Step All"));
216
-		stepAllItem.addActionListener(this);
217
213
 		revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218
214
 		revertMeshItem.addActionListener(this);
219
215
 		resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..
..
@@ -318,8 +314,12 @@
318
314
 		resetTransformItem.addActionListener(this);
319
315
 		resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320
316
 		resetCentroidItem.addActionListener(this);
321
-		transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322
-		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);
323
323
                 
324
324
 		oe.menuBar.add(menu = new Menu("Geometry"));
325
325
 		genUVItem = menu.add(new MenuItem("Generate UV"));
..
..
@@ -368,6 +368,10 @@
368
368
                 oe.menuBar.add(menu = new Menu("Attributes"));
369
369
 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370
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);
371
375
 		menu.add("-");
372
376
 		liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373
377
 		liveleavesItem.addActionListener(this);
..
..
@@ -422,17 +426,18 @@
422
426
 		sortbysizeItem.addActionListener(this);
423
427
 		sortbynameItem = menu.add(new MenuItem("Sort by name"));
424
428
 		sortbynameItem.addActionListener(this);
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);
425
434
         if (Globals.ADVANCED)
426
435
         {
427
-		menu.add("-");
436
+            // Pretty much the same as duplicate and clone.
428
437
 		extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429
438
 		extractGeometriesItem.addActionListener(this);
430
439
 		cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431
440
 		cloneGeometriesItem.addActionListener(this);
432
-		shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
433
-		shareGeometriesItem.addActionListener(this);
434
-		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
435
-		mergeGeometriesItem.addActionListener(this);
436
441
         }
437
442
                 
438
443
 		oe.menuBar.add(menu = new Menu("Insert"));
..
..
@@ -488,7 +493,7 @@
488
493
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
489
494
                 
490
495
                 oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
491
-                liveCB.setToolTipText("Enabled animation");
496
+                liveCB.setToolTipText("Enable animation");
492
497
                                 liveCB.addItemListener(this);
493
498
 
494
499
 		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -651,7 +656,7 @@
651
656
                 zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
652
657
                                 zoomBoxCB.addItemListener(this);
653
658
 
654
-        if (Globals.ADVANCED)
659
+        if (true) // Globals.ADVANCED)
655
660
         {
656
661
                 panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657
662
                 supportCB.setToolTipText("Enable rigging");
..
..
@@ -724,6 +729,7 @@
724
729
             buttonGroup.add(radioButton);
725
730
             radioButton.doClick();
726
731
         }
732
+        
727
733
         void SetupViews(ObjEditor oe)
728
734
         {
729
735
             oe.SetupViews();
..
..
@@ -2276,7 +2282,7 @@
2276
2282
 		{
2277
2283
 			RevertMeshes();
2278
2284
 		} else
2279
-		if (source == resetMeshItem)
2285
+		if (source == resetAllItem)
2280
2286
 		{
2281
2287
 			ResetAll();
2282
2288
 		} else
..
..
@@ -2614,9 +2620,13 @@
2614
2620
                 {
2615
2621
 			SmoothMesh();
2616
2622
 		} else
2617
-		if (source == transformgeometryItem)
2623
+		if (source == transformGeometryItem)
2618
2624
 		{
2619
2625
                         TransformGeometry();
2626
+		} else
2627
+		if (source == transformChildrenItem)
2628
+		{
2629
+                        TransformChildren();
2620
2630
 		} else
2621
2631
 		if (source == resetTransformItem)
2622
2632
 		{
..
..
@@ -2624,7 +2634,11 @@
2624
2634
 		} else
2625
2635
 		if (source == resetCentroidItem)
2626
2636
 		{
2627
-                        ResetCentroid();
2637
+                        ResetCentroid(true);
2638
+		} else
2639
+		if (source == resetCentroidXZItem)
2640
+		{
2641
+                        ResetCentroid(false);
2628
2642
 		} else
2629
2643
 		if (source == resetParentItem)
2630
2644
 		{
..
..
@@ -3066,7 +3080,9 @@
3066
3080
                         frontView.object = group;
3067
3081
                         sideView.object = group;
3068
3082
                     }
3069
-                    group.editWindow = this;
3083
+                    
3084
+// fix "+" issue                    group.editWindow = this;
3085
+                    
3070
3086
                     /*
3071
3087
                     currentLayout = radio.layout;
3072
3088
                     if (currentLayout == null)
..
..
@@ -3140,6 +3156,28 @@
3140
3156
             refreshContents();
3141
3157
         }
3142
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
+        }
3143
3181
         
3144
3182
         void ResetTransform()
3145
3183
         {
..
..
@@ -3252,7 +3290,7 @@
3252
3290
             refreshContents();
3253
3291
         }
3254
3292
         
3255
-        void ResetCentroid()
3293
+        void ResetCentroid(boolean full)
3256
3294
         {
3257
3295
             Object3D obj;
3258
3296
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -3267,12 +3305,16 @@
3267
3305
                     LA.matIdentity(Object3D.mat);
3268
3306
                     obj.getBounds(minima, maxima, false);
3269
3307
                     Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3270
-                    Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3308
+                    if (full)
3309
+                        Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3271
3310
                     Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3272
3311
                     obj.TransformMesh(Object3D.mat);
3312
+                    
3273
3313
                     Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3274
-                    Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3314
+                    if (full)
3315
+                        Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3275
3316
                     Object3D.mat[3][2] = (minima.z + maxima.z)/2;
3317
+                    
3276
3318
                     LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3277
3319
                     //Object3D.mat[3][0] = -Object3D.mat[3][0];
3278
3320
                     //Object3D.mat[3][1] = -Object3D.mat[3][1];
..
..
@@ -3613,7 +3655,16 @@
3613
3655
                             String pigment = Object3D.GetPigment(tex);
3614
3656
                             //String bump = Object3D.GetBump(tex);
3615
3657
                             
3616
-                            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
+                            }
3617
3668
                             
3618
3669
                             double s = v.s;
3619
3670
                             
..
..
@@ -4085,7 +4136,7 @@
4085
4136
                     objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4086
4137
                     
4087
4138
 			Object3D elem = (Object3D)group.selection.elementAt(i);
4088
-                        if(elem != group)
4139
+                        if(elem != group || !newWindow)
4089
4140
                         {
4090
4141
                         //    if (!(elem instanceof Composite))
4091
4142
                         //        newWindow = false;
..
..
@@ -5092,7 +5143,7 @@
5092
5143
 	private MenuItem linkverticesItem;
5093
5144
 	private MenuItem relinkverticesItem;
5094
5145
 	private MenuItem setMasterItem;
5095
-	private MenuItem resetMeshItem;
5146
+	private MenuItem resetAllItem;
5096
5147
 	private MenuItem stepAllItem;
5097
5148
 	private MenuItem revertMeshItem;
5098
5149
 	private MenuItem poseMeshItem;
..
..
@@ -5153,8 +5204,10 @@
5153
5204
 	private MenuItem panoTexturesItem;
5154
5205
         
5155
5206
 	private MenuItem resetCentroidItem;
5156
-	private MenuItem transformgeometryItem;
5207
+	private MenuItem resetCentroidXZItem;
5157
5208
 	private MenuItem resetTransformItem;
5209
+	private MenuItem transformGeometryItem;
5210
+	private MenuItem transformChildrenItem;
5158
5211
 	private MenuItem hideItem;
5159
5212
 	private MenuItem grabItem;
5160
5213
 	private MenuItem backItem;