blame | history | patch | commit | commitdiff
Normand Briere
2019-05-05 481df91095a82824d2a98d4db860b3caadbda70a 
 ObjEditor.java
....@@ -143,6 +143,8 @@
143143         //nameField.removeActionListener(this);
144144 //        objEditor.ctrlPanel.remove(nameField);
145145         
146
+        objEditor.ctrlPanel.remove(namePanel);
147
+        
146148         if (!GroupEditor.allparams)
147149             return;
148150         
....@@ -165,7 +167,6 @@
165167 //        objEditor.ctrlPanel.remove(fasterButton);
166168 //        objEditor.ctrlPanel.remove(remarkButton);
167169         
168
-        objEditor.ctrlPanel.remove(namePanel);
169170         objEditor.ctrlPanel.remove(setupPanel);
170171         objEditor.ctrlPanel.remove(commandsPanel);
171172         objEditor.ctrlPanel.remove(pushPanel);
....@@ -308,44 +309,61 @@
308309         //normalLensItem.addActionListener(this);
309310         cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
310311         revertCameraItem.addActionListener(this);
311
-        cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
312
-        toggleTimelineItem.addItemListener(this);
312
+        
313313         cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
314314         toggleFullScreenItem.addItemListener(this);
315315         toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
316316         cameraMenu.add("-");
317
+        
317318         cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
318319         toggleTextureItem.addItemListener(this);
319320         toggleTextureItem.setState(CameraPane.textureon);
320
-        cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
321
-        toggleLiveItem.addItemListener(this);
322
-        toggleLiveItem.setState(Globals.isLIVE());
323
-        cameraMenu.add(stepItem = new MenuItem("Step"));
324
-        stepItem.addActionListener(this);
325
-//		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
326
-//		toggleDLItem.addItemListener(this);
327
-//                toggleDLItem.setState(false);
328
-        cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
329
-        toggleRenderItem.addItemListener(this);
330
-        toggleRenderItem.setState(!CameraPane.frozen);
331
-        cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
332
-        toggleDebugItem.addItemListener(this);
333
-        toggleDebugItem.setState(CameraPane.DEBUG);
334
-        cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
335
-        toggleFrustumItem.addItemListener(this);
336
-        toggleFrustumItem.setState(CameraPane.FRUSTUM);
337
-        cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
338
-        toggleFootContactItem.addItemListener(this);
339
-        toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
340
-        cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
341
-        toggleRandomItem.addItemListener(this);
342
-        toggleRandomItem.setState(CameraPane.RANDOM);
321
+        
322
+        cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
323
+        toggleSwitchItem.addItemListener(this);
324
+        toggleSwitchItem.setState(CameraPane.SWITCH);
325
+        
343326         cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
344327         toggleHandleItem.addItemListener(this);
345328         toggleHandleItem.setState(CameraPane.HANDLES);
329
+        
346330         cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
347331         togglePaintItem.addItemListener(this);
348332         togglePaintItem.setState(CameraPane.PAINTMODE);
333
+        
334
+        if (Globals.ADVANCED)
335
+        {
336
+        cameraMenu.add("-");
337
+                cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
338
+                toggleLiveItem.addItemListener(this);
339
+                toggleLiveItem.setState(Globals.isLIVE());
340
+
341
+                cameraMenu.add(stepItem = new MenuItem("Step"));
342
+                stepItem.addActionListener(this);
343
+        //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
344
+        //		toggleDLItem.addItemListener(this);
345
+        //                toggleDLItem.setState(false);
346
+
347
+                cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
348
+                toggleRenderItem.addItemListener(this);
349
+                toggleRenderItem.setState(!CameraPane.frozen);
350
+
351
+                cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
352
+                toggleDebugItem.addItemListener(this);
353
+                toggleDebugItem.setState(CameraPane.DEBUG);
354
+
355
+                cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
356
+                toggleFrustumItem.addItemListener(this);
357
+                toggleFrustumItem.setState(CameraPane.FRUSTUM);
358
+
359
+                cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
360
+                toggleFootContactItem.addItemListener(this);
361
+                toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
362
+                
363
+                cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
364
+                toggleTimelineItem.addItemListener(this);
365
+        }
366
+        
349367 //		cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
350368 //		toggleRootItem.addItemListener(this);
351369 //                    toggleRootItem.setState(false);
....@@ -951,10 +969,6 @@
951969 
952970     void SetupUI2(ObjEditor oe)
953971     {
954
-//            oe.aConstraints.weightx = 0;
955
-//            oe.aConstraints.weighty = 0;
956
-//            oe.aConstraints.gridx = 0;
957
-//            oe.aConstraints.gridy = 0;
958972         //SetupName(oe);
959973         
960974             namePanel = new cGridBag();
....@@ -971,27 +985,45 @@
971985             setupPanel = new cGridBag().setVertical(false);
972986             
973987         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
974
-        link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
988
+                liveCB.setToolTipText("Animate object");
975989         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
990
+                hideCB.setToolTipText("Hide object");
976991 //            Return();
977992         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
978
-        rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
979
-        randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
993
+        markCB.setToolTipText("Set the animation target transform");
994
+        
995
+        rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
996
+        rewindCB.setToolTipText("Rewind animation");
997
+        
998
+        randomCB = AddCheckBox(setupPanel, "Random", copy.random);
999
+        randomCB.setToolTipText("Option for switch node");
9801000 
1001
+        if (Globals.ADVANCED)
1002
+        {
1003
+                link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
1004
+                link2masterCB.setToolTipText("Attach to support");
1005
+                speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
1006
+                speedupCB.setToolTipText("Option motion capture");
1007
+        }
1008
+        
9811009         oe.ctrlPanel.add(setupPanel);
9821010         oe.ctrlPanel.Return();
9831011         
9841012             commandsPanel = new cGridBag().setVertical(false);
9851013         
9861014         resetButton = AddButton(commandsPanel, "Reset");
1015
+        resetButton.setToolTipText("Jump to frame zero");
9871016         stepButton = AddButton(commandsPanel, "Step");
1017
+        stepButton.setToolTipText("Step one frame");
9881018 //            resetAllButton = AddButton(oe, "Reset All");
9891019 //            stepAllButton = AddButton(oe, "Step All");
990
-        speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
9911020 //            Return();
9921021         slowerButton = AddButton(commandsPanel, "Slow");
1022
+        slowerButton.setToolTipText("Decrease animation speed");
9931023         fasterButton = AddButton(commandsPanel, "Fast");
1024
+        fasterButton.setToolTipText("Increase animation speed");
9941025         remarkButton = AddButton(commandsPanel, "Remark");
1026
+        remarkButton.setToolTipText("Set the current transform as the target");
9951027 
9961028         oe.ctrlPanel.add(commandsPanel);
9971029         oe.ctrlPanel.Return();
....@@ -1298,7 +1330,7 @@
12981330         scrollpane.addMouseWheelListener(this); // Default not fast enough
12991331 
13001332         /*JTabbedPane*/ scenePanel = new cGridBag();
1301
-        scenePanel.preferredWidth = 7;
1333
+        scenePanel.preferredWidth = 6;
13021334         
13031335         JTabbedPane tabbedPane = new JTabbedPane();
13041336         tabbedPane.add(scrollpane);
....@@ -1404,8 +1436,8 @@
14041436 
14051437 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
14061438 
1407
-        frame.setSize(1024, 768);
1408
-        frame.show();
1439
+        frame.setSize(1280, 860);
1440
+        frame.setVisible(true);
14091441 
14101442         gridPanel.setDividerLocation(1.0);
14111443 
....@@ -1454,9 +1486,12 @@
14541486         editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
14551487                 clearMaterialButton.setToolTipText("Clear material");
14561488         
1457
-        editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1458
-        editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1459
-        editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1489
+        if (Globals.ADVANCED)
1490
+        {
1491
+                editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1492
+                editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1493
+                editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1494
+        }
14601495 
14611496         editBar.preferredHeight = 15;
14621497         
....@@ -1725,12 +1760,15 @@
17251760         opacityPowerField.addChangeListener(this);
17261761         /**/
17271762 
1728
-        resetSlidersButton.addActionListener(this);
17291763         clearMaterialButton.addActionListener(this);
17301764         createMaterialButton.addActionListener(this);
1731
-
1732
-        propagateToggle.addItemListener(this);
1733
-        multiplyToggle.addItemListener(this);
1765
+        
1766
+        if (Globals.ADVANCED)
1767
+        {
1768
+                resetSlidersButton.addActionListener(this);
1769
+                propagateToggle.addItemListener(this);
1770
+                multiplyToggle.addItemListener(this);
1771
+        }
17341772     }
17351773 
17361774     void DropFile(java.io.File[] files, boolean textures)
....@@ -1901,7 +1939,7 @@
19011939 
19021940         //? flashIt = false;
19031941         CameraPane pane = (CameraPane) cameraView;
1904
-        pane.clickStart(location.x, location.y, 0);
1942
+        pane.clickStart(location.x, location.y, 0, 0);
19051943         pane.clickEnd(location.x, location.y, 0, true);
19061944 
19071945         if (group.selection.size() == 1)
....@@ -2362,7 +2400,7 @@
23622400         {
23632401             /**/
23642402             FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2365
-            browser.show();
2403
+            browser.setVisible(true);
23662404             String filename = browser.getFile();
23672405             if (filename != null && filename.length() > 0)
23682406             {
....@@ -2722,7 +2760,8 @@
27222760             return;
27232761         }
27242762 
2725
-        multiplyToggle.setSelected(mat.multiply);
2763
+        if (multiplyToggle != null)
2764
+                multiplyToggle.setSelected(mat.multiply);
27262765 
27272766         assert (object.projectedVertices != null);
27282767 
....@@ -2937,7 +2976,7 @@
29372976             frame.validate();
29382977 
29392978             return;
2940
-        } else if (event.getSource() == toggleRandomItem)
2979
+        } else if (event.getSource() == toggleSwitchItem)
29412980         {
29422981             cameraView.ToggleRandom();
29432982             cameraView.repaint();
....@@ -2982,6 +3021,7 @@
29823021         if (event.getSource() == randomCB)
29833022         {
29843023             copy.random ^= true;
3024
+            objEditor.refreshContents();
29853025             return;
29863026         }
29873027         if (event.getSource() == speedupCB)
....@@ -3237,7 +3277,6 @@
32373277             callee.refreshContents();
32383278         } else
32393279         {
3240
-                new Exception().printStackTrace();
32413280             System.exit(0);
32423281         }
32433282     }
....@@ -3267,7 +3306,7 @@
32673306     void CreateMaterial()
32683307     {
32693308         //copy.ClearMaterial(); // PATCH
3270
-        copy.CreateMaterialS(multiplyToggle.isSelected());
3309
+        copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
32713310         if (copy.selection.size() > 0)
32723311         //SetMaterial(copy);
32733312         {
....@@ -3326,11 +3365,11 @@
33263365     {
33273366         copy.ResetBlockLoop(); // temporary problem
33283367 
3329
-        boolean random = CameraPane.RANDOM;
3330
-        CameraPane.RANDOM = false; // parse everything
3368
+        boolean random = CameraPane.SWITCH;
3369
+        CameraPane.SWITCH = false; // parse everything
33313370         copy.ResetDisplayList();
33323371         copy.HardTouch();
3333
-        CameraPane.RANDOM = random;
3372
+        CameraPane.SWITCH = random;
33343373     }
33353374 
33363375 //	public void applySelf()
....@@ -3404,6 +3443,36 @@
34043443             {
34053444                 //System.out.println("Propagate = " + propagate);
34063445                 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
+                
34073476                 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
34083477                 {
34093478                     copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
....@@ -4430,7 +4499,7 @@
44304499     CheckboxMenuItem toggleFootContactItem;
44314500     CheckboxMenuItem toggleDLItem;
44324501     CheckboxMenuItem toggleTextureItem;
4433
-    CheckboxMenuItem toggleRandomItem;
4502
+    CheckboxMenuItem toggleSwitchItem;
44344503     CheckboxMenuItem toggleRootItem;
44354504     CheckboxMenuItem animationItem;
44364505     CheckboxMenuItem toggleHandleItem;