blame | history | patch | commit | commitdiff
Normand Briere
2019-08-22 6a145f6c81dfcbe0653eda27d042efb48daa7512 
 CameraPane.java
....@@ -168,7 +168,7 @@
168168 
169169     
170170     // OPTIONS
171
-    boolean Skinshader = true;
171
+    boolean Skinshader = false; // true;
172172     boolean cameraLight = false;
173173     boolean UVdebug = false;
174174     boolean Udebug = false;
....@@ -542,7 +542,8 @@
542542                 LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
543543                 LA.vecCross(obj.v0, obj.v1, obj.v2);
544544                 LA.vecNormalize(obj.v2);
545
-                gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
545
+                
546
+                SetGLNormal(gl, (float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
546547             }
547548 
548549             // P
....@@ -564,7 +565,7 @@
564565                 y += ny * obj.NORMALPUSH;
565566                 z += nz * obj.NORMALPUSH;
566567                 
567
-                gl.glNormal3f(nx, ny, nz);
568
+                SetGLNormal(gl, nx, ny, nz);
568569             }
569570             gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
570571             SetColor(obj, pv);
....@@ -596,7 +597,7 @@
596597                 y += ny * obj.NORMALPUSH;
597598                 z += nz * obj.NORMALPUSH;
598599                 
599
-                gl.glNormal3f(nx, ny, nz);
600
+                SetGLNormal(gl, nx, ny, nz);
600601             }
601602             //System.out.println("vertexq = " + qv.s + ", " + qv.t);
602603         //    boolean locked = false;
....@@ -644,7 +645,7 @@
644645                 y += ny * obj.NORMALPUSH;
645646                 z += nz * obj.NORMALPUSH;
646647                 
647
-                gl.glNormal3f(nx, ny, nz);
648
+                SetGLNormal(gl, nx, ny, nz);
648649             }
649650             
650651         //    if ((dot&4) == 0)
....@@ -1250,10 +1251,10 @@
12501251                             {
12511252                                 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
12521253                                 {
1253
-                                    gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1254
+                                    SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
12541255                                 } else
12551256                                 {
1256
-                                    gl.glNormal3f(0, 0, 1);
1257
+                                    SetGLNormal(gl, 0, 0, 1);
12571258                                 }
12581259 
12591260                                 if (c != null)
....@@ -1277,10 +1278,10 @@
12771278                             {
12781279                                 if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
12791280                                 {
1280
-                                    gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1281
+                                    SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
12811282                                 } else
12821283                                 {
1283
-                                    gl.glNormal3f(0, 0, 1);
1284
+                                    SetGLNormal(gl, 0, 0, 1);
12841285                                 }
12851286                                 if (c != null)
12861287                                 {
....@@ -1305,10 +1306,10 @@
13051306                                 {
13061307                                     if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
13071308                                     {
1308
-                                        gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
1309
+                                        SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
13091310                                     } else
13101311                                     {
1311
-                                        gl.glNormal3f(0, 0, 1);
1312
+                                        SetGLNormal(gl, 0, 0, 1);
13121313                                     }
13131314                                     if (c != null)
13141315                                     {
....@@ -1490,7 +1491,7 @@
14901491     {
14911492         if (!selectmode)
14921493         {
1493
-            gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
1494
+            SetGLNormal(gl, (float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
14941495             gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
14951496             
14961497             if (flipV)
....@@ -1819,7 +1820,7 @@
18191820 
18201821         display.modelParams7[0] = 0;
18211822         display.modelParams7[1] = 1000;
1822
-        display.modelParams7[2] = 0;
1823
+        display.modelParams7[2] = material.parallax;
18231824         display.modelParams7[3] = 0;
18241825 
18251826         //display.modelParams6[0] = 100; // criss de bug de bump
....@@ -2052,9 +2053,9 @@
20522053         switch(viewcode)
20532054         {
20542055             case 0: return "main";
2055
-            case 1: return "one";
2056
-            case 2: return "two";
2057
-            case 3: return "three";
2056
+            case 1: return "Red";
2057
+            case 2: return "Green";
2058
+            case 3: return "Blue";
20582059             case 4: return "light";
20592060         }
20602061         
....@@ -2473,6 +2474,18 @@
24732474         byte[] bytes = bytebuf.array();
24742475         
24752476         return CreateBim(bytes, width, height);
2477
+    }
2478
+
2479
+    private void SetGLNormal(javax.media.opengl.GL gl, float nx, float ny, float nz)
2480
+    {
2481
+        gl.glNormal3f(nx, ny, nz);
2482
+
2483
+        if (ny > 0.9 || ny < -0.9)
2484
+            // Ground or ceiling
2485
+            gl.glVertexAttrib3f(4, 1, 0, 0);
2486
+        else
2487
+            // Walls
2488
+            gl.glVertexAttrib3f(4, 0, 1, 0);
24762489     }
24772490 
24782491     /**/
....@@ -10690,9 +10703,18 @@
1069010703     static boolean init = false;
1069110704     
1069210705     double[][] matrix = LA.newMatrix();
10706
+    
10707
+    // This is to refresh the UI of the material panel.
10708
+    ObjEditor patchMaterial;
1069310709 
1069410710     public void display(GLAutoDrawable drawable)
1069510711     {
10712
+        if (patchMaterial.patchMaterial)
10713
+        {
10714
+            patchMaterial.patchMaterial = false;
10715
+            patchMaterial.objectPanel.setSelectedIndex(1);
10716
+        }
10717
+        
1069610718         if (Grafreed.savesound && Grafreed.hassound)
1069710719         {
1069810720             Grafreed.wav.save();
....@@ -11088,7 +11110,7 @@
1108811110         {
1108911111             if (cubemaprgb == null)
1109011112             {
11091
-                cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb" + "/", "jpg", false);
11113
+                cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
1109211114             }
1109311115             
1109411116             cubemap = cubemaprgb;
....@@ -12584,7 +12606,7 @@
1258412606                 "PARAM params4   = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
1258512607                 "PARAM params5   = program.env[5];" + // texture, opacity, fakedepth, shadowbias
1258612608                 "PARAM params6   = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12587
-                "PARAM params7   = program.env[7];" + // noise power, opacity power
12609
+                "PARAM params7   = program.env[7];" + // noise power, opacity power, parallax
1258812610                 "PARAM options0   = program.env[63];" + // fog density, intensity, elevation
1258912611                 "PARAM options1   = program.env[62];" + // fog rgb color
1259012612                 "PARAM options2   = program.env[61];" + // image intensity, subsurface, lightsheen
....@@ -12829,7 +12851,7 @@
1282912851        "POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
1283012852 // mar 2013 ???                "KIL alpha.a;" +
1283112853                 "MOV alpha, texSamp.aaaa;" + // y;" +
12832
-         "KIL alpha.a;" +
12854
+         "KIL alpha.a;" + // not sure with parallax mapping
1283312855                 /*
1283412856                 "MUL temp.xy, temp, two;" +
1283512857                 "TXB bump, temp, texture[0], 2D;" +
....@@ -12915,11 +12937,6 @@
1291512937                 "SUB bump0, bump0, half;" +
1291612938                 "ADD bump, bump, bump0;" +
1291712939                 
12918
-                "MOV temp.x, texSamp.a;" +
12919
-                "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12920
-                //"LRP texSamp0, params5.x, texSamp0, one;" +
12921
-                "MOV texSamp.a, temp.x;" +
12922
-
1292312940                 // double-sided
1292412941                 /**/
1292512942 (doublesided?"DP3 temp.z, normal, eye;" +
....@@ -12936,19 +12953,62 @@
1293612953                 "MOV normald, normal;" +
1293712954                 "MOV normals, normal;" +
1293812955                 
12956
+                "MOV temp, fragment.texcoord[4];" +
12957
+                
1293912958                 // UV base		
1294012959                 //"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
1294112960                 //"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
1294212961                 //"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12943
-                "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12944
-                "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12945
-                "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
12962
+                "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
12963
+                "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
12964
+                "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
12965
+                Normalize("UP") +
12966
+                
1294612967                 "XPD V, normal, UP;" +
1294712968                 Normalize("V") +
1294812969                 "XPD U, V, normal;" +
1294912970                 Normalize("U") +
1295012971                 
1295112972 // parallax mapping
12973
+
12974
+                "DP3 temp2.x, V, eye;" +
12975
+                "DP3 temp2.y, U, eye;" +
12976
+                "DP3 temp2.z, normal, eye;" +
12977
+                "RCP temp2.z, temp2.z;" +
12978
+                
12979
+                "DP3 temp2.w, texSamp, texSamp;" + // Height
12980
+                "RSQ temp2.w, temp2.w;" +
12981
+                "RCP temp2.w, temp2.w;" +
12982
+                
12983
+                "SUB temp2.w, temp2.w, half;" +
12984
+//                "SGE temp.x, temp2.w, eps.x;" +
12985
+//                "MUL temp2.w, temp2.w, temp.x;" +
12986
+                
12987
+                //"MOV texSamp, U;" +
12988
+                
12989
+                "MUL temp2.z, temp2.z, temp2.w;" +
12990
+                "MUL temp2.z, temp2.z, params7.z;" + // parallax
12991
+                
12992
+                "MUL temp2, temp2, temp2.z;" +
12993
+                
12994
+                "MOV temp, fragment.texcoord[0];" +
12995
+                
12996
+                "SUB temp, temp, temp2;" +
12997
+                
12998
+                "TEX temp, temp, texture[0], 2D;" +
12999
+                "POW temp.a, temp.a, params6.w;" + // punch through
13000
+                
13001
+                "ADD texSamp, temp, texSamp;" +
13002
+                "MUL texSamp.xyz, half, texSamp;" +
13003
+                
13004
+                "MOV alpha, texSamp.aaaa;" +
13005
+                
13006
+// parallax mapping
13007
+                
13008
+                "MOV temp.x, texSamp.a;" +
13009
+                "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
13010
+                //"LRP texSamp0, params5.x, texSamp0, one;" +
13011
+                "MOV texSamp.a, temp.x;" +
1295213012 
1295313013 //"MOV temp, fragment.texcoord[0];" +
1295413014 //                
....@@ -13419,8 +13479,12 @@
1341913479             program = programmin;
1342013480         }
1342113481         
13422
-        System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13423
-        System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13482
+        if (Globals.DEBUG)
13483
+        {
13484
+            System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13485
+            System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13486
+        }
13487
+        
1342413488         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1342513489 
1342613490     //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13467,7 +13531,8 @@
1346713531                 "\n" +
1346813532                 "END\n";
1346913533 
13470
-        System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13534
+        if (Globals.DEBUG)
13535
+            System.out.println("Program shadow #" + 0 + "; length = " + program.length());
1347113536         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1347213537 
1347313538     //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13725,7 +13790,7 @@
1372513790     /*static*/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
1372613791     /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1372713792     /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13728
-    /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13793
+    /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
1372913794     
1373013795     //Object3D.cVector2[] vector2buffer;
1373113796 
....@@ -13892,7 +13957,7 @@
1389213957                 "PARAM p[4]    = { state.matrix.projection };     # modelview projection matrix\n" +
1389313958                 "PARAM zero    = { 0.0, 0.0, 0.0, 1.0 };" +
1389413959                 "PARAM half    = { 0.5, 0.5, 0.5, 1.0 };" +
13895
-                "PARAM one     = { 1.0, 1.0, 1.0, 0.0 };" +
13960
+                "PARAM one     = { 1.0, 1.0, 1.0, 1.0 };" +
1389613961                 "PARAM two     = { 2.0, 2.0, 2.0, 1.0 };" +
1389713962                 "PARAM third   = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
1389813963                 //"PARAM v256    = { 256.0, 256.0, 256.0, 1.0 };" +
....@@ -13953,7 +14018,7 @@
1395314018                 "DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
1395414019                 "DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
1395514020                 "DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13956
-                //"MOV result.texcoord, vertex.texcoord;" +
14021
+                //"MOV result.texcoord, vertex.fogcoord;" +
1395714022                 "MOV result.texcoord, temp;" +
1395814023                 // border fade
1395914024                 "MOV result.texcoord[3], vertex.texcoord;" +
....@@ -14000,7 +14065,9 @@
1400014065 
1400114066                 //"ADD temp.z, temp.z, one;" +
1400214067 
14003
-                "MOV result.color, temp;"
14068
+                "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
14069
+                
14070
+                "MOV result.color, temp;" // Normal
1400414071                 : "MOV result.color, vertex.color;") +
1400514072                 ((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
1400614073                 : "") +
....@@ -14666,11 +14733,17 @@
1466614733     void GoDown(int mod)
1466714734     {
1466814735         MODIFIERS |= COMMAND;
14736
+        boolean isVR = (mouseMode&VR)!=0;
1466914737         /**/
1467014738         if((mod&SHIFT) == SHIFT)
14671
-        manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14739
+        {
14740
+            if (isVR)
14741
+                manipCamera.RotateInterest(0, -speed);
14742
+            else
14743
+                manipCamera.RotatePosition(0, -speed);
14744
+        }
1467214745         else
14673
-        manipCamera.RotatePosition(0, -speed);
14746
+            manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
1467414747         /**/
1467514748         if ((mod & SHIFT) == SHIFT)
1467614749         {
....@@ -14680,6 +14753,8 @@
1468014753             mouseMode |= BACKFORTH;
1468114754         }
1468214755 
14756
+        targetLookAt.set(manipCamera.lookAt);
14757
+        
1468314758         //prevX = X = anchorX;
1468414759         prevY = Y = anchorY - (int) (renderCamera.Distance());
1468514760     }
....@@ -14688,10 +14763,17 @@
1468814763     {
1468914764         MODIFIERS |= COMMAND;
1469014765         /**/
14766
+        boolean isVR = (mouseMode&VR)!=0;
14767
+        
1469114768         if((mod&SHIFT) == SHIFT)
14692
-        manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14769
+        {
14770
+            if (isVR)
14771
+                manipCamera.RotateInterest(0, speed);
14772
+            else
14773
+                manipCamera.RotatePosition(0, speed);
14774
+        }
1469314775         else
14694
-        manipCamera.RotatePosition(0, speed);
14776
+            manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
1469514777         /**/
1469614778         if ((mod & SHIFT) == SHIFT)
1469714779         {
....@@ -14701,6 +14783,8 @@
1470114783             mouseMode |= BACKFORTH;
1470214784         }
1470314785 
14786
+        targetLookAt.set(manipCamera.lookAt);
14787
+        
1470414788         //prevX = X = anchorX;
1470514789         prevY = Y = anchorY + (int) (renderCamera.Distance());
1470614790     }
....@@ -14710,9 +14794,14 @@
1471014794         MODIFIERS |= COMMAND;
1471114795         /**/
1471214796         if((mod&SHIFT) == SHIFT)
14713
-        manipCamera.Translate(speed*delta, 0, getWidth());
14797
+            manipCamera.Translate(speed*delta, 0, getWidth());
1471414798         else
14715
-        manipCamera.RotatePosition(speed, 0);
14799
+        {
14800
+            if ((mouseMode&VR)!=0)
14801
+                manipCamera.RotateInterest(-speed, 0);
14802
+            else
14803
+                manipCamera.RotatePosition(speed, 0);
14804
+        }
1471614805         /**/
1471714806         if ((mod & SHIFT) == SHIFT)
1471814807         {
....@@ -14722,6 +14811,8 @@
1472214811             mouseMode |= ROTATE;
1472314812         } // TRANSLATE;
1472414813 
14814
+        targetLookAt.set(manipCamera.lookAt);
14815
+        
1472514816         prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
1472614817         prevY = Y = anchorY;
1472714818     }
....@@ -14731,9 +14822,15 @@
1473114822         MODIFIERS |= COMMAND;
1473214823         /**/
1473314824         if((mod&SHIFT) == SHIFT)
14734
-        manipCamera.Translate(-speed*delta, 0, getWidth());
14825
+            manipCamera.Translate(-speed*delta, 0, getWidth());
1473514826         else
14736
-        manipCamera.RotatePosition(-speed, 0);
14827
+        {
14828
+            if ((mouseMode&VR)!=0)
14829
+                manipCamera.RotateInterest(speed, 0);
14830
+            else
14831
+                manipCamera.RotatePosition(-speed, 0);
14832
+        }
14833
+        
1473714834         /**/
1473814835         if ((mod & SHIFT) == SHIFT)
1473914836         {
....@@ -14743,6 +14840,8 @@
1474314840             mouseMode |= ROTATE;
1474414841         } // TRANSLATE;
1474514842 
14843
+        targetLookAt.set(manipCamera.lookAt);
14844
+        
1474614845         prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
1474714846         prevY = Y = anchorY;
1474814847     }
....@@ -15245,8 +15344,8 @@
1524515344             case 'K':
1524615345                 KOMPACTTEXTURE ^= true;
1524715346                 //textures.clear();
15248
-                break;
15249
-            case 'P': // Texture Projection macros
15347
+            //    break;
15348
+            //case 'P': // Texture Projection macros
1525015349 //                SAVETEXTURE ^= true;
1525115350                 macromode = true;
1525215351                 Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
....@@ -15367,7 +15466,7 @@
1536715466                 targetLookAt.set(manipCamera.lookAt);
1536815467                 repaint();
1536915468                 break;
15370
-            case 'p':
15469
+            case 'P': // p':
1537115470        // c'est quoi ca au juste?         spherical ^= true;
1537215471                 Skinshader ^= true; programInitialized = false; 
1537315472                 repaint();
....@@ -16127,7 +16226,7 @@
1612716226                     {
1612816227                         switch (hitSomething)
1612916228                         {
16130
-                            case Object3D.hitCenter: gr.setColor(Color.pink);
16229
+                            case Object3D.hitCenter: gr.setColor(Color.white);
1613116230                                 gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
1613216231                                 break;
1613316232                             case Object3D.hitRotate: gr.setColor(Color.yellow);
....@@ -16153,7 +16252,7 @@
1615316252         if (hasMarquee)
1615416253         {
1615516254             gr.setXORMode(Color.white);
16156
-            gr.setColor(Color.red);
16255
+            gr.setColor(Color.white);
1615716256             if (!firstime)
1615816257             {
1615916258                 gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
....@@ -16849,7 +16948,7 @@
1684916948             gl.glScalef(1.0f, -1.0f, 1.0f);
1685016949         }
1685116950 
16852
-        gl.glNormal3f(0.0f, 0.0f, 1.0f);
16951
+        SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
1685316952             
1685416953         float step = 2; // 0.1666f; //0.25f;
1685516954         float stepv = 2; // step * 1652 / 998;
....@@ -17329,6 +17428,7 @@
1732917428 
1733017429         public void init(GLAutoDrawable drawable)
1733117430         {
17431
+        if (Globals.DEBUG)
1733217432             System.out.println("shadow buffer init");
1733317433 
1733417434             GL gl = drawable.getGL();