blame | history | patch | commit | commitdiff
Normand Briere
2019-04-28 f23e09019d161b02d566ffe312fdc553459fb954 
 ObjEditor.java
....@@ -31,6 +31,9 @@
3131         boolean timeline;
3232         boolean wasFullScreen;
3333 
34
+    GroupEditor callee;
35
+    JFrame frame;
36
+    
3437     // SCRIPT
3538     
3639     transient JFrame textpanel = null;
....@@ -121,14 +124,13 @@
121124     void keyPressed(int key, int modifiers)
122125     {
123126     System.out.println("KEY PRESSED");
124
-    CameraPane.theRenderer.keyPressed(key, modifiers);
127
+    Globals.theRenderer.keyPressed(key, modifiers);
125128     }
126129      */
127130 
128131     static GridBagConstraints aConstraints;
129132     static GridBagConstraints aWindowConstraints;
130
-    GroupEditor callee;
131
-    JFrame frame;
133
+
132134     static int GRIDWIDTH = 100; // 4;
133135 
134136     public void closeUI()
....@@ -160,12 +162,16 @@
160162         objEditor.ctrlPanel.remove(slowerButton);
161163         objEditor.ctrlPanel.remove(fasterButton);
162164         objEditor.ctrlPanel.remove(remarkButton);
165
+        
166
+        Remove(normalpushField);
163167     }
164168 
165169     public ObjEditor GetEditor()
166170     {
167171         return objEditor; //.GetEditor();
168172     }
173
+    
174
+    // Sometimes myself, sometimes my callee's.
169175     ObjEditor objEditor;
170176 
171177     /*
....@@ -305,7 +311,7 @@
305311         toggleTextureItem.setState(CameraPane.textureon);
306312         cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
307313         toggleLiveItem.addItemListener(this);
308
-        toggleLiveItem.setState(CameraPane.isLIVE());
314
+        toggleLiveItem.setState(Globals.isLIVE());
309315         cameraMenu.add(stepItem = new MenuItem("Step"));
310316         stepItem.addActionListener(this);
311317 //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
....@@ -814,7 +820,7 @@
814820 
815821         aConstraints.fill = GridBagConstraints.VERTICAL;
816822         jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
817
-        aConstraints.gridwidth = 2;
823
+        aConstraints.gridwidth = 1;
818824         ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
819825         aConstraints.gridx += 1;
820826         aConstraints.fill = GridBagConstraints.HORIZONTAL;
....@@ -983,6 +989,9 @@
983989 
984990         Return();
985991 
992
+    normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
993
+    Return();
994
+            
986995 //	oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
987996 //        ObjEditor.aConstraints.gridx += 1;
988997 
....@@ -1182,6 +1191,13 @@
11821191 	timelinePanel = new JPanel(new BorderLayout());
11831192         timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11841193 
1194
+        cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1195
+        cameraPanel.setContinuousLayout(true);
1196
+        cameraPanel.setOneTouchExpandable(true);
1197
+//        cameraPanel.setDividerLocation(0.9);
1198
+//        cameraPanel.setDividerSize(9);
1199
+        cameraPanel.setResizeWeight(1.0);
1200
+        
11851201         centralPanel.add(cameraView);
11861202         //frame.setJMenuBar(timelineMenubar);
11871203         //centralPanel.add(timelinePanel);
....@@ -1276,6 +1292,9 @@
12761292         optionsPanel = new JPanel(new GridBagLayout());
12771293 
12781294         optionsPanel.setName("Options");
1295
+        
1296
+        AddOptions(optionsPanel, aConstraints);
1297
+        
12791298         scenePanel.add(optionsPanel);
12801299 
12811300 
....@@ -1355,7 +1374,8 @@
13551374         //worldPane.add(bigPanel);
13561375         //worldPane.add(worldPanel);
13571376                 /**/
1358
-        frame.getContentPane().add(/*"Center",*/framePanel);
1377
+        //frame.getContentPane().add(/*"Center",*/framePanel);
1378
+        frame.add(/*"Center",*/framePanel);
13591379         //frame.getContentPane().add(/*"Center",*/ worldPane);
13601380 
13611381 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
....@@ -1376,6 +1396,10 @@
13761396         });
13771397     }
13781398 
1399
+    void AddOptions(JPanel panel, GridBagConstraints constraints)
1400
+    {
1401
+    }
1402
+    
13791403     JTree GetTree()
13801404     {
13811405         return objEditor.jTree;
....@@ -1446,7 +1470,7 @@
14461470         aConstraints.gridx += 1;
14471471         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
14481472         //aConstraints.weightx = 0;
1449
-        ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1473
+        ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
14501474         aConstraints.gridx = 0;
14511475         aConstraints.gridy += 1;
14521476         aConstraints.gridwidth = 1;
....@@ -1456,7 +1480,7 @@
14561480         aConstraints.fill = GridBagConstraints.HORIZONTAL;
14571481         aConstraints.gridx += 1;
14581482         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1459
-        ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1483
+        ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
14601484         aConstraints.gridx = 0;
14611485         aConstraints.gridy += 1;
14621486         aConstraints.gridwidth = 1;
....@@ -1466,7 +1490,7 @@
14661490         aConstraints.fill = GridBagConstraints.HORIZONTAL;
14671491         aConstraints.gridx += 1;
14681492         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1469
-        ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1493
+        ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
14701494         aConstraints.gridx = 0;
14711495         aConstraints.gridy += 1;
14721496         aConstraints.gridwidth = 1;
....@@ -1476,7 +1500,7 @@
14761500         aConstraints.fill = GridBagConstraints.HORIZONTAL;
14771501         aConstraints.gridx += 1;
14781502         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1479
-        ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1503
+        ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
14801504         aConstraints.gridx = 0;
14811505         aConstraints.gridy += 1;
14821506         aConstraints.gridwidth = 1;
....@@ -1486,7 +1510,7 @@
14861510         aConstraints.fill = GridBagConstraints.HORIZONTAL;
14871511         aConstraints.gridx += 1;
14881512         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1489
-        ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1513
+        ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
14901514         aConstraints.gridx = 0;
14911515         aConstraints.gridy += 1;
14921516         aConstraints.gridwidth = 1;
....@@ -1555,7 +1579,7 @@
15551579         aConstraints.fill = GridBagConstraints.HORIZONTAL;
15561580         aConstraints.gridx += 1;
15571581         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1558
-        ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1582
+        ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
15591583         aConstraints.gridx = 0;
15601584         aConstraints.gridy += 1;
15611585         aConstraints.gridwidth = 1;
....@@ -1624,7 +1648,7 @@
16241648         aConstraints.fill = GridBagConstraints.HORIZONTAL;
16251649         aConstraints.gridx += 1;
16261650         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1627
-        ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1651
+        ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
16281652         aConstraints.gridx = 0;
16291653         aConstraints.gridy += 1;
16301654         aConstraints.gridwidth = 1;
....@@ -1695,7 +1719,7 @@
16951719         aConstraints.fill = GridBagConstraints.HORIZONTAL;
16961720         aConstraints.gridx += 1;
16971721         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1698
-        ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1722
+        ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
16991723         aConstraints.gridx = 0;
17001724         aConstraints.gridy += 1;
17011725         aConstraints.gridwidth = 1;
....@@ -2989,7 +3013,8 @@
29893013             if (timeline)
29903014             {
29913015                 centralPanel.remove(cameraView);
2992
-                centralPanel.add(timelinePanel);
3016
+                cameraPanel.add(cameraView);
3017
+                centralPanel.add(cameraPanel);
29933018                 frame.setJMenuBar(timelineMenubar);
29943019                 wasFullScreen = CameraPane.FULLSCREEN;
29953020                 if (!CameraPane.FULLSCREEN)
....@@ -2998,7 +3023,7 @@
29983023             }
29993024             else
30003025             {
3001
-                centralPanel.remove(timelinePanel);
3026
+                centralPanel.remove(cameraPanel);
30023027                 centralPanel.add(cameraView);
30033028                 frame.setJMenuBar(null);
30043029                 if (!wasFullScreen)
....@@ -3121,7 +3146,8 @@
31213146             objEditor.refreshContents();
31223147         } else if (event.getSource() == stepItem)
31233148         {
3124
-            cameraView.ONESTEP = true;
3149
+            //cameraView.ONESTEP = true;
3150
+            Globals.ONESTEP = true;
31253151             cameraView.repaint();
31263152             return;
31273153         } else if (event.getSource() == stepButton)
....@@ -3278,25 +3304,25 @@
32783304 
32793305     void ToggleAnimation()
32803306     {
3281
-        if (!CameraPane.ANIMATION)
3307
+        if (!Globals.ANIMATION)
32823308         {
32833309             FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
32843310             browser.show();
32853311             String filename = browser.getFile();
32863312             if (filename != null && filename.length() > 0)
32873313             {
3288
-                CameraPane.filename = browser.getDirectory() + filename;
3314
+                Globals.filename = browser.getDirectory() + filename;
32893315                 //CameraPane.framecount = 0;
3290
-                CameraPane.imagecount = 0;
3316
+                Globals.imagecount = 0;
32913317 
3292
-                CameraPane.ANIMATION ^= true;
3318
+                Globals.ANIMATION ^= true;
32933319 
32943320                 GrafreeD.wav.cursor = 0;
32953321                 GrafreeD.wav.loop = 0;
32963322             }
32973323         } else
32983324         {
3299
-            CameraPane.ANIMATION ^= true;
3325
+            Globals.ANIMATION ^= true;
33003326         }
33013327     }
33023328 
....@@ -3549,7 +3575,13 @@
35493575             //System.out.println("PARENT = " + parent);
35503576             //if (parent != null)
35513577             //	parent.applySelf();
3552
-            refreshContents();
3578
+		if (e.getSource() == normalpushField)
3579
+		{
3580
+			objEditor.refreshContents();
3581
+			//Refresh();
3582
+		}
3583
+		else
3584
+                    refreshContents();
35533585             // ??? client.refreshEditWindow();
35543586         }
35553587         //else
....@@ -3561,7 +3593,7 @@
35613593         //group.name = nameField.getText();
35623594         //objEditor.applySelf();
35633595 
3564
-        assert (objEditor == this);
3596
+        // OCT2018: assert (objEditor == this);
35653597         if (copy.selection == null || copy.selection.size() == 0)
35663598 			//super.applySelf()
35673599                                 ; else
....@@ -3585,6 +3617,9 @@
35853617                 objEditor.copy = keep;
35863618             }
35873619         }
3620
+        
3621
+        if (normalpushField != null)
3622
+                copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
35883623     }
35893624 
35903625         void SnapObject()
....@@ -4517,6 +4552,7 @@
45174552     JPanel bigThree;
45184553     JTabbedPane scenePanel;
45194554     JPanel centralPanel;
4555
+    JSplitPane cameraPanel;
45204556     JPanel timelinePanel;
45214557     JMenuBar timelineMenubar;
45224558     JSplitPane framePanel;
....@@ -4629,4 +4665,6 @@
46294665     NumberSlider opacityPowerField;
46304666     JTree jTree;
46314667     //ObjectUI parent;
4668
+    
4669
+    NumberSlider normalpushField;
46324670 }