Transform children

Normand Briere

2019-05-13 f924d3e00db476c06f55f3d5aaef307e17575340

 ObjEditor.java
..
..
@@ -501,13 +501,13 @@
501
501
         //SendInfo("Name:", "bold");
502
502
         if (sel.GetTextures() != null || debug)
503
503
         {
504
-            si.SendInfo(sel.toString(), "bold");
504
+            si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
505
505
             //SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
506
506
             if (sel.Size() > 0)
507
507
             {
508
508
                 si.SendInfo("#children = " + sel.Size(), "regular");
509
509
             }
510
-            si.SendInfo((debug ? "    Parent: " : "    ") + sel.parent, "regular");
510
+            si.SendInfo((debug ? "    Parent: " : "    ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
511
511
             if (debug)
512
512
             {
513
513
                 try
..
..
@@ -549,7 +549,7 @@
549
549
                 }
550
550
                 if (sel.support != null)
551
551
                 {
552
-                    si.SendInfo("    support: " + sel.support, "regular");
552
+                    si.SendInfo("    support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
553
553
                 }
554
554
                 if (sel.scriptnode != null)
555
555
                 {
..
..
@@ -752,7 +752,7 @@
752
752
     protected static ImageIcon createImageIcon(String path,
753
753
             String description)
754
754
     {
755
-        java.net.URL imgURL = GrafreeD.class.getResource(path);
755
+        java.net.URL imgURL = Grafreed.class.getResource(path);
756
756
         if (imgURL != null)
757
757
         {
758
758
             return new ImageIcon(imgURL, description);
..
..
@@ -1476,19 +1476,19 @@
1476
1476
 
1477
1477
         cGridBag editBar = new cGridBag().setVertical(false);
1478
1478
             
1479
-        editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1479
+        editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1480
1480
                 createMaterialButton.setToolTipText("Create material");
1481
1481
 
1482
1482
         /*
1483
1483
         ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1484
1484
          */
1485
1485
 
1486
-        editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1486
+        editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1487
1487
                 clearMaterialButton.setToolTipText("Clear material");
1488
1488
         
1489
1489
         if (Globals.ADVANCED)
1490
1490
         {
1491
-                editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1491
+                editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
1492
1492
                 editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1493
1493
                 editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1494
1494
         }
..
..
@@ -2396,7 +2396,7 @@
2396
2396
 
2397
2397
     void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2398
2398
     {
2399
-        if (GrafreeD.standAlone)
2399
+        if (Grafreed.standAlone)
2400
2400
         {
2401
2401
             /**/
2402
2402
             FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
..
..
@@ -3255,8 +3255,8 @@
3255
3255
 
3256
3256
                 Globals.ANIMATION ^= true;
3257
3257
 
3258
-                GrafreeD.wav.cursor = 0;
3259
-                GrafreeD.wav.loop = 0;
3258
+                Grafreed.wav.cursor = 0;
3259
+                Grafreed.wav.loop = 0;
3260
3260
             }
3261
3261
         } else
3262
3262
         {
..
..
@@ -3443,6 +3443,36 @@
3443
3443
             {
3444
3444
                 //System.out.println("Propagate = " + propagate);
3445
3445
                 copy.UpdateMaterial(anchor, current, propagate);
3446
+                
3447
+                if (copy.material != null)
3448
+                {
3449
+                    cMaterial mat = copy.material;
3450
+                            
3451
+                    colorField.SetToolTipValue((mat.color));
3452
+                    modulationField.SetToolTipValue((mat.modulation));
3453
+                    metalnessField.SetToolTipValue((mat.metalness));
3454
+                    diffuseField.SetToolTipValue((mat.diffuse));
3455
+                    specularField.SetToolTipValue((mat.specular));
3456
+                    shininessField.SetToolTipValue((mat.shininess));
3457
+                    shiftField.SetToolTipValue((mat.shift));
3458
+                    ambientField.SetToolTipValue((mat.ambient));
3459
+                    lightareaField.SetToolTipValue((mat.lightarea));
3460
+                    diffusenessField.SetToolTipValue((mat.factor));
3461
+                    velvetField.SetToolTipValue((mat.velvet));
3462
+                    sheenField.SetToolTipValue((mat.sheen));
3463
+                    subsurfaceField.SetToolTipValue((mat.subsurface));
3464
+                    backlitField.SetToolTipValue((mat.bump));
3465
+                    anisoField.SetToolTipValue((mat.aniso));
3466
+                    anisoVField.SetToolTipValue((mat.anisoV));
3467
+                    cameraField.SetToolTipValue((mat.cameralight));
3468
+                    selfshadowField.SetToolTipValue((mat.diffuseness));
3469
+                    shadowField.SetToolTipValue((mat.shadow));
3470
+                    textureField.SetToolTipValue((mat.texture));
3471
+                    opacityField.SetToolTipValue((mat.opacity));
3472
+                    fakedepthField.SetToolTipValue((mat.fakedepth));
3473
+                    shadowbiasField.SetToolTipValue((mat.shadowbias));
3474
+                }
3475
+                
3446
3476
                 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3447
3477
                 {
3448
3478
                     copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..
..
@@ -4170,7 +4200,7 @@
4170
4200
 
4171
4201
     void load() // throws ClassNotFoundException
4172
4202
     {
4173
-        if (GrafreeD.standAlone)
4203
+        if (Grafreed.standAlone)
4174
4204
         {
4175
4205
             FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4176
4206
             browser.show();
..
..
@@ -4275,7 +4305,7 @@
4275
4305
 
4276
4306
     void saveAs()
4277
4307
     {
4278
-        if (GrafreeD.standAlone)
4308
+        if (Grafreed.standAlone)
4279
4309
         {
4280
4310
             FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4281
4311
             browser.setVisible(true);
..
..
@@ -4386,7 +4416,7 @@
4386
4416
             Object3D objectparent = obj.parent;
4387
4417
             obj.parent = null;
4388
4418
 
4389
-            Object3D object = (Object3D) GrafreeD.clone(obj);
4419
+            Object3D object = (Object3D) Grafreed.clone(obj);
4390
4420
 
4391
4421
             obj.parent = objectparent;
4392
4422
 
..
..
@@ -4420,7 +4450,7 @@
4420
4450
         buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4421
4451
         cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4422
4452
         copy.generatePOV(buffer);
4423
-        if (GrafreeD.standAlone)
4453
+        if (Grafreed.standAlone)
4424
4454
         {
4425
4455
             FileDialog browser = new FileDialog(frame, "Export POV", 1);
4426
4456
             browser.show();