blame | history | patch | commit | commitdiff
Normand Briere
2019-04-28 f1c718cce66e5651a0dae91375db6ebfaded1a92 
 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);
....@@ -1355,7 +1371,8 @@
13551371         //worldPane.add(bigPanel);
13561372         //worldPane.add(worldPanel);
13571373                 /**/
1358
-        frame.getContentPane().add(/*"Center",*/framePanel);
1374
+        //frame.getContentPane().add(/*"Center",*/framePanel);
1375
+        frame.add(/*"Center",*/framePanel);
13591376         //frame.getContentPane().add(/*"Center",*/ worldPane);
13601377 
13611378 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
....@@ -1446,7 +1463,7 @@
14461463         aConstraints.gridx += 1;
14471464         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
14481465         //aConstraints.weightx = 0;
1449
-        ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1466
+        ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
14501467         aConstraints.gridx = 0;
14511468         aConstraints.gridy += 1;
14521469         aConstraints.gridwidth = 1;
....@@ -1456,7 +1473,7 @@
14561473         aConstraints.fill = GridBagConstraints.HORIZONTAL;
14571474         aConstraints.gridx += 1;
14581475         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1459
-        ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1476
+        ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
14601477         aConstraints.gridx = 0;
14611478         aConstraints.gridy += 1;
14621479         aConstraints.gridwidth = 1;
....@@ -1466,7 +1483,7 @@
14661483         aConstraints.fill = GridBagConstraints.HORIZONTAL;
14671484         aConstraints.gridx += 1;
14681485         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1469
-        ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1486
+        ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
14701487         aConstraints.gridx = 0;
14711488         aConstraints.gridy += 1;
14721489         aConstraints.gridwidth = 1;
....@@ -1476,7 +1493,7 @@
14761493         aConstraints.fill = GridBagConstraints.HORIZONTAL;
14771494         aConstraints.gridx += 1;
14781495         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1479
-        ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1496
+        ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
14801497         aConstraints.gridx = 0;
14811498         aConstraints.gridy += 1;
14821499         aConstraints.gridwidth = 1;
....@@ -1486,7 +1503,7 @@
14861503         aConstraints.fill = GridBagConstraints.HORIZONTAL;
14871504         aConstraints.gridx += 1;
14881505         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1489
-        ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1506
+        ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
14901507         aConstraints.gridx = 0;
14911508         aConstraints.gridy += 1;
14921509         aConstraints.gridwidth = 1;
....@@ -1555,7 +1572,7 @@
15551572         aConstraints.fill = GridBagConstraints.HORIZONTAL;
15561573         aConstraints.gridx += 1;
15571574         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1558
-        ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1575
+        ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
15591576         aConstraints.gridx = 0;
15601577         aConstraints.gridy += 1;
15611578         aConstraints.gridwidth = 1;
....@@ -1624,7 +1641,7 @@
16241641         aConstraints.fill = GridBagConstraints.HORIZONTAL;
16251642         aConstraints.gridx += 1;
16261643         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1627
-        ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1644
+        ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
16281645         aConstraints.gridx = 0;
16291646         aConstraints.gridy += 1;
16301647         aConstraints.gridwidth = 1;
....@@ -1695,7 +1712,7 @@
16951712         aConstraints.fill = GridBagConstraints.HORIZONTAL;
16961713         aConstraints.gridx += 1;
16971714         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1698
-        ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1715
+        ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
16991716         aConstraints.gridx = 0;
17001717         aConstraints.gridy += 1;
17011718         aConstraints.gridwidth = 1;
....@@ -2989,7 +3006,8 @@
29893006             if (timeline)
29903007             {
29913008                 centralPanel.remove(cameraView);
2992
-                centralPanel.add(timelinePanel);
3009
+                cameraPanel.add(cameraView);
3010
+                centralPanel.add(cameraPanel);
29933011                 frame.setJMenuBar(timelineMenubar);
29943012                 wasFullScreen = CameraPane.FULLSCREEN;
29953013                 if (!CameraPane.FULLSCREEN)
....@@ -2998,7 +3016,7 @@
29983016             }
29993017             else
30003018             {
3001
-                centralPanel.remove(timelinePanel);
3019
+                centralPanel.remove(cameraPanel);
30023020                 centralPanel.add(cameraView);
30033021                 frame.setJMenuBar(null);
30043022                 if (!wasFullScreen)
....@@ -3121,7 +3139,8 @@
31213139             objEditor.refreshContents();
31223140         } else if (event.getSource() == stepItem)
31233141         {
3124
-            cameraView.ONESTEP = true;
3142
+            //cameraView.ONESTEP = true;
3143
+            Globals.ONESTEP = true;
31253144             cameraView.repaint();
31263145             return;
31273146         } else if (event.getSource() == stepButton)
....@@ -3278,25 +3297,25 @@
32783297 
32793298     void ToggleAnimation()
32803299     {
3281
-        if (!CameraPane.ANIMATION)
3300
+        if (!Globals.ANIMATION)
32823301         {
32833302             FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
32843303             browser.show();
32853304             String filename = browser.getFile();
32863305             if (filename != null && filename.length() > 0)
32873306             {
3288
-                CameraPane.filename = browser.getDirectory() + filename;
3307
+                Globals.filename = browser.getDirectory() + filename;
32893308                 //CameraPane.framecount = 0;
3290
-                CameraPane.imagecount = 0;
3309
+                Globals.imagecount = 0;
32913310 
3292
-                CameraPane.ANIMATION ^= true;
3311
+                Globals.ANIMATION ^= true;
32933312 
32943313                 GrafreeD.wav.cursor = 0;
32953314                 GrafreeD.wav.loop = 0;
32963315             }
32973316         } else
32983317         {
3299
-            CameraPane.ANIMATION ^= true;
3318
+            Globals.ANIMATION ^= true;
33003319         }
33013320     }
33023321 
....@@ -3549,7 +3568,13 @@
35493568             //System.out.println("PARENT = " + parent);
35503569             //if (parent != null)
35513570             //	parent.applySelf();
3552
-            refreshContents();
3571
+		if (e.getSource() == normalpushField)
3572
+		{
3573
+			objEditor.refreshContents();
3574
+			//Refresh();
3575
+		}
3576
+		else
3577
+                    refreshContents();
35533578             // ??? client.refreshEditWindow();
35543579         }
35553580         //else
....@@ -3561,7 +3586,7 @@
35613586         //group.name = nameField.getText();
35623587         //objEditor.applySelf();
35633588 
3564
-        assert (objEditor == this);
3589
+        // OCT2018: assert (objEditor == this);
35653590         if (copy.selection == null || copy.selection.size() == 0)
35663591 			//super.applySelf()
35673592                                 ; else
....@@ -3585,6 +3610,9 @@
35853610                 objEditor.copy = keep;
35863611             }
35873612         }
3613
+        
3614
+        if (normalpushField != null)
3615
+                copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
35883616     }
35893617 
35903618         void SnapObject()
....@@ -4517,6 +4545,7 @@
45174545     JPanel bigThree;
45184546     JTabbedPane scenePanel;
45194547     JPanel centralPanel;
4548
+    JSplitPane cameraPanel;
45204549     JPanel timelinePanel;
45214550     JMenuBar timelineMenubar;
45224551     JSplitPane framePanel;
....@@ -4629,4 +4658,6 @@
46294658     NumberSlider opacityPowerField;
46304659     JTree jTree;
46314660     //ObjectUI parent;
4661
+    
4662
+    NumberSlider normalpushField;
46324663 }