Material pane

Normand Briere

2019-04-29 6c2c00ee7f33ec46f79eba11c349f766cb207ec0

 CameraPane.java
..
..
@@ -86,12 +86,14 @@
86
86
 static    boolean FULLSCREEN = false;
87
87
 static    boolean SUPPORT = true;
88
88
 static    boolean INERTIA = true;
89
-static    boolean FAST = false;
89
+static    boolean FAST = true; // false;
90
90
 static    boolean SLOWPOSE = false;
91
91
 static    boolean FOOTCONTACT = true;
92
92
 
93
93
 static    int tickcount = 0; // slow pose issue
94
94
 
95
+static    boolean BUTTONLESSWHEEL = false;
96
+static    boolean ZOOMBOXMODE = false;
95
97
 static    boolean BOXMODE = false;
96
98
 static    boolean IMAGEFLIP = false;
97
99
 static    boolean SMOOTHFOCUS = false;
..
..
@@ -223,6 +225,11 @@
223
225
     public boolean IsBoxMode()
224
226
     {
225
227
             return BOXMODE;
228
+    }
229
+    
230
+    public boolean IsZoomBoxMode()
231
+    {
232
+            return ZOOMBOXMODE;
226
233
     }
227
234
     
228
235
     public void ClearDepth()
..
..
@@ -1612,12 +1619,12 @@
1612
1619
         //col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1613
1620
         if (!material.multiply)
1614
1621
         {
1615
-            display.color = color;
1622
+            display.color = material.color;
1616
1623
             display.saturation = material.modulation;
1617
1624
         }
1618
1625
         else
1619
1626
         {
1620
-            display.color *= color*2;
1627
+            display.color *= material.color*2;
1621
1628
             display.saturation *= material.modulation*2;
1622
1629
         }
1623
1630
             
..
..
@@ -2168,6 +2175,11 @@
2168
2175
     public void ToggleBoxMode()
2169
2176
     {
2170
2177
         BOXMODE ^= true;
2178
+    }
2179
+
2180
+    public void ToggleZoomBoxMode()
2181
+    {
2182
+        ZOOMBOXMODE ^= true;
2171
2183
     }
2172
2184
 
2173
2185
     public void ToggleSmoothFocus()
..
..
@@ -12735,7 +12747,7 @@
12735
12747
               "MUL final.y, fragment.texcoord[0].x, c256;" +
12736
12748
               "FLR final.x, final.y;" +
12737
12749
               "SUB final.y, final.y, final.x;" +
12738
-              "MUL final.x, final.x, c256i;" +
12750
+              //"MUL final.x, final.x, c256i;" +
12739
12751
               "MOV final.z, zero.x;" +
12740
12752
               "MOV final.a, one.w;":""
12741
12753
               ) +
..
..
@@ -12743,7 +12755,7 @@
12743
12755
               "MUL final.y, fragment.texcoord[0].y, c256;" +
12744
12756
               "FLR final.x, final.y;" +
12745
12757
               "SUB final.y, final.y, final.x;" +
12746
-              "MUL final.x, final.x, c256i;" +
12758
+              //"MUL final.x, final.x, c256i;" +
12747
12759
               "MOV final.z, zero.x;" +
12748
12760
               "MOV final.a, one.w;":""
12749
12761
               ) +
..
..
@@ -13523,6 +13535,7 @@
13523
13535
 	
13524
13536
         //System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13525
13537
             
13538
+        if (BUTTONLESSWHEEL)
13526
13539
 	if (Math.abs(ratio) < 0.1 || Math.abs(Dtime) == 0) // < 30)
13527
13540
 	{
13528
13541
             return;
..
..
@@ -13531,7 +13544,7 @@
13531
13544
         boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13532
13545
         
13533
13546
         // TIMER
13534
-        if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13547
+        if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13535
13548
         {
13536
13549
             keepboxmode = BOXMODE;
13537
13550
             keepsupport = SUPPORT;
..
..
@@ -13748,11 +13761,11 @@
13748
13761
     
13749
13762
     public void mouseDragged(MouseEvent e)
13750
13763
     {
13764
+        //System.out.println("mouseDragged: " + e);
13751
13765
         if (isRenderer)
13752
13766
             movingcamera = true;
13753
13767
         //if (drawing)
13754
13768
         //return;
13755
-        //System.out.println("mouseDragged: " + e);
13756
13769
         if ((e.getModifiersEx() & CTRL) != 0
13757
13770
             || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
13758
13771
         {
..
..
@@ -14287,7 +14300,6 @@
14287
14300
     public void mouseMoved(MouseEvent e)
14288
14301
     {
14289
14302
         //System.out.println("mouseMoved: " + e);
14290
-
14291
14303
         if (isRenderer)
14292
14304
             return;
14293
14305
         
..
..
@@ -15100,8 +15112,9 @@
15100
15112
 
15101
15113
     protected void processMouseMotionEvent(MouseEvent e)
15102
15114
     {
15103
-        //System.out.println("processMouseMotionEvent: " + mouseMode);
15104
-        if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15115
+        //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15116
+        //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15117
+        if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
15105
15118
         {
15106
15119
             mouseMoved(e);
15107
15120
         } else