Normand Briere
2019-08-20 564f4d12d93813b5d680fc24d4f118c3886d96ed
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
....@@ -164,7 +168,7 @@
164168
165169
166170 // OPTIONS
167
- boolean Skinshader = true;
171
+ boolean Skinshader = false; // true;
168172 boolean cameraLight = false;
169173 boolean UVdebug = false;
170174 boolean Udebug = false;
....@@ -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
....@@ -1814,7 +1819,7 @@
18141819
18151820 display.modelParams7[0] = 0;
18161821 display.modelParams7[1] = 1000;
1817
- display.modelParams7[2] = 0;
1822
+ display.modelParams7[2] = material.parallax;
18181823 display.modelParams7[3] = 0;
18191824
18201825 //display.modelParams6[0] = 100; // criss de bug de bump
....@@ -2047,9 +2052,9 @@
20472052 switch(viewcode)
20482053 {
20492054 case 0: return "main";
2050
- case 1: return "one";
2051
- case 2: return "two";
2052
- case 3: return "three";
2055
+ case 1: return "Red";
2056
+ case 2: return "Green";
2057
+ case 3: return "Blue";
20532058 case 4: return "light";
20542059 }
20552060
....@@ -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);
....@@ -8778,10 +8783,12 @@
87788783
87798784 gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
87808785 MAXSTACK = temp[0];
8781
- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8786
+ if (Globals.DEBUG)
8787
+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
87828788 gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
87838789 MAXSTACK = temp[0];
8784
- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8790
+ if (Globals.DEBUG)
8791
+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
87858792
87868793 // Use debug pipeline
87878794 //drawable.setGL(new DebugGL(gl)); //
....@@ -8789,7 +8796,8 @@
87898796 gl = drawable.getGL(); //
87908797
87918798 GL gl3 = getGL();
8792
- System.out.println("INIT GL IS: " + gl.getClass().getName());
8799
+ if (Globals.DEBUG)
8800
+ System.out.println("INIT GL IS: " + gl.getClass().getName());
87938801
87948802
87958803 //float pos[] = { 100, 100, 100, 0 };
....@@ -9230,6 +9238,8 @@
92309238
92319239 void LoadEnvy(int which)
92329240 {
9241
+ assert(false);
9242
+
92339243 String name;
92349244 String ext;
92359245
....@@ -10680,9 +10690,18 @@
1068010690 static boolean init = false;
1068110691
1068210692 double[][] matrix = LA.newMatrix();
10693
+
10694
+ // This is to refresh the UI of the material panel.
10695
+ ObjEditor patchMaterial;
1068310696
1068410697 public void display(GLAutoDrawable drawable)
1068510698 {
10699
+ if (patchMaterial.patchMaterial)
10700
+ {
10701
+ patchMaterial.patchMaterial = false;
10702
+ patchMaterial.objectPanel.setSelectedIndex(1);
10703
+ }
10704
+
1068610705 if (Grafreed.savesound && Grafreed.hassound)
1068710706 {
1068810707 Grafreed.wav.save();
....@@ -11074,18 +11093,34 @@
1107411093 //
1107511094 // newenvy = -1;
1107611095
11077
- if (object.skyboxname != null)
11096
+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
1107811097 {
11079
- if (!object.skyboxname.equals(this.loadedskyboxname))
11098
+ if (cubemaprgb == null)
1108011099 {
11081
- LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11082
- loadedskyboxname = object.skyboxname;
11100
+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
1108311101 }
11102
+
11103
+ cubemap = cubemaprgb;
1108411104 }
1108511105 else
1108611106 {
11087
- cubemap = null;
11088
- loadedskyboxname = null;
11107
+ if (object.skyboxname != null)
11108
+ {
11109
+ if (!object.skyboxname.equals(this.loadedskyboxname))
11110
+ {
11111
+ if (cubemap != null && cubemap != cubemaprgb)
11112
+ cubemap.dispose();
11113
+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11114
+ loadedskyboxname = object.skyboxname;
11115
+ }
11116
+ }
11117
+ else
11118
+ {
11119
+ cubemapcustom = null;
11120
+ loadedskyboxname = null;
11121
+ }
11122
+
11123
+ cubemap = cubemapcustom;
1108911124 }
1109011125
1109111126 ratio = ((double) getWidth()) / getHeight();
....@@ -12558,7 +12593,7 @@
1255812593 "PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
1255912594 "PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
1256012595 "PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12561
- "PARAM params7 = program.env[7];" + // noise power, opacity power
12596
+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
1256212597 "PARAM options0 = program.env[63];" + // fog density, intensity, elevation
1256312598 "PARAM options1 = program.env[62];" + // fog rgb color
1256412599 "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
....@@ -12803,7 +12838,7 @@
1280312838 "POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
1280412839 // mar 2013 ??? "KIL alpha.a;" +
1280512840 "MOV alpha, texSamp.aaaa;" + // y;" +
12806
- "KIL alpha.a;" +
12841
+ "KIL alpha.a;" + // not sure with parallax mapping
1280712842 /*
1280812843 "MUL temp.xy, temp, two;" +
1280912844 "TXB bump, temp, texture[0], 2D;" +
....@@ -12889,11 +12924,6 @@
1288912924 "SUB bump0, bump0, half;" +
1289012925 "ADD bump, bump, bump0;" +
1289112926
12892
- "MOV temp.x, texSamp.a;" +
12893
- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12894
- //"LRP texSamp0, params5.x, texSamp0, one;" +
12895
- "MOV texSamp.a, temp.x;" +
12896
-
1289712927 // double-sided
1289812928 /**/
1289912929 (doublesided?"DP3 temp.z, normal, eye;" +
....@@ -12923,6 +12953,41 @@
1292312953 Normalize("U") +
1292412954
1292512955 // parallax mapping
12956
+
12957
+ "DP3 temp2.x, V, eye;" +
12958
+ "DP3 temp2.y, U, eye;" +
12959
+ "DP3 temp2.z, normal, eye;" +
12960
+ "RCP temp2.z, temp2.z;" +
12961
+
12962
+ "DP3 temp2.w, texSamp, texSamp;" + // Height
12963
+ "RSQ temp2.w, temp2.w;" +
12964
+ "RCP temp2.w, temp2.w;" +
12965
+
12966
+ "SUB temp2.w, temp2.w, half;" +
12967
+// "SGE temp.x, temp2.w, eps.x;" +
12968
+// "MUL temp2.w, temp2.w, temp.x;" +
12969
+
12970
+ //"MOV texSamp, U;" +
12971
+
12972
+ "MUL temp2.z, temp2.z, temp2.w;" +
12973
+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
12974
+
12975
+ "MUL temp2, temp2, temp2.z;" +
12976
+
12977
+ "MOV temp, fragment.texcoord[0];" +
12978
+
12979
+ "SUB temp, temp, temp2;" +
12980
+
12981
+ "TEX texSamp, temp, texture[0], 2D;" +
12982
+ "POW texSamp.a, texSamp.a, params6.w;" + // punch through
12983
+ "MOV alpha, texSamp.aaaa;" +
12984
+
12985
+// parallax mapping
12986
+
12987
+ "MOV temp.x, texSamp.a;" +
12988
+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12989
+ //"LRP texSamp0, params5.x, texSamp0, one;" +
12990
+ "MOV texSamp.a, temp.x;" +
1292612991
1292712992 //"MOV temp, fragment.texcoord[0];" +
1292812993 //
....@@ -13393,8 +13458,12 @@
1339313458 program = programmin;
1339413459 }
1339513460
13396
- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13397
- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13461
+ if (Globals.DEBUG)
13462
+ {
13463
+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13464
+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13465
+ }
13466
+
1339813467 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1339913468
1340013469 //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13441,7 +13510,8 @@
1344113510 "\n" +
1344213511 "END\n";
1344313512
13444
- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13513
+ if (Globals.DEBUG)
13514
+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
1344513515 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1344613516
1344713517 //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13699,7 +13769,7 @@
1369913769 /*static*/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
1370013770 /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1370113771 /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13702
- /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13772
+ /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
1370313773
1370413774 //Object3D.cVector2[] vector2buffer;
1370513775
....@@ -14640,11 +14710,17 @@
1464014710 void GoDown(int mod)
1464114711 {
1464214712 MODIFIERS |= COMMAND;
14713
+ boolean isVR = (mouseMode&VR)!=0;
1464314714 /**/
1464414715 if((mod&SHIFT) == SHIFT)
14645
- manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14716
+ {
14717
+ if (isVR)
14718
+ manipCamera.RotateInterest(0, -speed);
14719
+ else
14720
+ manipCamera.RotatePosition(0, -speed);
14721
+ }
1464614722 else
14647
- manipCamera.RotatePosition(0, -speed);
14723
+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
1464814724 /**/
1464914725 if ((mod & SHIFT) == SHIFT)
1465014726 {
....@@ -14654,6 +14730,8 @@
1465414730 mouseMode |= BACKFORTH;
1465514731 }
1465614732
14733
+ targetLookAt.set(manipCamera.lookAt);
14734
+
1465714735 //prevX = X = anchorX;
1465814736 prevY = Y = anchorY - (int) (renderCamera.Distance());
1465914737 }
....@@ -14662,10 +14740,17 @@
1466214740 {
1466314741 MODIFIERS |= COMMAND;
1466414742 /**/
14743
+ boolean isVR = (mouseMode&VR)!=0;
14744
+
1466514745 if((mod&SHIFT) == SHIFT)
14666
- manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14746
+ {
14747
+ if (isVR)
14748
+ manipCamera.RotateInterest(0, speed);
14749
+ else
14750
+ manipCamera.RotatePosition(0, speed);
14751
+ }
1466714752 else
14668
- manipCamera.RotatePosition(0, speed);
14753
+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
1466914754 /**/
1467014755 if ((mod & SHIFT) == SHIFT)
1467114756 {
....@@ -14675,6 +14760,8 @@
1467514760 mouseMode |= BACKFORTH;
1467614761 }
1467714762
14763
+ targetLookAt.set(manipCamera.lookAt);
14764
+
1467814765 //prevX = X = anchorX;
1467914766 prevY = Y = anchorY + (int) (renderCamera.Distance());
1468014767 }
....@@ -14684,9 +14771,14 @@
1468414771 MODIFIERS |= COMMAND;
1468514772 /**/
1468614773 if((mod&SHIFT) == SHIFT)
14687
- manipCamera.Translate(speed*delta, 0, getWidth());
14774
+ manipCamera.Translate(speed*delta, 0, getWidth());
1468814775 else
14689
- manipCamera.RotatePosition(speed, 0);
14776
+ {
14777
+ if ((mouseMode&VR)!=0)
14778
+ manipCamera.RotateInterest(-speed, 0);
14779
+ else
14780
+ manipCamera.RotatePosition(speed, 0);
14781
+ }
1469014782 /**/
1469114783 if ((mod & SHIFT) == SHIFT)
1469214784 {
....@@ -14696,6 +14788,8 @@
1469614788 mouseMode |= ROTATE;
1469714789 } // TRANSLATE;
1469814790
14791
+ targetLookAt.set(manipCamera.lookAt);
14792
+
1469914793 prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
1470014794 prevY = Y = anchorY;
1470114795 }
....@@ -14705,9 +14799,15 @@
1470514799 MODIFIERS |= COMMAND;
1470614800 /**/
1470714801 if((mod&SHIFT) == SHIFT)
14708
- manipCamera.Translate(-speed*delta, 0, getWidth());
14802
+ manipCamera.Translate(-speed*delta, 0, getWidth());
1470914803 else
14710
- manipCamera.RotatePosition(-speed, 0);
14804
+ {
14805
+ if ((mouseMode&VR)!=0)
14806
+ manipCamera.RotateInterest(speed, 0);
14807
+ else
14808
+ manipCamera.RotatePosition(-speed, 0);
14809
+ }
14810
+
1471114811 /**/
1471214812 if ((mod & SHIFT) == SHIFT)
1471314813 {
....@@ -14717,6 +14817,8 @@
1471714817 mouseMode |= ROTATE;
1471814818 } // TRANSLATE;
1471914819
14820
+ targetLookAt.set(manipCamera.lookAt);
14821
+
1472014822 prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
1472114823 prevY = Y = anchorY;
1472214824 }
....@@ -15219,8 +15321,8 @@
1521915321 case 'K':
1522015322 KOMPACTTEXTURE ^= true;
1522115323 //textures.clear();
15222
- break;
15223
- case 'P': // Texture Projection macros
15324
+ // break;
15325
+ //case 'P': // Texture Projection macros
1522415326 // SAVETEXTURE ^= true;
1522515327 macromode = true;
1522615328 Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
....@@ -15341,7 +15443,7 @@
1534115443 targetLookAt.set(manipCamera.lookAt);
1534215444 repaint();
1534315445 break;
15344
- case 'p':
15446
+ case 'P': // p':
1534515447 // c'est quoi ca au juste? spherical ^= true;
1534615448 Skinshader ^= true; programInitialized = false;
1534715449 repaint();
....@@ -16101,7 +16203,7 @@
1610116203 {
1610216204 switch (hitSomething)
1610316205 {
16104
- case Object3D.hitCenter: gr.setColor(Color.pink);
16206
+ case Object3D.hitCenter: gr.setColor(Color.white);
1610516207 gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
1610616208 break;
1610716209 case Object3D.hitRotate: gr.setColor(Color.yellow);
....@@ -16127,7 +16229,7 @@
1612716229 if (hasMarquee)
1612816230 {
1612916231 gr.setXORMode(Color.white);
16130
- gr.setColor(Color.red);
16232
+ gr.setColor(Color.white);
1613116233 if (!firstime)
1613216234 {
1613316235 gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
....@@ -16667,6 +16769,7 @@
1666716769 private void DrawSkyBox(GL gl, float ratio)
1666816770 {
1666916771 if (//envyoff ||
16772
+ WIREFRAME ||
1667016773 cubemap == null)
1667116774 {
1667216775 gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
....@@ -16765,7 +16868,8 @@
1676516868 gl.glDisable(GL.GL_TEXTURE_GEN_R);
1676616869
1676716870 cubemap.disable();
16768
- ////cubemap.unbind();
16871
+ //cubemap.dispose();
16872
+
1676916873 if (CULLFACE)
1677016874 {
1677116875 gl.glEnable(gl.GL_CULL_FACE);
....@@ -17301,6 +17405,7 @@
1730117405
1730217406 public void init(GLAutoDrawable drawable)
1730317407 {
17408
+ if (Globals.DEBUG)
1730417409 System.out.println("shadow buffer init");
1730517410
1730617411 GL gl = drawable.getGL();
....@@ -17529,10 +17634,14 @@
1752917634 gl.glFlush();
1753017635
1753117636 /**/
17532
- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
17637
+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
1753317638
17534
- float[] pixels = occlusionsizebuffer.array();
17639
+ float[] depths = occlusiondepthbuffer.array();
1753517640
17641
+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
17642
+
17643
+ int[] pixels = selectsizebuffer.array();
17644
+
1753617645 double r = 0, g = 0, b = 0;
1753717646
1753817647 double count = 0;
....@@ -17543,7 +17652,7 @@
1754317652
1754417653 double FACTOR = 1;
1754517654
17546
- for (int i = 0; i < pixels.length; i++)
17655
+ for (int i = 0; i < depths.length; i++)
1754717656 {
1754817657 int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
1754917658 int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
....@@ -17626,7 +17735,7 @@
1762617735
1762717736 double scale = ray.z; // 1; // cos
1762817737
17629
- float depth = pixels[newindex];
17738
+ float depth = depths[newindex];
1763017739
1763117740 /*
1763217741 int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
....@@ -17823,11 +17932,14 @@
1782317932 static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
1782417933 static IntBuffer bigAAbuffer;
1782517934 static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17826
- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17935
+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
1782717936 static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1782817937 static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1782917938 //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17830
- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17939
+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17940
+
17941
+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17942
+
1783117943 static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
1783217944 static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
1783317945 static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();