parent: bdd402e8 | patch | commit
Normand Briere
2019-11-17 1816088e6a6cc71934ab1e82fbaa12f026eb17e1 
Min texture (128) + arrows.
4 files modified
203 ■■■■■ changed files
BoundaryRep.java 2 ●●●●● patch | view | raw | blame | history
CameraPane.java 177 ●●●●● patch | view | raw | blame | history
GroupEditor.java 19 ●●●●● patch | view | raw | blame | history
ObjEditor.java 5 ●●●●● patch | view | raw | blame | history 
 BoundaryRep.java
....@@ -7976,6 +7976,8 @@
79767976             
79777977             int indexr = GetVertex(face.r).valid;
79787978             
7979
+//            if (indexp == -1 && indexq == -1 && indexr == -1)
7980
+//                continue;
79797981             if (indexr == -1)
79807982                 continue;
79817983             


 CameraPane.java
....@@ -50,10 +50,12 @@
5050     
5151     static int STEP = 1;
5252 
53
+    //static int[] pixels = new int[10000000];
54
+        
5355     private static BufferedImage CreateBim(byte[] bytes, int width, int height)
5456     {
5557         int[] pixels = new int[bytes.length/3];
56
-        for (int i=pixels.length; --i>=0;)
58
+        for (int i=bytes.length/3; --i>=0;)
5759         {
5860             int i3 = i*3;
5961             pixels[i] = 0xFF;
....@@ -3859,12 +3861,13 @@
38593861         
38603862         switch (resolution)
38613863         {
3862
-            case 0: restarget = 256*256; break;
3863
-            case 1: restarget = 512*512; break;
3864
-            case 2: restarget = 1024*1024; break;
3865
-            case 3: restarget = 2048*2048; break;
3866
-            case 4: restarget = 4096*4096; break;
3867
-            case 5: restarget = 8192*8192; break;
3864
+            case 0: restarget = 128*128; break;
3865
+            case 1: restarget = 256*256; break;
3866
+            case 2: restarget = 512*512; break;
3867
+            case 3: restarget = 1024*1024; break;
3868
+            case 4: restarget = 2048*2048; break;
3869
+            case 5: restarget = 4096*4096; break;
3870
+            case 6: restarget = 8192*8192; break;
38683871         }
38693872         
38703873 //        restarget = 512*512; // 512*512; // 2048; // 512; // 1024;
....@@ -10892,61 +10895,64 @@
1089210895             {
1089310896                 //pingthread.mute = true;
1089410897         
10895
-                boolean keyon = false;
10896
-                
10897
-                if (keys[DOWN_ARROW])
10898
+                if (capsLocked)
1089810899                 {
10899
-                    speed = ++speedkey[DOWN_ARROW];
10900
-                    if (speed > 20)
10901
-                        speed = 20;
10902
-                    GoDown(modifiers);
10903
-                    keyon = true;
10904
-                }
10905
-                else
10906
-                    speedkey[DOWN_ARROW] = 0;
10900
+                    boolean keyon = false;
1090710901 
10908
-                if (keys[UP_ARROW])
10909
-                {
10910
-                    speed = ++speedkey[UP_ARROW];
10911
-                    if (speed > 20)
10912
-                        speed = 20;
10913
-                    GoUp(modifiers);
10914
-                    keyon = true;
10915
-                }
10916
-                else
10917
-                    speedkey[UP_ARROW] = 0;
10902
+                    if (keys[DOWN_ARROW])
10903
+                    {
10904
+                        speed = ++speedkey[DOWN_ARROW];
10905
+                        if (speed > 20)
10906
+                            speed = 20;
10907
+                        GoDown(modifiers);
10908
+                        keyon = true;
10909
+                    }
10910
+                    else
10911
+                        speedkey[DOWN_ARROW] = 0;
1091810912 
10919
-                if (keys[LEFT_ARROW])
10920
-                {
10921
-                    speed = ++speedkey[LEFT_ARROW];
10922
-                    if (speed > 20)
10923
-                        speed = 20;
10924
-                    GoLeft(modifiers);
10925
-                    keyon = true;
10926
-                }
10927
-                else 
10928
-                    speedkey[LEFT_ARROW] = 0;
10913
+                    if (keys[UP_ARROW])
10914
+                    {
10915
+                        speed = ++speedkey[UP_ARROW];
10916
+                        if (speed > 20)
10917
+                            speed = 20;
10918
+                        GoUp(modifiers);
10919
+                        keyon = true;
10920
+                    }
10921
+                    else
10922
+                        speedkey[UP_ARROW] = 0;
1092910923 
10930
-                if (keys[RIGHT_ARROW])
10931
-                {
10932
-                    speed = ++speedkey[RIGHT_ARROW];
10933
-                    if (speed > 20)
10934
-                        speed = 20;
10935
-                    GoRight(modifiers);
10936
-                    keyon = true;
10937
-                }
10938
-                else
10939
-                    speedkey[RIGHT_ARROW] = 0;
10940
-                
10941
-                if (Globals.WALK && capsLocked)
10942
-                {
10943
-                    Walk();
10944
-                    keyon = true;
10945
-                }
10946
-                
10947
-                if (keyon)
10948
-                {
10949
-                    repaint();
10924
+                    if (keys[LEFT_ARROW])
10925
+                    {
10926
+                        speed = ++speedkey[LEFT_ARROW];
10927
+                        if (speed > 20)
10928
+                            speed = 20;
10929
+                        GoLeft(modifiers);
10930
+                        keyon = true;
10931
+                    }
10932
+                    else 
10933
+                        speedkey[LEFT_ARROW] = 0;
10934
+
10935
+                    if (keys[RIGHT_ARROW])
10936
+                    {
10937
+                        speed = ++speedkey[RIGHT_ARROW];
10938
+                        if (speed > 20)
10939
+                            speed = 20;
10940
+                        GoRight(modifiers);
10941
+                        keyon = true;
10942
+                    }
10943
+                    else
10944
+                        speedkey[RIGHT_ARROW] = 0;
10945
+
10946
+                    if (Globals.WALK)
10947
+                    {
10948
+                        Walk();
10949
+                        keyon = true;
10950
+                    }
10951
+
10952
+                    if (keyon)
10953
+                    {
10954
+                        repaint();
10955
+                    }
1095010956                 }
1095110957                 
1095210958                 //pingthread.mute = false;
....@@ -15033,6 +15039,11 @@
1503315039         LA.vecSub(manipCamera.location, manipCamera.lookAt, manipCamera.direction);
1503415040         float scale = (float)manipCamera.direction.length() / 10;
1503515041         
15042
+        if (!capsLocked)
15043
+        {
15044
+            scale = 50;
15045
+        }
15046
+
1503615047         MODIFIERS |= COMMAND;
1503715048         boolean isVR = (mouseMode&VR)!=0;
1503815049         /**/
....@@ -15074,6 +15085,11 @@
1507415085         LA.vecSub(manipCamera.location, manipCamera.lookAt, manipCamera.direction);
1507515086         float scale = (float)manipCamera.direction.length() / 10;
1507615087         
15088
+        if (!capsLocked)
15089
+        {
15090
+            scale = 50;
15091
+        }
15092
+
1507715093                 RigidBody.justclicked = true;
1507815094         
1507915095         MODIFIERS |= COMMAND;
....@@ -15118,6 +15134,11 @@
1511815134         LA.vecSub(manipCamera.location, manipCamera.lookAt, manipCamera.direction);
1511915135         float scale = (float)manipCamera.direction.length() / 10;
1512015136         
15137
+        if (!capsLocked)
15138
+        {
15139
+            scale = 50;
15140
+        }
15141
+
1512115142         MODIFIERS |= COMMAND;
1512215143         /**/
1512315144         if((mod&SHIFT) == SHIFT)
....@@ -15153,6 +15174,11 @@
1515315174         LA.vecSub(manipCamera.location, manipCamera.lookAt, manipCamera.direction);
1515415175         float scale = (float)manipCamera.direction.length() / 10;
1515515176         
15177
+        if (!capsLocked)
15178
+        {
15179
+            scale = 50;
15180
+        }
15181
+
1515615182         MODIFIERS |= COMMAND;
1515715183         /**/
1515815184         if((mod&SHIFT) == SHIFT)
....@@ -16151,10 +16177,37 @@
1615116177         switch (e.getID())
1615216178         {
1615316179             case KeyEvent.KEY_PRESSED:
16154
-                keys[e.getKeyCode()] = true;
16155
-                modifiers = e.getModifiersEx();
16156
-                keyPressed(e.getKeyChar(), modifiers);
16157
-                //Globals.theRenderer.keyPressed(e.getKeyChar());
16180
+                
16181
+                if (capsLocked)
16182
+                {
16183
+                    keys[e.getKeyCode()] = true;
16184
+                    modifiers = e.getModifiersEx();
16185
+                    keyPressed(e.getKeyChar(), modifiers);
16186
+                    //Globals.theRenderer.keyPressed(e.getKeyChar());
16187
+                }
16188
+                else
16189
+                {
16190
+                    switch (e.getKeyCode())
16191
+                    {
16192
+                        case DOWN_ARROW:
16193
+                            GoDown(e.getModifiersEx());
16194
+                            break;
16195
+                        case UP_ARROW:
16196
+                            GoUp(e.getModifiersEx());
16197
+                            break;
16198
+                        case LEFT_ARROW:
16199
+                            GoLeft(e.getModifiersEx());
16200
+                            break;
16201
+                        case RIGHT_ARROW:
16202
+                            GoRight(e.getModifiersEx());
16203
+                            break;
16204
+                        default:
16205
+                            modifiers = e.getModifiersEx();
16206
+                            keyPressed(e.getKeyChar(), modifiers);
16207
+                            break;
16208
+                    }
16209
+                }
16210
+                
1615816211                 repaint();
1615916212                 break;
1616016213 //                if (!autorepeat)


 GroupEditor.java
....@@ -878,6 +878,8 @@
878878 		flipVItem.addActionListener(this);
879879 		unflipVItem = menu.add(new MenuItem("Unflip V"));
880880 		unflipVItem.addActionListener(this);
881
+		minTexturesItem = menu.add(new MenuItem("Min Texture (128)"));
882
+		minTexturesItem.addActionListener(this);
881883 		lowTexturesItem = menu.add(new MenuItem("Low Texture (256)"));
882884 		lowTexturesItem.addActionListener(this);
883885 		normalTexturesItem = menu.add(new MenuItem("Normal Texture (512)"));
....@@ -3556,29 +3558,33 @@
35563558                 {
35573559 			FlipV(false);
35583560 		} else
3559
-		if (source == lowTexturesItem)
3561
+		if (source == minTexturesItem)
35603562                 {
35613563 			SetTexRes(0);
35623564 		} else
3563
-		if (source == normalTexturesItem)
3565
+		if (source == lowTexturesItem)
35643566                 {
35653567 			SetTexRes(1);
35663568 		} else
3567
-		if (source == highTexturesItem)
3569
+		if (source == normalTexturesItem)
35683570                 {
35693571 			SetTexRes(2);
35703572 		} else
3571
-		if (source == veryhighTexturesItem)
3573
+		if (source == highTexturesItem)
35723574                 {
35733575 			SetTexRes(3);
35743576 		} else
3575
-		if (source == maxTexturesItem)
3577
+		if (source == veryhighTexturesItem)
35763578                 {
35773579 			SetTexRes(4);
35783580 		} else
3579
-		if (source == panoTexturesItem)
3581
+		if (source == maxTexturesItem)
35803582                 {
35813583 			SetTexRes(5);
3584
+		} else
3585
+		if (source == panoTexturesItem)
3586
+                {
3587
+			SetTexRes(6);
35823588 		} else
35833589 		if (source == reverseNormalsItem)
35843590                 {
....@@ -6455,6 +6461,7 @@
64556461         
64566462 	private MenuItem flipVItem;
64576463 	private MenuItem unflipVItem;
6464
+	private MenuItem minTexturesItem;
64586465 	private MenuItem lowTexturesItem;
64596466 	private MenuItem normalTexturesItem;
64606467 	private MenuItem highTexturesItem;


 ObjEditor.java
....@@ -4509,6 +4509,11 @@
45094509         } else if (event.getSource() == link2masterCB)
45104510         {
45114511             copy.link2master ^= true;
4512
+            if (copy instanceof RandomNode)
4513
+            {
4514
+                // show all
4515
+                Globals.lighttouched = true;
4516
+            }
45124517             objEditor.refreshContents();
45134518             return;
45144519         }