Normand Briere
2019-08-20 564f4d12d93813b5d680fc24d4f118c3886d96ed
CameraPane.java
....@@ -1819,7 +1819,7 @@
18191819
18201820 display.modelParams7[0] = 0;
18211821 display.modelParams7[1] = 1000;
1822
- display.modelParams7[2] = 0;
1822
+ display.modelParams7[2] = material.parallax;
18231823 display.modelParams7[3] = 0;
18241824
18251825 //display.modelParams6[0] = 100; // criss de bug de bump
....@@ -12593,7 +12593,7 @@
1259312593 "PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
1259412594 "PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
1259512595 "PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12596
- "PARAM params7 = program.env[7];" + // noise power, opacity power
12596
+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
1259712597 "PARAM options0 = program.env[63];" + // fog density, intensity, elevation
1259812598 "PARAM options1 = program.env[62];" + // fog rgb color
1259912599 "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
....@@ -12838,7 +12838,7 @@
1283812838 "POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
1283912839 // mar 2013 ??? "KIL alpha.a;" +
1284012840 "MOV alpha, texSamp.aaaa;" + // y;" +
12841
- "KIL alpha.a;" +
12841
+ "KIL alpha.a;" + // not sure with parallax mapping
1284212842 /*
1284312843 "MUL temp.xy, temp, two;" +
1284412844 "TXB bump, temp, texture[0], 2D;" +
....@@ -12924,11 +12924,6 @@
1292412924 "SUB bump0, bump0, half;" +
1292512925 "ADD bump, bump, bump0;" +
1292612926
12927
- "MOV temp.x, texSamp.a;" +
12928
- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12929
- //"LRP texSamp0, params5.x, texSamp0, one;" +
12930
- "MOV texSamp.a, temp.x;" +
12931
-
1293212927 // double-sided
1293312928 /**/
1293412929 (doublesided?"DP3 temp.z, normal, eye;" +
....@@ -12958,6 +12953,41 @@
1295812953 Normalize("U") +
1295912954
1296012955 // 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;" +
1296112991
1296212992 //"MOV temp, fragment.texcoord[0];" +
1296312993 //
....@@ -13739,7 +13769,7 @@
1373913769 /*static*/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
1374013770 /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1374113771 /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13742
- /*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
1374313773
1374413774 //Object3D.cVector2[] vector2buffer;
1374513775