blame | history | patch | commit | commitdiff
Normand Briere
2019-08-15 24a2a946b35279605e645349bd6b82e9e60aac88 
 CameraPane.java
....@@ -110,7 +110,11 @@
110110     //private Mat4f spotlightTransform = new Mat4f();
111111     //private Mat4f spotlightInverseTransform = new Mat4f();
112112     static GLContext glcontext = null;
113
-    /*static*/ com.sun.opengl.util.texture.Texture cubemap;
113
+    /*static*/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
114
+    /*static*/ com.sun.opengl.util.texture.Texture cubemapcustom;
115
+    /*static*/ com.sun.opengl.util.texture.Texture cubemaprgb;
116
+    boolean transformMode;
117
+    
114118     boolean reverseUP = false;
115119     static boolean frozen = false;
116120     boolean enablebackspace = false; // patch for back buffer refresh
....@@ -173,7 +177,7 @@
173177     static boolean doublesided = false; // true; // reversed normals are awful for conformance
174178     boolean anisotropy = true;
175179     boolean softshadow = true; // slower but better false;
176
-    boolean opacityhalo = false;
180
+    boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
177181     
178182     boolean macromode = false;
179183     
....@@ -188,15 +192,16 @@
188192     
189193     private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
190194 
191
-    public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
195
+    public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
192196     {
193197         try
194198         {
195
-            cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
199
+            return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
196200         } catch (IOException e)
197201         {
198202             System.out.println("NAME = " + name);
199203             e.printStackTrace(); // throw new RuntimeException(e);
204
+            return null;
200205         }
201206     }
202207     
....@@ -2512,7 +2517,7 @@
25122517                     com.sun.opengl.util.texture.TextureIO.newTextureData(
25132518                     getClass().getClassLoader().getResourceAsStream(name),
25142519                     true,
2515
-                    com.sun.opengl.util.texture.TextureIO.PNG);
2520
+                    GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
25162521         } catch (java.io.IOException e)
25172522         {
25182523             throw new javax.media.opengl.GLException(e);
....@@ -8358,7 +8363,7 @@
83588363 //            else
83598364 //                if (!texname.startsWith("/"))
83608365 //                    texname = "/Users/nbriere/Textures/" + texname;
8361
-            if (!FileExists(texname))
8366
+            if (!FileExists(texname) && !texname.startsWith("@"))
83628367             {
83638368                     texname = fallbackTextureName;
83648369             }
....@@ -8441,6 +8446,15 @@
84418446                                 new Exception().printStackTrace();
84428447                         } else
84438448                         {
8449
+                        if (texname.startsWith("@"))
8450
+                        {
8451
+                //            texturecache = textures.get(texname); // suspicious
8452
+                            if (texturecache == null)
8453
+                                texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
8454
+                            else
8455
+                                new Exception().printStackTrace();
8456
+                        } else
8457
+                        {
84448458                             if (textureon)
84458459                             {
84468460                                 String cachename = texname;
....@@ -8500,6 +8514,7 @@
85008514                                     texturecache = new CacheTexture(texturedata,resolution);
85018515         //texture = GetTexture(tex, bump);
85028516                             }
8517
+                        }
85038518                         }
85048519                     //}
85058520                 }
....@@ -8768,10 +8783,12 @@
87688783 
87698784         gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
87708785         MAXSTACK = temp[0];
8771
-        System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8786
+        if (Globals.DEBUG)
8787
+            System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
87728788         gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
87738789         MAXSTACK = temp[0];
8774
-        System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8790
+        if (Globals.DEBUG)
8791
+            System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
87758792 
87768793         // Use debug pipeline
87778794         //drawable.setGL(new DebugGL(gl)); //
....@@ -8779,7 +8796,8 @@
87798796         gl = drawable.getGL(); //
87808797 
87818798         GL gl3 = getGL();
8782
-        System.out.println("INIT GL IS: " + gl.getClass().getName());
8799
+        if (Globals.DEBUG)
8800
+            System.out.println("INIT GL IS: " + gl.getClass().getName());
87838801 
87848802 
87858803         //float pos[] = { 100, 100, 100, 0 };
....@@ -9220,6 +9238,8 @@
92209238 
92219239     void LoadEnvy(int which)
92229240     {
9241
+        assert(false);
9242
+        
92239243         String name;
92249244         String ext;
92259245 
....@@ -9316,10 +9336,9 @@
93169336     double[] light2camera = new double[16];
93179337     
93189338     //int newenvy = -1;
9319
-    boolean envyoff = true; // false;
9320
-    String skyboxname = "";
9321
-    String skyboxext;
9322
-    String loadedskyboxname = "";
9339
+    //boolean envyoff = false;
9340
+    
9341
+    String loadedskyboxname;
93239342     
93249343     cVector light0 = new cVector(0, 0, 0); // 1,3,2);
93259344     //float[] light0 = { 0,0,0 };
....@@ -10842,7 +10861,7 @@
1084210861 
1084310862         if (wait)
1084410863         {
10845
-            Sleep(500);
10864
+            Sleep(200); // blocks everything
1084610865 
1084710866             wait = false;
1084810867         }
....@@ -11065,10 +11084,34 @@
1106511084 //
1106611085 //        newenvy = -1;
1106711086         
11068
-        if (!skyboxname.equals(this.loadedskyboxname))
11087
+        if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
1106911088         {
11070
-            LoadSkybox(skyboxname + "/", skyboxext, false);
11071
-            loadedskyboxname = skyboxname;
11089
+            if (cubemaprgb == null)
11090
+            {
11091
+                cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb" + "/", "jpg", false);
11092
+            }
11093
+            
11094
+            cubemap = cubemaprgb;
11095
+        }
11096
+        else
11097
+        {
11098
+            if (object.skyboxname != null)
11099
+            {
11100
+                if (!object.skyboxname.equals(this.loadedskyboxname))
11101
+                {
11102
+                    if (cubemap != null && cubemap != cubemaprgb)
11103
+                        cubemap.dispose();
11104
+                    cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11105
+                    loadedskyboxname = object.skyboxname;
11106
+                }
11107
+            }
11108
+            else
11109
+            {
11110
+                cubemapcustom = null;
11111
+                loadedskyboxname = null;
11112
+            }
11113
+            
11114
+            cubemap = cubemapcustom;
1107211115         }
1107311116         
1107411117         ratio = ((double) getWidth()) / getHeight();
....@@ -11372,7 +11415,7 @@
1137211415 
1137311416 //            if (cam != lightCamera)
1137411417             //for (int count = parentcam.GetTransformCount(); --count>=0;)
11375
-                LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
11418
+                LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
1137611419         }
1137711420         
1137811421         LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -12446,7 +12489,7 @@
1244612489 
1244712490         //gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
1244812491 
12449
-        String program0 =
12492
+        String programmin =
1245012493                 // Min shader
1245112494                 "!!ARBfp1.0\n" +
1245212495                 "PARAM zero123      = { 0.0, 1.0, 2, 1.25 };" +
....@@ -12513,7 +12556,7 @@
1251312556                 "MOV result.color, temp;" +
1251412557                 "END";
1251512558         
12516
-        String program =
12559
+        String programmax =
1251712560                 "!!ARBfp1.0\n" +
1251812561                 
1251912562                 //"OPTION ARB_fragment_program_shadow;" +
....@@ -13038,7 +13081,7 @@
1303813081            // display shadow only (fakedepth == 0)
1303913082          "SUB temp.x, half.x, shadow.x;" +
1304013083          "MOV temp.y, -params5.z;" + // params6.x;" +
13041
-         "SLT temp.z, temp.y, -one2048th.x;" +
13084
+         "SLT temp.z, temp.y, -c256i.x;" +
1304213085          "SUB temp.y, one.x, temp.z;" +
1304313086          "MUL temp.x, temp.x, temp.y;" +
1304413087          "KIL temp.x;" +
....@@ -13369,6 +13412,13 @@
1336913412             //once = true;
1337013413         }
1337113414 
13415
+        String program = programmax;
13416
+        
13417
+        if (Globals.MINSHADER)
13418
+        {
13419
+            program = programmin;
13420
+        }
13421
+        
1337213422         System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
1337313423         System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
1337413424         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
....@@ -14618,9 +14668,9 @@
1461814668         MODIFIERS |= COMMAND;
1461914669         /**/
1462014670         if((mod&SHIFT) == SHIFT)
14621
-        manipCamera.RotatePosition(0, -speed);
14622
-        else
1462314671         manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14672
+        else
14673
+        manipCamera.RotatePosition(0, -speed);
1462414674         /**/
1462514675         if ((mod & SHIFT) == SHIFT)
1462614676         {
....@@ -14639,9 +14689,9 @@
1463914689         MODIFIERS |= COMMAND;
1464014690         /**/
1464114691         if((mod&SHIFT) == SHIFT)
14642
-        manipCamera.RotatePosition(0, speed);
14643
-        else
1464414692         manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14693
+        else
14694
+        manipCamera.RotatePosition(0, speed);
1464514695         /**/
1464614696         if ((mod & SHIFT) == SHIFT)
1464714697         {
....@@ -15362,7 +15412,7 @@
1536215412                 OCCLUSION_CULLING ^= true;
1536315413                 System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
1536415414                 break;
15365
-            case '0': envyoff ^= true; repaint(); break;
15415
+            //case '0': envyoff ^= true; repaint(); break;
1536615416             case '1':
1536715417             case '2':
1536815418             case '3':
....@@ -15372,7 +15422,7 @@
1537215422             case '7':
1537315423             case '8':
1537415424             case '9':
15375
-                if (envyoff)
15425
+                if (true) // envyoff)
1537615426                 {
1537715427                     BGcolor = (key - '1')/8.f;
1537815428                 }
....@@ -16084,7 +16134,7 @@
1608416134                                 gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
1608516135                             break;
1608616136                             case Object3D.hitScale: gr.setColor(Color.cyan);
16087
-                                gr.drawLine(X, Y, 0, 0);
16137
+                                gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
1608816138                             break;
1608916139                         }
1609016140 
....@@ -16570,6 +16620,8 @@
1657016620     private /*static*/ boolean firstime;
1657116621     private /*static*/ cVector newView = new cVector();
1657216622     private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
16623
+    private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
16624
+    private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
1657316625     private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
1657416626                                              GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
1657516627                                              GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
....@@ -16582,22 +16634,56 @@
1658216634     {
1658316635         com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
1658416636 
16637
+        int usedsuf = 0;
16638
+        
1658516639         for (int i = 0; i < suffixes.length; i++)
1658616640         {
16587
-            String resourceName = basename + suffixes[i] + "." + suffix;
16588
-            TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16589
-                    mipmapped,
16590
-                    FileUtil.getFileSuffix(resourceName));
16591
-            if (data == null)
16641
+            String[] suffixe = suffixes;
16642
+            String[] fallback = suffixes2;
16643
+            String[] fallfallback = suffixes3;
16644
+            
16645
+            for (int c=usedsuf; --c>=0;)
1659216646             {
16593
-                throw new IOException("Unable to load texture " + resourceName);
16647
+//                String[] temp = suffixe;
16648
+//                suffixe = fallback;
16649
+//                fallback = fallfallback;
16650
+//                fallfallback = temp;
1659416651             }
16652
+            
16653
+            String resourceName = basename + suffixe[i] + "." + suffix;
16654
+            TextureData data;
16655
+            
16656
+            try
16657
+            {
16658
+                data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16659
+                        mipmapped,
16660
+                        FileUtil.getFileSuffix(resourceName));
16661
+            }
16662
+            catch (Exception e)
16663
+            {
16664
+                try
16665
+                {
16666
+                    resourceName = basename + fallback[i] + "." + suffix;
16667
+                    data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16668
+                            mipmapped,
16669
+                            FileUtil.getFileSuffix(resourceName));
16670
+                }
16671
+                catch (Exception e2)
16672
+                {
16673
+                    resourceName = basename + fallfallback[i] + "." + suffix;
16674
+                    data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16675
+                            mipmapped,
16676
+                            FileUtil.getFileSuffix(resourceName));
16677
+                }
16678
+            }
16679
+            
1659516680             //System.out.println("Target = " + targets[i]);
1659616681             cubemap.updateImage(data, targets[i]);
1659716682         }
1659816683 
1659916684         return cubemap;
1660016685     }
16686
+    
1660116687     int bigsphere = -1;
1660216688 
1660316689     float BGcolor = 0.5f;
....@@ -16606,7 +16692,9 @@
1660616692     
1660716693     private void DrawSkyBox(GL gl, float ratio)
1660816694     {
16609
-        if (envyoff || cubemap == null)
16695
+        if (//envyoff ||
16696
+            WIREFRAME ||
16697
+                cubemap == null)
1661016698         {
1661116699             gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
1661216700             gl.glClear(gl.GL_COLOR_BUFFER_BIT);
....@@ -16623,14 +16711,14 @@
1662316711         gl.glLoadIdentity();
1662416712         gl.glScalef(1,ratio,1);
1662516713 
16626
-        colorV[0] = 2;
16627
-        colorV[1] = 2;
16628
-        colorV[2] = 2;
16629
-        colorV[3] = 1;
16630
-        gl.glDisable(gl.GL_COLOR_MATERIAL);
16631
-        gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
16632
-        
16633
-        gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
16714
+//        colorV[0] = 2;
16715
+//        colorV[1] = 2;
16716
+//        colorV[2] = 2;
16717
+//        colorV[3] = 1;
16718
+//        gl.glDisable(gl.GL_COLOR_MATERIAL);
16719
+//        gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
16720
+//        
16721
+//        gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
1663416722         
1663516723         //gl.glActiveTexture(GL.GL_TEXTURE1);
1663616724         //gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
....@@ -16644,7 +16732,7 @@
1664416732         // GL_NORMAL_MAP texgen mode. Temporarily enabling lighting
1664516733         // causes the normals to be sent down. Thanks to Ken Dyke.
1664616734         //gl.glEnable(GL.GL_LIGHTING);
16647
-        gl.glEnable(GL.GL_LIGHTING);
16735
+        gl.glDisable(GL.GL_LIGHTING);
1664816736 
1664916737         gl.glTexGeni(GL.GL_S, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
1665016738         gl.glTexGeni(GL.GL_T, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
....@@ -16663,6 +16751,7 @@
1666316751         {
1666416752             gl.glScalef(1.0f, -1.0f, 1.0f);
1666516753         }
16754
+        gl.glScalef(-1.0f, 1.0f, 1.0f);
1666616755         gl.glMultMatrixd(viewrot_1, 0);
1666716756         gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance());  // 0.5f);
1666816757         //viewer.updateInverseRotation(gl);
....@@ -16703,7 +16792,8 @@
1670316792         gl.glDisable(GL.GL_TEXTURE_GEN_R);
1670416793 
1670516794         cubemap.disable();
16706
-        ////cubemap.unbind();
16795
+        //cubemap.dispose();
16796
+        
1670716797         if (CULLFACE)
1670816798         {
1670916799             gl.glEnable(gl.GL_CULL_FACE);
....@@ -17467,10 +17557,14 @@
1746717557             gl.glFlush();
1746817558             
1746917559             /**/
17470
-            gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
17560
+            gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
1747117561 
17472
-            float[] pixels = occlusionsizebuffer.array();
17562
+            float[] depths = occlusiondepthbuffer.array();
1747317563 
17564
+            gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
17565
+
17566
+            int[] pixels = selectsizebuffer.array();
17567
+            
1747417568             double r = 0, g = 0, b = 0;
1747517569 
1747617570             double count = 0;
....@@ -17481,7 +17575,7 @@
1748117575             
1748217576             double FACTOR = 1;
1748317577 
17484
-            for (int i = 0; i < pixels.length; i++)
17578
+            for (int i = 0; i < depths.length; i++)
1748517579             {
1748617580                 int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
1748717581                 int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
....@@ -17564,7 +17658,7 @@
1756417658 
1756517659                 double scale = ray.z; // 1; // cos
1756617660 
17567
-                float depth = pixels[newindex];
17661
+                float depth = depths[newindex];
1756817662 
1756917663                 /*
1757017664                 int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
....@@ -17761,11 +17855,14 @@
1776117855     static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
1776217856     static IntBuffer bigAAbuffer;
1776317857     static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17764
-    static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17858
+    //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
1776517859     static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1776617860     static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1776717861     //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17768
-    static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17862
+    static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17863
+    
17864
+    static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17865
+    
1776917866     static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
1777017867     static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
1777117868     static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();