blame | history | patch | commit | commitdiff
Normand Briere
2019-08-09 912749d2520afedd9b56458d771400c261fe2b88 
 CameraPane.java
....@@ -8358,7 +8358,7 @@
83588358 //            else
83598359 //                if (!texname.startsWith("/"))
83608360 //                    texname = "/Users/nbriere/Textures/" + texname;
8361
-            if (!FileExists(texname))
8361
+            if (!FileExists(texname) && !texname.startsWith("@"))
83628362             {
83638363                     texname = fallbackTextureName;
83648364             }
....@@ -8441,6 +8441,15 @@
84418441                                 new Exception().printStackTrace();
84428442                         } else
84438443                         {
8444
+                        if (texname.startsWith("@"))
8445
+                        {
8446
+                //            texturecache = textures.get(texname); // suspicious
8447
+                            if (texturecache == null)
8448
+                                texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
8449
+                            else
8450
+                                new Exception().printStackTrace();
8451
+                        } else
8452
+                        {
84448453                             if (textureon)
84458454                             {
84468455                                 String cachename = texname;
....@@ -8500,6 +8509,7 @@
85008509                                     texturecache = new CacheTexture(texturedata,resolution);
85018510         //texture = GetTexture(tex, bump);
85028511                             }
8512
+                        }
85038513                         }
85048514                     //}
85058515                 }
....@@ -10841,7 +10851,7 @@
1084110851 
1084210852         if (wait)
1084310853         {
10844
-            Sleep(500);
10854
+            Sleep(200); // blocks everything
1084510855 
1084610856             wait = false;
1084710857         }
....@@ -11379,7 +11389,7 @@
1137911389 
1138011390 //            if (cam != lightCamera)
1138111391             //for (int count = parentcam.GetTransformCount(); --count>=0;)
11382
-                LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
11392
+                LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
1138311393         }
1138411394         
1138511395         LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -14632,9 +14642,9 @@
1463214642         MODIFIERS |= COMMAND;
1463314643         /**/
1463414644         if((mod&SHIFT) == SHIFT)
14635
-        manipCamera.RotatePosition(0, -speed);
14636
-        else
1463714645         manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14646
+        else
14647
+        manipCamera.RotatePosition(0, -speed);
1463814648         /**/
1463914649         if ((mod & SHIFT) == SHIFT)
1464014650         {
....@@ -14653,9 +14663,9 @@
1465314663         MODIFIERS |= COMMAND;
1465414664         /**/
1465514665         if((mod&SHIFT) == SHIFT)
14656
-        manipCamera.RotatePosition(0, speed);
14657
-        else
1465814666         manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14667
+        else
14668
+        manipCamera.RotatePosition(0, speed);
1465914669         /**/
1466014670         if ((mod & SHIFT) == SHIFT)
1466114671         {