.. | .. |
---|
1 | 1 | |
---|
| 2 | +import com.bulletphysics.dynamics.RigidBody; |
---|
2 | 3 | import java.awt.*; |
---|
3 | 4 | import java.awt.event.*; |
---|
4 | 5 | import java.awt.image.*; |
---|
.. | .. |
---|
18 | 19 | import javax.imageio.ImageIO; |
---|
19 | 20 | import javax.imageio.ImageWriteParam; |
---|
20 | 21 | import javax.imageio.ImageWriter; |
---|
| 22 | +import javax.imageio.ImageReadParam; |
---|
| 23 | +import javax.imageio.ImageReader; |
---|
21 | 24 | import javax.imageio.plugins.jpeg.JPEGImageWriteParam; |
---|
| 25 | +import javax.imageio.stream.ImageInputStream; |
---|
22 | 26 | import javax.imageio.stream.ImageOutputStream; |
---|
23 | 27 | import javax.imageio.ImageWriteParam; |
---|
24 | 28 | |
---|
.. | .. |
---|
30 | 34 | import java.nio.*; |
---|
31 | 35 | |
---|
32 | 36 | import gleem.linalg.Mat4f; |
---|
| 37 | +import javax.imageio.ImageTypeSpecifier; |
---|
33 | 38 | |
---|
34 | 39 | class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener |
---|
35 | 40 | { |
---|
.. | .. |
---|
93 | 98 | //boolean REDUCETEXTURE = true; |
---|
94 | 99 | boolean CACHETEXTURE = true; |
---|
95 | 100 | boolean CLEANCACHE = false; // true; |
---|
96 | | - boolean MIPMAP = true; // false; // true; |
---|
| 101 | + boolean MIPMAP = false; // true; // never works... |
---|
97 | 102 | boolean COMPRESSTEXTURE = false; |
---|
98 | 103 | boolean KOMPACTTEXTURE = false; // true; |
---|
99 | 104 | boolean RESIZETEXTURE = false; |
---|
.. | .. |
---|
106 | 111 | //private Mat4f spotlightTransform = new Mat4f(); |
---|
107 | 112 | //private Mat4f spotlightInverseTransform = new Mat4f(); |
---|
108 | 113 | static GLContext glcontext = null; |
---|
109 | | - /*static*/ com.sun.opengl.util.texture.Texture cubemap; |
---|
| 114 | + /*static*/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb |
---|
| 115 | + /*static*/ com.sun.opengl.util.texture.Texture cubemapcustom; |
---|
| 116 | + /*static*/ com.sun.opengl.util.texture.Texture cubemaprgb; |
---|
| 117 | + boolean transformMode; |
---|
| 118 | + |
---|
110 | 119 | boolean reverseUP = false; |
---|
111 | 120 | static boolean frozen = false; |
---|
112 | 121 | boolean enablebackspace = false; // patch for back buffer refresh |
---|
.. | .. |
---|
115 | 124 | static boolean LOCALTRANSFORM = false; |
---|
116 | 125 | static boolean FULLSCREEN = false; |
---|
117 | 126 | static boolean SUPPORT = true; |
---|
118 | | -static boolean INERTIA = true; |
---|
| 127 | +static boolean INERTIA = false; // true; |
---|
119 | 128 | static boolean FAST = false; |
---|
120 | 129 | static boolean SLOWPOSE = false; |
---|
121 | 130 | static boolean FOOTCONTACT = true; |
---|
.. | .. |
---|
126 | 135 | static boolean ZOOMBOXMODE = false; |
---|
127 | 136 | static boolean BOXMODE = false; |
---|
128 | 137 | static boolean IMAGEFLIP = false; |
---|
129 | | -static boolean SMOOTHFOCUS = false; |
---|
| 138 | +static boolean SMOOTHFOCUS = true; // false; |
---|
130 | 139 | static boolean SPEAKERMOCAP = true; // jan 2014 false; |
---|
131 | 140 | static boolean SPEAKERCAMERA = false; |
---|
132 | 141 | static boolean SPEAKERFOCUS = false; |
---|
.. | .. |
---|
160 | 169 | |
---|
161 | 170 | |
---|
162 | 171 | // OPTIONS |
---|
163 | | - boolean Skinshader = true; |
---|
| 172 | + boolean Skinshader = false; // true; |
---|
164 | 173 | boolean cameraLight = false; |
---|
165 | 174 | boolean UVdebug = false; |
---|
166 | 175 | boolean Udebug = false; |
---|
167 | 176 | boolean Vdebug = false; |
---|
168 | 177 | boolean NORMALdebug = false; |
---|
169 | | - static boolean doublesided = false; // true; // reversed normals are awful for conformance |
---|
| 178 | + static boolean doublesided = true; // false; // reversed normals are awful for conformance |
---|
170 | 179 | boolean anisotropy = true; |
---|
171 | 180 | boolean softshadow = true; // slower but better false; |
---|
172 | | - boolean opacityhalo = false; |
---|
| 181 | + boolean opacityhalo = false; // reverse the halo effect (e.g. glass) |
---|
173 | 182 | |
---|
174 | 183 | boolean macromode = false; |
---|
175 | 184 | |
---|
.. | .. |
---|
183 | 192 | } |
---|
184 | 193 | |
---|
185 | 194 | private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory(); |
---|
| 195 | + |
---|
| 196 | + public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException |
---|
| 197 | + { |
---|
| 198 | + try |
---|
| 199 | + { |
---|
| 200 | + return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap); |
---|
| 201 | + } catch (IOException e) |
---|
| 202 | + { |
---|
| 203 | + System.out.println("NAME = " + name); |
---|
| 204 | + e.printStackTrace(); // throw new RuntimeException(e); |
---|
| 205 | + return null; |
---|
| 206 | + } |
---|
| 207 | + } |
---|
186 | 208 | |
---|
187 | 209 | void SetAsGLRenderer(boolean b) |
---|
188 | 210 | { |
---|
.. | .. |
---|
200 | 222 | cameras = new Camera[2]; |
---|
201 | 223 | targetLookAts = new cVector[2]; |
---|
202 | 224 | |
---|
203 | | - SetCamera(cam); |
---|
| 225 | + SetCamera(cam, true); |
---|
204 | 226 | |
---|
205 | | - SetLight(new Camera(new cVector(10, 10, -20))); |
---|
| 227 | + // Warning: not used. |
---|
| 228 | + //SetLight(new Camera(new cVector(15, 10, -20))); |
---|
206 | 229 | |
---|
207 | 230 | object = o; |
---|
208 | 231 | |
---|
.. | .. |
---|
227 | 250 | |
---|
228 | 251 | public javax.media.opengl.GL GetGL0() |
---|
229 | 252 | { |
---|
230 | | - return null; |
---|
| 253 | + return currentGL; |
---|
231 | 254 | } |
---|
232 | 255 | |
---|
233 | 256 | public int GenList() |
---|
.. | .. |
---|
520 | 543 | LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1); |
---|
521 | 544 | LA.vecCross(obj.v0, obj.v1, obj.v2); |
---|
522 | 545 | LA.vecNormalize(obj.v2); |
---|
523 | | - gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z); |
---|
| 546 | + |
---|
| 547 | + SetGLNormal(gl, (float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z); |
---|
524 | 548 | } |
---|
525 | 549 | |
---|
526 | 550 | // P |
---|
.. | .. |
---|
542 | 566 | y += ny * obj.NORMALPUSH; |
---|
543 | 567 | z += nz * obj.NORMALPUSH; |
---|
544 | 568 | |
---|
545 | | - gl.glNormal3f(nx, ny, nz); |
---|
| 569 | + SetGLNormal(gl, nx, ny, nz); |
---|
546 | 570 | } |
---|
547 | 571 | gl.glColor4f(pv.AO, pv.AO, pv.AO, 1); |
---|
548 | 572 | SetColor(obj, pv); |
---|
.. | .. |
---|
574 | 598 | y += ny * obj.NORMALPUSH; |
---|
575 | 599 | z += nz * obj.NORMALPUSH; |
---|
576 | 600 | |
---|
577 | | - gl.glNormal3f(nx, ny, nz); |
---|
| 601 | + SetGLNormal(gl, nx, ny, nz); |
---|
578 | 602 | } |
---|
579 | 603 | //System.out.println("vertexq = " + qv.s + ", " + qv.t); |
---|
580 | 604 | // boolean locked = false; |
---|
.. | .. |
---|
622 | 646 | y += ny * obj.NORMALPUSH; |
---|
623 | 647 | z += nz * obj.NORMALPUSH; |
---|
624 | 648 | |
---|
625 | | - gl.glNormal3f(nx, ny, nz); |
---|
| 649 | + SetGLNormal(gl, nx, ny, nz); |
---|
626 | 650 | } |
---|
627 | 651 | |
---|
628 | 652 | // if ((dot&4) == 0) |
---|
.. | .. |
---|
858 | 882 | //// tris.postdraw(this); |
---|
859 | 883 | } |
---|
860 | 884 | |
---|
861 | | - static Camera localcamera = new Camera(); |
---|
| 885 | + static Camera localAOcamera = new Camera(); |
---|
862 | 886 | static cVector from = new cVector(); |
---|
863 | 887 | static cVector to = new cVector(); |
---|
864 | 888 | |
---|
.. | .. |
---|
867 | 891 | CameraPane cp = this; |
---|
868 | 892 | |
---|
869 | 893 | Camera keep = cp.RenderCamera(); |
---|
870 | | - cp.renderCamera = localcamera; |
---|
| 894 | + cp.renderCamera = localAOcamera; |
---|
871 | 895 | |
---|
872 | 896 | if (br.trimmed) |
---|
873 | 897 | { |
---|
.. | .. |
---|
885 | 909 | br.positions[i3 + 2] + br.normals[i3 + 2]); |
---|
886 | 910 | LA.xformPos(from, transform, from); |
---|
887 | 911 | LA.xformPos(to, transform, to); // RIGID ONLY |
---|
888 | | - localcamera.setAim(from, to); |
---|
| 912 | + localAOcamera.setAim(from, to); |
---|
889 | 913 | |
---|
890 | 914 | CameraPane.occlusionbuffer.display(); |
---|
891 | 915 | |
---|
.. | .. |
---|
919 | 943 | to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z); |
---|
920 | 944 | LA.xformPos(from, transform, from); |
---|
921 | 945 | LA.xformPos(to, transform, to); // RIGID ONLY |
---|
922 | | - localcamera.setAim(from, to); |
---|
| 946 | + localAOcamera.setAim(from, to); |
---|
923 | 947 | |
---|
924 | 948 | CameraPane.occlusionbuffer.display(); |
---|
925 | 949 | |
---|
.. | .. |
---|
1228 | 1252 | { |
---|
1229 | 1253 | if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0) |
---|
1230 | 1254 | { |
---|
1231 | | - gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]); |
---|
| 1255 | + SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]); |
---|
1232 | 1256 | } else |
---|
1233 | 1257 | { |
---|
1234 | | - gl.glNormal3f(0, 0, 1); |
---|
| 1258 | + SetGLNormal(gl, 0, 0, 1); |
---|
1235 | 1259 | } |
---|
1236 | 1260 | |
---|
1237 | 1261 | if (c != null) |
---|
.. | .. |
---|
1255 | 1279 | { |
---|
1256 | 1280 | if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0) |
---|
1257 | 1281 | { |
---|
1258 | | - gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]); |
---|
| 1282 | + SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]); |
---|
1259 | 1283 | } else |
---|
1260 | 1284 | { |
---|
1261 | | - gl.glNormal3f(0, 0, 1); |
---|
| 1285 | + SetGLNormal(gl, 0, 0, 1); |
---|
1262 | 1286 | } |
---|
1263 | 1287 | if (c != null) |
---|
1264 | 1288 | { |
---|
.. | .. |
---|
1283 | 1307 | { |
---|
1284 | 1308 | if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0) |
---|
1285 | 1309 | { |
---|
1286 | | - gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]); |
---|
| 1310 | + SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]); |
---|
1287 | 1311 | } else |
---|
1288 | 1312 | { |
---|
1289 | | - gl.glNormal3f(0, 0, 1); |
---|
| 1313 | + SetGLNormal(gl, 0, 0, 1); |
---|
1290 | 1314 | } |
---|
1291 | 1315 | if (c != null) |
---|
1292 | 1316 | { |
---|
.. | .. |
---|
1468 | 1492 | { |
---|
1469 | 1493 | if (!selectmode) |
---|
1470 | 1494 | { |
---|
1471 | | - gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z); |
---|
| 1495 | + SetGLNormal(gl, (float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z); |
---|
1472 | 1496 | gl.glColor4f(pv.AO, pv.AO, pv.AO, 1); |
---|
1473 | 1497 | |
---|
1474 | 1498 | if (flipV) |
---|
.. | .. |
---|
1480 | 1504 | gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z); |
---|
1481 | 1505 | } |
---|
1482 | 1506 | |
---|
| 1507 | + float[] colorV = new float[4]; |
---|
| 1508 | + |
---|
1483 | 1509 | void SetColor(Object3D obj, Vertex p0) |
---|
1484 | 1510 | { |
---|
1485 | 1511 | CameraPane display = this; |
---|
.. | .. |
---|
1504 | 1530 | } |
---|
1505 | 1531 | } |
---|
1506 | 1532 | float b = 0; |
---|
1507 | | - if (obj.support != null && obj.link2master) |
---|
| 1533 | + if (obj.support != null && obj.Link2Support()) |
---|
1508 | 1534 | { |
---|
1509 | 1535 | b = 1; |
---|
1510 | 1536 | } |
---|
.. | .. |
---|
1547 | 1573 | { |
---|
1548 | 1574 | return; |
---|
1549 | 1575 | } |
---|
1550 | | - |
---|
1551 | | - float[] colorV = new float[3]; |
---|
1552 | 1576 | |
---|
1553 | 1577 | if (false) // marked) |
---|
1554 | 1578 | { |
---|
.. | .. |
---|
1797 | 1821 | |
---|
1798 | 1822 | display.modelParams7[0] = 0; |
---|
1799 | 1823 | display.modelParams7[1] = 1000; |
---|
1800 | | - display.modelParams7[2] = 0; |
---|
| 1824 | + display.modelParams7[2] = material.parallax; |
---|
1801 | 1825 | display.modelParams7[3] = 0; |
---|
1802 | 1826 | |
---|
1803 | 1827 | //display.modelParams6[0] = 100; // criss de bug de bump |
---|
.. | .. |
---|
2030 | 2054 | switch(viewcode) |
---|
2031 | 2055 | { |
---|
2032 | 2056 | case 0: return "main"; |
---|
2033 | | - case 1: return "one"; |
---|
2034 | | - case 2: return "two"; |
---|
2035 | | - case 3: return "three"; |
---|
| 2057 | + case 1: return "Red"; |
---|
| 2058 | + case 2: return "Green"; |
---|
| 2059 | + case 3: return "Blue"; |
---|
2036 | 2060 | case 4: return "light"; |
---|
2037 | 2061 | } |
---|
2038 | 2062 | |
---|
.. | .. |
---|
2041 | 2065 | |
---|
2042 | 2066 | static int camerachangeframe; |
---|
2043 | 2067 | |
---|
2044 | | - public boolean SetCamera(Camera cam) |
---|
| 2068 | + public boolean SetCamera(Camera cam, boolean set) |
---|
2045 | 2069 | { |
---|
2046 | 2070 | // may 2014 if (cam == cameras[0] || cam == cameras[1]) |
---|
2047 | 2071 | // return false; |
---|
.. | .. |
---|
2059 | 2083 | |
---|
2060 | 2084 | camerachangeframe = Globals.framecount; |
---|
2061 | 2085 | |
---|
2062 | | - cam.hAspect = -1; // Read only |
---|
| 2086 | + if (cam != null) |
---|
| 2087 | + cam.hAspect = -1; // Read only |
---|
2063 | 2088 | |
---|
2064 | 2089 | cameras[0] = cam; |
---|
2065 | 2090 | targetLookAts[0] = new cVector(cam.lookAt); |
---|
.. | .. |
---|
2069 | 2094 | { |
---|
2070 | 2095 | cameras[i] = new Camera(cam.viewCode); |
---|
2071 | 2096 | } |
---|
2072 | | - |
---|
2073 | | - cameras[i].setAim(cam.location, cam.lookAt); |
---|
2074 | | - cameras[i].shaper_fovy = cam.shaper_fovy; |
---|
2075 | | - cameras[i].UP.set(cam.UP); |
---|
2076 | | - targetLookAts[i] = new cVector(cameras[i].lookAt); |
---|
| 2097 | + |
---|
| 2098 | + if (set) |
---|
| 2099 | + { |
---|
| 2100 | + cameras[i].setAim(cam.location, cam.lookAt); |
---|
| 2101 | + cameras[i].shaper_fovy = cam.shaper_fovy; |
---|
| 2102 | + cameras[i].UP.set(cam.UP); |
---|
| 2103 | + targetLookAts[i] = new cVector(cameras[i].lookAt); |
---|
| 2104 | + } |
---|
2077 | 2105 | } |
---|
2078 | 2106 | cameracount = 0; |
---|
2079 | 2107 | targetLookAt = targetLookAts[cameracount]; |
---|
.. | .. |
---|
2082 | 2110 | // Start with free camera |
---|
2083 | 2111 | SwitchCameras(true); |
---|
2084 | 2112 | |
---|
2085 | | - pingthread.jump = true; // optional? |
---|
| 2113 | +// pingthread.jump = true; // optional? |
---|
2086 | 2114 | |
---|
2087 | 2115 | if (TRACKONCE) |
---|
2088 | 2116 | { |
---|
.. | .. |
---|
2269 | 2297 | public void ToggleTrack() |
---|
2270 | 2298 | { |
---|
2271 | 2299 | TRACK ^= true; |
---|
2272 | | - if (TRACK) |
---|
2273 | | - { |
---|
2274 | | - if (object.selection != null && |
---|
2275 | | - object.selection.size() > 0 && |
---|
2276 | | - object.selection.elementAt(0) != null && |
---|
2277 | | - !(object.selection.elementAt(0) instanceof Camera) && |
---|
2278 | | - !(object.selection.elementAt(0) instanceof ScriptNode)) |
---|
2279 | | - { |
---|
2280 | | - trackedobject = object.selection.elementAt(0); |
---|
2281 | | - repaint(); |
---|
2282 | | - } |
---|
2283 | | - } |
---|
2284 | 2300 | |
---|
2285 | 2301 | repaint(); |
---|
2286 | 2302 | } |
---|
.. | .. |
---|
2372 | 2388 | { |
---|
2373 | 2389 | //System.out.println("PROTECTION = " + cam.hAspect); |
---|
2374 | 2390 | //assert (cam.hAspect == 0); |
---|
2375 | | - cam.hAspect = 0; |
---|
| 2391 | + if (cam != null) |
---|
| 2392 | + cam.hAspect = 0; |
---|
2376 | 2393 | lightCamera = cam; |
---|
2377 | 2394 | } |
---|
2378 | 2395 | |
---|
.. | .. |
---|
2453 | 2470 | return CreateBim(bytes, width, height); |
---|
2454 | 2471 | } |
---|
2455 | 2472 | |
---|
| 2473 | + private void SetGLNormal(javax.media.opengl.GL gl, float nx, float ny, float nz) |
---|
| 2474 | + { |
---|
| 2475 | + gl.glNormal3f(nx, ny, nz); |
---|
| 2476 | + |
---|
| 2477 | + if (ny > 0.9 || ny < -0.9) |
---|
| 2478 | + // Ground or ceiling |
---|
| 2479 | + gl.glVertexAttrib3f(4, 1, 0, 0); |
---|
| 2480 | + else |
---|
| 2481 | + // Walls |
---|
| 2482 | + gl.glVertexAttrib3f(4, 0, 1, 0); |
---|
| 2483 | + } |
---|
| 2484 | + |
---|
2456 | 2485 | /**/ |
---|
2457 | 2486 | class CacheTexture |
---|
2458 | 2487 | { |
---|
.. | .. |
---|
2495 | 2524 | com.sun.opengl.util.texture.TextureIO.newTextureData( |
---|
2496 | 2525 | getClass().getClassLoader().getResourceAsStream(name), |
---|
2497 | 2526 | true, |
---|
2498 | | - com.sun.opengl.util.texture.TextureIO.PNG); |
---|
| 2527 | + GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG); |
---|
2499 | 2528 | } catch (java.io.IOException e) |
---|
2500 | 2529 | { |
---|
2501 | 2530 | throw new javax.media.opengl.GLException(e); |
---|
.. | .. |
---|
3561 | 3590 | }; |
---|
3562 | 3591 | /**/ |
---|
3563 | 3592 | |
---|
| 3593 | + static Object3D lastObject; |
---|
| 3594 | + |
---|
3564 | 3595 | //com.sun.opengl.util.texture.Texture |
---|
3565 | 3596 | TextureData |
---|
3566 | 3597 | GetFileTexture(String name, boolean bump, int resolution) |
---|
.. | .. |
---|
3597 | 3628 | // return null; |
---|
3598 | 3629 | //if (i == 2) |
---|
3599 | 3630 | // return null; |
---|
| 3631 | + // TIFF issue sept 2019 |
---|
| 3632 | + System.err.println("lastObject = " + lastObject); |
---|
3600 | 3633 | e.printStackTrace(); |
---|
3601 | 3634 | name = name.split("\\.tif")[0] + ".jpg"; |
---|
3602 | 3635 | } |
---|
.. | .. |
---|
6929 | 6962 | short residu = 0; |
---|
6930 | 6963 | |
---|
6931 | 6964 | // wraparound workarounds |
---|
6932 | | - short fuck = (short) (buffer[i] & 0xFF); |
---|
| 6965 | + short ww = (short) (buffer[i] & 0xFF); |
---|
6933 | 6966 | /* |
---|
6934 | | - residu += (fuck%2); |
---|
6935 | | - if(fuck/2 < 256-residu/2) |
---|
| 6967 | + residu += (ww%2); |
---|
| 6968 | + if(ww/2 < 256-residu/2) |
---|
6936 | 6969 | { |
---|
6937 | | - fuck = (short)((fuck/2) + residu/2); |
---|
| 6970 | + ww = (short)((ww/2) + residu/2); |
---|
6938 | 6971 | if(residu == 2) |
---|
6939 | 6972 | residu = 0; |
---|
6940 | 6973 | } |
---|
6941 | 6974 | else |
---|
6942 | 6975 | { |
---|
6943 | 6976 | residu = 0; |
---|
6944 | | - fuck /= 2; |
---|
| 6977 | + ww /= 2; |
---|
6945 | 6978 | } |
---|
6946 | 6979 | */ |
---|
6947 | | - if (i < imglength / 3 || rnd.nextFloat() < 0.5 || fuck >= 254) |
---|
| 6980 | + if (i < imglength / 3 || rnd.nextFloat() < 0.5 || ww >= 254) |
---|
6948 | 6981 | { |
---|
6949 | | - fuck /= 2; |
---|
| 6982 | + ww /= 2; |
---|
6950 | 6983 | } else |
---|
6951 | 6984 | { |
---|
6952 | | - fuck = (short) ((fuck / 2) + fuck % 2); |
---|
| 6985 | + ww = (short) ((ww / 2) + ww % 2); |
---|
6953 | 6986 | } |
---|
6954 | 6987 | |
---|
6955 | | - buffer[i] = (byte) fuck; |
---|
| 6988 | + buffer[i] = (byte) ww; |
---|
6956 | 6989 | } |
---|
6957 | 6990 | //System.out.print(bytes[i] + " "); |
---|
6958 | 6991 | //if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps; |
---|
.. | .. |
---|
8341 | 8374 | // else |
---|
8342 | 8375 | // if (!texname.startsWith("/")) |
---|
8343 | 8376 | // texname = "/Users/nbriere/Textures/" + texname; |
---|
8344 | | - if (!FileExists(texname)) |
---|
| 8377 | + if (!FileExists(texname) && !texname.startsWith("@")) |
---|
8345 | 8378 | { |
---|
8346 | 8379 | texname = fallbackTextureName; |
---|
8347 | 8380 | } |
---|
.. | .. |
---|
8358 | 8391 | { |
---|
8359 | 8392 | TextureData texturedata = null; |
---|
8360 | 8393 | |
---|
8361 | | - if (texdata != null) |
---|
| 8394 | + if (texdata != null && textureon) |
---|
8362 | 8395 | { |
---|
8363 | | - BufferedImage bim = //new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB); |
---|
| 8396 | + BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB); |
---|
8364 | 8397 | |
---|
8365 | | - CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph); |
---|
| 8398 | + try |
---|
| 8399 | + { |
---|
| 8400 | + bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph); |
---|
| 8401 | + } |
---|
| 8402 | + catch (Exception e) |
---|
| 8403 | + { |
---|
| 8404 | + bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph); |
---|
| 8405 | + } |
---|
8366 | 8406 | |
---|
8367 | 8407 | texturecache = new CacheTexture(GetBimTexture(bim, bump), -1); |
---|
8368 | 8408 | bimtextures.put(texdata, texturecache); |
---|
| 8409 | + |
---|
| 8410 | + //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB); |
---|
| 8411 | + |
---|
| 8412 | + //Object bim2 = CreateBim(texturecache.texturedata); |
---|
| 8413 | + //bim2 = bim; |
---|
8369 | 8414 | } |
---|
8370 | 8415 | else |
---|
8371 | 8416 | if (texname.endsWith("DEFAULT_TEXTURE")) // ||*/ tex.equals("")) |
---|
.. | .. |
---|
8407 | 8452 | { |
---|
8408 | 8453 | // texturecache = textures.get(texname); // suspicious |
---|
8409 | 8454 | if (texturecache == null) |
---|
8410 | | - texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution); |
---|
| 8455 | + texturecache = new CacheTexture(GetResourceTexture("whitenoise.jpg", bump),resolution); |
---|
| 8456 | + else |
---|
| 8457 | + new Exception().printStackTrace(); |
---|
| 8458 | + } else |
---|
| 8459 | + { |
---|
| 8460 | + if (texname.startsWith("@") && textureon) |
---|
| 8461 | + { |
---|
| 8462 | + // texturecache = textures.get(texname); // suspicious |
---|
| 8463 | + if (texturecache == null) |
---|
| 8464 | + texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution); |
---|
8411 | 8465 | else |
---|
8412 | 8466 | new Exception().printStackTrace(); |
---|
8413 | 8467 | } else |
---|
.. | .. |
---|
8471 | 8525 | texturecache = new CacheTexture(texturedata,resolution); |
---|
8472 | 8526 | //texture = GetTexture(tex, bump); |
---|
8473 | 8527 | } |
---|
| 8528 | + } |
---|
8474 | 8529 | } |
---|
8475 | 8530 | //} |
---|
8476 | 8531 | } |
---|
.. | .. |
---|
8560 | 8615 | { |
---|
8561 | 8616 | if (tex.pigmentdata == null) |
---|
8562 | 8617 | { |
---|
8563 | | - String texname = Object3D.GetPigment(tex); |
---|
| 8618 | + //String texname = Object3D.GetPigment(tex); |
---|
8564 | 8619 | |
---|
8565 | 8620 | CacheTexture texturecache = texturepigment.get(tex); |
---|
8566 | 8621 | |
---|
8567 | 8622 | if (texturecache != null) |
---|
8568 | 8623 | { |
---|
8569 | | - tex.pigmentdata = ((ByteBuffer)texturecache.texturedata.getBuffer()).array(); |
---|
8570 | 8624 | tex.pw = texturecache.texturedata.getWidth(); |
---|
8571 | 8625 | tex.ph = texturecache.texturedata.getHeight(); |
---|
| 8626 | + tex.pigmentdata = //CompressJPEG(CreateBim |
---|
| 8627 | + ((ByteBuffer)texturecache.texturedata.getBuffer()).array() |
---|
| 8628 | + ; |
---|
| 8629 | + //, tex.pw, tex.ph), 0.5f); |
---|
8572 | 8630 | } |
---|
8573 | 8631 | } |
---|
8574 | 8632 | |
---|
8575 | 8633 | if (tex.bumpdata == null) |
---|
8576 | 8634 | { |
---|
8577 | | - String texname = Object3D.GetBump(tex); |
---|
| 8635 | + //String texname = Object3D.GetBump(tex); |
---|
8578 | 8636 | |
---|
8579 | 8637 | CacheTexture texturecache = texturebump.get(tex); |
---|
8580 | 8638 | |
---|
8581 | 8639 | if (texturecache != null) |
---|
8582 | 8640 | { |
---|
8583 | | - tex.bumpdata = ((ByteBuffer)texturecache.texturedata.getBuffer()).array(); |
---|
8584 | 8641 | tex.bw = texturecache.texturedata.getWidth(); |
---|
8585 | 8642 | tex.bh = texturecache.texturedata.getHeight(); |
---|
| 8643 | + tex.bumpdata = //CompressJPEG(CreateBim( |
---|
| 8644 | + ((ByteBuffer)texturecache.texturedata.getBuffer()).array(); |
---|
| 8645 | + //, tex.bw, tex.bh), 0.5f); |
---|
8586 | 8646 | } |
---|
8587 | 8647 | } |
---|
8588 | 8648 | } |
---|
.. | .. |
---|
8654 | 8714 | return true; // Warning: not used. |
---|
8655 | 8715 | } |
---|
8656 | 8716 | |
---|
| 8717 | + public static byte[] CompressJPEG(BufferedImage image, float quality) |
---|
| 8718 | + { |
---|
| 8719 | + try |
---|
| 8720 | + { |
---|
| 8721 | + ByteArrayOutputStream baos = new ByteArrayOutputStream(); |
---|
| 8722 | + Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg"); |
---|
| 8723 | + ImageWriter writer = writers.next(); |
---|
| 8724 | + |
---|
| 8725 | + ImageWriteParam param = writer.getDefaultWriteParam(); |
---|
| 8726 | + param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT); |
---|
| 8727 | + param.setCompressionQuality(quality); |
---|
| 8728 | + |
---|
| 8729 | + ImageOutputStream ios = ImageIO.createImageOutputStream(baos); |
---|
| 8730 | + writer.setOutput(ios); |
---|
| 8731 | + writer.write(null, new IIOImage(image, null, null), param); |
---|
| 8732 | + |
---|
| 8733 | + byte[] data = baos.toByteArray(); |
---|
| 8734 | + writer.dispose(); |
---|
| 8735 | + return data; |
---|
| 8736 | + } |
---|
| 8737 | + catch (Exception e) |
---|
| 8738 | + { |
---|
| 8739 | + e.printStackTrace(); |
---|
| 8740 | + return null; |
---|
| 8741 | + } |
---|
| 8742 | + } |
---|
| 8743 | + |
---|
| 8744 | + public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException |
---|
| 8745 | + { |
---|
| 8746 | + ByteArrayInputStream baos = new ByteArrayInputStream(image); |
---|
| 8747 | + Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg"); |
---|
| 8748 | + ImageReader reader = writers.next(); |
---|
| 8749 | + |
---|
| 8750 | + BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB); |
---|
| 8751 | + |
---|
| 8752 | + ImageReadParam param = reader.getDefaultReadParam(); |
---|
| 8753 | + param.setDestination(bim); |
---|
| 8754 | + //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB)); |
---|
| 8755 | + |
---|
| 8756 | + ImageInputStream ios = ImageIO.createImageInputStream(baos); |
---|
| 8757 | + reader.setInput(ios); |
---|
| 8758 | + BufferedImage bim2 = reader.read(0, param); |
---|
| 8759 | + reader.dispose(); |
---|
| 8760 | + |
---|
| 8761 | +// WritableRaster raster = bim2.getRaster(); |
---|
| 8762 | +// DataBufferByte data = (DataBufferByte) raster.getDataBuffer(); |
---|
| 8763 | +// byte[] bytes = data.getData(); |
---|
| 8764 | +// |
---|
| 8765 | +// int[] pixels = new int[bytes.length/3]; |
---|
| 8766 | +// for (int i=pixels.length; --i>=0;) |
---|
| 8767 | +// { |
---|
| 8768 | +// int i3 = i*3; |
---|
| 8769 | +// pixels[i] = 0xFF; |
---|
| 8770 | +// pixels[i] <<= 8; |
---|
| 8771 | +// pixels[i] |= bytes[i3+2] & 0xFF; |
---|
| 8772 | +// pixels[i] <<= 8; |
---|
| 8773 | +// pixels[i] |= bytes[i3+1] & 0xFF; |
---|
| 8774 | +// pixels[i] <<= 8; |
---|
| 8775 | +// pixels[i] |= bytes[i3] & 0xFF; |
---|
| 8776 | +// } |
---|
| 8777 | +// |
---|
| 8778 | +// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w); |
---|
| 8779 | + |
---|
| 8780 | + return bim; |
---|
| 8781 | + } |
---|
| 8782 | + |
---|
8657 | 8783 | ShadowBuffer shadowPBuf; |
---|
8658 | 8784 | AntialiasBuffer antialiasPBuf; |
---|
8659 | 8785 | int MAXSTACK; |
---|
.. | .. |
---|
8670 | 8796 | |
---|
8671 | 8797 | gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0); |
---|
8672 | 8798 | MAXSTACK = temp[0]; |
---|
8673 | | - System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK); |
---|
| 8799 | + if (Globals.DEBUG) |
---|
| 8800 | + System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK); |
---|
8674 | 8801 | gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0); |
---|
8675 | 8802 | MAXSTACK = temp[0]; |
---|
8676 | | - System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK); |
---|
| 8803 | + if (Globals.DEBUG) |
---|
| 8804 | + System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK); |
---|
8677 | 8805 | |
---|
8678 | 8806 | // Use debug pipeline |
---|
8679 | 8807 | //drawable.setGL(new DebugGL(gl)); // |
---|
.. | .. |
---|
8681 | 8809 | gl = drawable.getGL(); // |
---|
8682 | 8810 | |
---|
8683 | 8811 | GL gl3 = getGL(); |
---|
8684 | | - System.out.println("INIT GL IS: " + gl.getClass().getName()); |
---|
| 8812 | + if (Globals.DEBUG) |
---|
| 8813 | + System.out.println("INIT GL IS: " + gl.getClass().getName()); |
---|
8685 | 8814 | |
---|
8686 | 8815 | |
---|
8687 | 8816 | //float pos[] = { 100, 100, 100, 0 }; |
---|
.. | .. |
---|
8846 | 8975 | |
---|
8847 | 8976 | if (cubemap == null) |
---|
8848 | 8977 | { |
---|
8849 | | - LoadEnvy(5); |
---|
| 8978 | + //LoadEnvy(1); |
---|
8850 | 8979 | } |
---|
8851 | 8980 | |
---|
8852 | 8981 | //cubemap.enable(); |
---|
.. | .. |
---|
9122 | 9251 | |
---|
9123 | 9252 | void LoadEnvy(int which) |
---|
9124 | 9253 | { |
---|
| 9254 | + assert(false); |
---|
| 9255 | + |
---|
9125 | 9256 | String name; |
---|
9126 | 9257 | String ext; |
---|
9127 | 9258 | |
---|
.. | .. |
---|
9133 | 9264 | cubemap = null; |
---|
9134 | 9265 | return; |
---|
9135 | 9266 | case 1: |
---|
9136 | | - name = "cubemaps/box_"; |
---|
9137 | | - ext = "png"; |
---|
| 9267 | + name = "cubemaps/rgb/"; |
---|
| 9268 | + ext = "jpg"; |
---|
9138 | 9269 | reverseUP = false; |
---|
9139 | 9270 | break; |
---|
9140 | 9271 | case 2: |
---|
9141 | | - name = "cubemaps/uffizi_"; |
---|
9142 | | - ext = "png"; |
---|
9143 | | - break; // reverseUP = true; break; |
---|
| 9272 | + name = "cubemaps/uffizi/"; |
---|
| 9273 | + ext = "jpg"; |
---|
| 9274 | + reverseUP = false; |
---|
| 9275 | + break; |
---|
9144 | 9276 | case 3: |
---|
9145 | | - name = "cubemaps/CloudyHills_"; |
---|
9146 | | - ext = "tga"; |
---|
| 9277 | + name = "cubemaps/CloudyHills/"; |
---|
| 9278 | + ext = "jpg"; |
---|
9147 | 9279 | reverseUP = false; |
---|
9148 | 9280 | break; |
---|
9149 | 9281 | case 4: |
---|
9150 | | - name = "cubemaps/cornell_"; |
---|
| 9282 | + name = "cubemaps/cornell/"; |
---|
9151 | 9283 | ext = "png"; |
---|
9152 | 9284 | reverseUP = false; |
---|
9153 | 9285 | break; |
---|
| 9286 | + case 5: |
---|
| 9287 | + name = "cubemaps/skycube/"; |
---|
| 9288 | + ext = "jpg"; |
---|
| 9289 | + reverseUP = false; |
---|
| 9290 | + break; |
---|
| 9291 | + case 6: |
---|
| 9292 | + name = "cubemaps/SaintLazarusChurch3/"; |
---|
| 9293 | + ext = "jpg"; |
---|
| 9294 | + reverseUP = false; |
---|
| 9295 | + break; |
---|
| 9296 | + case 7: |
---|
| 9297 | + name = "cubemaps/Sodermalmsallen/"; |
---|
| 9298 | + ext = "jpg"; |
---|
| 9299 | + reverseUP = false; |
---|
| 9300 | + break; |
---|
| 9301 | + case 8: |
---|
| 9302 | + name = "cubemaps/Sodermalmsallen2/"; |
---|
| 9303 | + ext = "jpg"; |
---|
| 9304 | + reverseUP = false; |
---|
| 9305 | + break; |
---|
| 9306 | + case 9: |
---|
| 9307 | + name = "cubemaps/UnionSquare/"; |
---|
| 9308 | + ext = "jpg"; |
---|
| 9309 | + reverseUP = false; |
---|
| 9310 | + break; |
---|
9154 | 9311 | default: |
---|
9155 | | - name = "cubemaps/rgb_"; |
---|
9156 | | - ext = "png"; /*mipmap = true;*/ reverseUP = false; |
---|
| 9312 | + name = "cubemaps/box/"; |
---|
| 9313 | + ext = "png"; /*mipmap = true;*/ |
---|
| 9314 | + reverseUP = false; |
---|
9157 | 9315 | break; |
---|
9158 | 9316 | } |
---|
9159 | | - |
---|
9160 | | - try |
---|
9161 | | - { |
---|
9162 | | - cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap); |
---|
9163 | | - } catch (IOException e) |
---|
9164 | | - { |
---|
9165 | | - throw new RuntimeException(e); |
---|
9166 | | - } |
---|
| 9317 | + |
---|
| 9318 | + LoadSkybox(name, ext, mipmap); |
---|
9167 | 9319 | } |
---|
9168 | 9320 | |
---|
9169 | 9321 | public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) |
---|
.. | .. |
---|
9195 | 9347 | static double[] model = new double[16]; |
---|
9196 | 9348 | double[] camera2light = new double[16]; |
---|
9197 | 9349 | double[] light2camera = new double[16]; |
---|
9198 | | - int newenvy = -1; |
---|
9199 | | - boolean envyoff = true; // false; |
---|
| 9350 | + |
---|
| 9351 | + //int newenvy = -1; |
---|
| 9352 | + //boolean envyoff = false; |
---|
| 9353 | + |
---|
| 9354 | + String loadedskyboxname; |
---|
| 9355 | + |
---|
9200 | 9356 | cVector light0 = new cVector(0, 0, 0); // 1,3,2); |
---|
9201 | 9357 | //float[] light0 = { 0,0,0 }; |
---|
9202 | 9358 | cVector dirlight = new cVector(0, 0, 1); // 1,3,2); |
---|
.. | .. |
---|
9614 | 9770 | |
---|
9615 | 9771 | if (renderCamera != lightCamera) |
---|
9616 | 9772 | //for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
9617 | | - LA.matConcat(matrix, parentcam.GlobalTransform(), matrix); |
---|
| 9773 | + LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix); |
---|
9618 | 9774 | |
---|
9619 | 9775 | // LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix); |
---|
9620 | 9776 | |
---|
.. | .. |
---|
9630 | 9786 | |
---|
9631 | 9787 | if (renderCamera != lightCamera) |
---|
9632 | 9788 | //for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
9633 | | - LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix); |
---|
| 9789 | + LA.matConcat(parentcam.GlobalTransform(), matrix, matrix); |
---|
9634 | 9790 | |
---|
9635 | 9791 | // LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix); |
---|
9636 | 9792 | |
---|
.. | .. |
---|
9676 | 9832 | rati = 1 / rati; |
---|
9677 | 9833 | gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000); |
---|
9678 | 9834 | } |
---|
9679 | | - assert (newenvy == -1); |
---|
| 9835 | + |
---|
| 9836 | + //assert (newenvy == -1); |
---|
| 9837 | + |
---|
9680 | 9838 | gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB); |
---|
9681 | 9839 | gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB); |
---|
9682 | | - DrawSkyBox(gl); |
---|
| 9840 | + DrawSkyBox(gl, (float)rati); |
---|
9683 | 9841 | gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB); |
---|
9684 | 9842 | gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB); |
---|
9685 | | - accPerspective(gl, renderCamera.shaper_fovy / ratio, |
---|
| 9843 | + |
---|
| 9844 | + boolean vr = capsLocked && !lightMode; |
---|
| 9845 | + |
---|
| 9846 | + accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1), |
---|
9686 | 9847 | ratio, |
---|
9687 | 9848 | //near_plane, far_plane, |
---|
9688 | 9849 | renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(), |
---|
.. | .. |
---|
10545 | 10706 | static boolean init = false; |
---|
10546 | 10707 | |
---|
10547 | 10708 | double[][] matrix = LA.newMatrix(); |
---|
| 10709 | + |
---|
| 10710 | + // This is to refresh the UI of the material panel. |
---|
| 10711 | + ObjEditor patchMaterial; |
---|
10548 | 10712 | |
---|
10549 | 10713 | public void display(GLAutoDrawable drawable) |
---|
10550 | 10714 | { |
---|
| 10715 | + if (patchMaterial.patchMaterial) |
---|
| 10716 | + { |
---|
| 10717 | + patchMaterial.patchMaterial = false; |
---|
| 10718 | + patchMaterial.objectTabbedPane.setSelectedIndex(1); |
---|
| 10719 | + } |
---|
| 10720 | + |
---|
10551 | 10721 | if (Grafreed.savesound && Grafreed.hassound) |
---|
10552 | 10722 | { |
---|
10553 | 10723 | Grafreed.wav.save(); |
---|
.. | .. |
---|
10591 | 10761 | } |
---|
10592 | 10762 | /**/ |
---|
10593 | 10763 | |
---|
10594 | | - if (selection) |
---|
| 10764 | + boolean control = ((modifiers & CTRL) != 0); |
---|
| 10765 | + |
---|
| 10766 | + if (selection && (!Globals.isLIVE() || control)) |
---|
10595 | 10767 | { |
---|
10596 | 10768 | selectbuffer.display(); |
---|
10597 | 10769 | return; |
---|
.. | .. |
---|
10643 | 10815 | |
---|
10644 | 10816 | if (DrawMode() == DEFAULT) |
---|
10645 | 10817 | { |
---|
| 10818 | + if (manipCamera == lightCamera) |
---|
| 10819 | + { |
---|
| 10820 | +// switch (e.getKeyCode()) |
---|
| 10821 | +// { |
---|
| 10822 | +// case DOWN_ARROW: |
---|
| 10823 | +// lightCamera.DECAL /= 2; |
---|
| 10824 | +// repaint(); |
---|
| 10825 | +// break; |
---|
| 10826 | +// case UP_ARROW: |
---|
| 10827 | +// lightCamera.DECAL *= 2; |
---|
| 10828 | +// repaint(); |
---|
| 10829 | +// break; |
---|
| 10830 | +// case LEFT_ARROW: |
---|
| 10831 | +// lightCamera.SCALE /= 2; |
---|
| 10832 | +// repaint(); |
---|
| 10833 | +// break; |
---|
| 10834 | +// case RIGHT_ARROW: |
---|
| 10835 | +// lightCamera.SCALE *= 2; |
---|
| 10836 | +// repaint(); |
---|
| 10837 | +// break; |
---|
| 10838 | +// default: |
---|
| 10839 | +// break; |
---|
| 10840 | + if (keys[DOWN_ARROW]) |
---|
| 10841 | + { |
---|
| 10842 | + lightCamera.DECAL /= 2; |
---|
| 10843 | + } |
---|
| 10844 | + |
---|
| 10845 | + if (keys[UP_ARROW]) |
---|
| 10846 | + { |
---|
| 10847 | + lightCamera.DECAL *= 2; |
---|
| 10848 | + } |
---|
| 10849 | + |
---|
| 10850 | + if (keys[LEFT_ARROW]) |
---|
| 10851 | + { |
---|
| 10852 | + lightCamera.SCALE /= 2; |
---|
| 10853 | + } |
---|
| 10854 | + |
---|
| 10855 | + if (keys[RIGHT_ARROW]) |
---|
| 10856 | + { |
---|
| 10857 | + lightCamera.SCALE *= 2; |
---|
| 10858 | + } |
---|
| 10859 | + } |
---|
| 10860 | + else |
---|
| 10861 | + { |
---|
| 10862 | + //pingthread.mute = true; |
---|
| 10863 | + |
---|
| 10864 | + boolean keyon = false; |
---|
| 10865 | + |
---|
| 10866 | + if (keys[DOWN_ARROW]) |
---|
| 10867 | + { |
---|
| 10868 | + speed = ++speedkey[DOWN_ARROW]; |
---|
| 10869 | + if (speed > 20) |
---|
| 10870 | + speed = 20; |
---|
| 10871 | + GoDown(modifiers); |
---|
| 10872 | + keyon = true; |
---|
| 10873 | + } |
---|
| 10874 | + else |
---|
| 10875 | + speedkey[DOWN_ARROW] = 0; |
---|
| 10876 | + |
---|
| 10877 | + if (keys[UP_ARROW]) |
---|
| 10878 | + { |
---|
| 10879 | + speed = ++speedkey[UP_ARROW]; |
---|
| 10880 | + if (speed > 20) |
---|
| 10881 | + speed = 20; |
---|
| 10882 | + GoUp(modifiers); |
---|
| 10883 | + keyon = true; |
---|
| 10884 | + } |
---|
| 10885 | + else |
---|
| 10886 | + speedkey[UP_ARROW] = 0; |
---|
| 10887 | + |
---|
| 10888 | + if (keys[LEFT_ARROW]) |
---|
| 10889 | + { |
---|
| 10890 | + speed = ++speedkey[LEFT_ARROW]; |
---|
| 10891 | + if (speed > 20) |
---|
| 10892 | + speed = 20; |
---|
| 10893 | + GoLeft(modifiers); |
---|
| 10894 | + keyon = true; |
---|
| 10895 | + } |
---|
| 10896 | + else |
---|
| 10897 | + speedkey[LEFT_ARROW] = 0; |
---|
| 10898 | + |
---|
| 10899 | + if (keys[RIGHT_ARROW]) |
---|
| 10900 | + { |
---|
| 10901 | + speed = ++speedkey[RIGHT_ARROW]; |
---|
| 10902 | + if (speed > 20) |
---|
| 10903 | + speed = 20; |
---|
| 10904 | + GoRight(modifiers); |
---|
| 10905 | + keyon = true; |
---|
| 10906 | + } |
---|
| 10907 | + else |
---|
| 10908 | + speedkey[RIGHT_ARROW] = 0; |
---|
| 10909 | + |
---|
| 10910 | + if (Globals.WALK && capsLocked) |
---|
| 10911 | + { |
---|
| 10912 | + Walk(); |
---|
| 10913 | + keyon = true; |
---|
| 10914 | + } |
---|
| 10915 | + |
---|
| 10916 | + if (keyon) |
---|
| 10917 | + { |
---|
| 10918 | + repaint(); |
---|
| 10919 | + } |
---|
| 10920 | + |
---|
| 10921 | + //pingthread.mute = false; |
---|
| 10922 | + } |
---|
| 10923 | + |
---|
10646 | 10924 | currentlydrawing = true; |
---|
10647 | 10925 | } |
---|
10648 | 10926 | |
---|
.. | .. |
---|
10716 | 10994 | |
---|
10717 | 10995 | if (wait) |
---|
10718 | 10996 | { |
---|
10719 | | - Sleep(500); |
---|
| 10997 | + Sleep(200); // blocks everything |
---|
10720 | 10998 | |
---|
10721 | 10999 | wait = false; |
---|
10722 | 11000 | } |
---|
.. | .. |
---|
10831 | 11109 | // if (parentcam != renderCamera) // not a light |
---|
10832 | 11110 | if (cam != lightCamera) |
---|
10833 | 11111 | //for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
10834 | | - LA.matConcat(matrix, parentcam.GlobalTransform(), matrix); |
---|
| 11112 | + LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix); |
---|
10835 | 11113 | |
---|
10836 | 11114 | for (int j = 0; j < 4; j++) |
---|
10837 | 11115 | { |
---|
.. | .. |
---|
10846 | 11124 | // if (parentcam != renderCamera) // not a light |
---|
10847 | 11125 | if (cam != lightCamera) |
---|
10848 | 11126 | //for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
10849 | | - LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix); |
---|
| 11127 | + LA.matConcat(parentcam.GlobalTransform(), matrix, matrix); |
---|
10850 | 11128 | |
---|
10851 | 11129 | //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix); |
---|
10852 | 11130 | |
---|
.. | .. |
---|
10932 | 11210 | gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000); |
---|
10933 | 11211 | } |
---|
10934 | 11212 | |
---|
10935 | | - if (newenvy > -1) |
---|
| 11213 | +// if (newenvy > -1) |
---|
| 11214 | +// { |
---|
| 11215 | +// LoadEnvy(newenvy); |
---|
| 11216 | +// } |
---|
| 11217 | +// |
---|
| 11218 | +// newenvy = -1; |
---|
| 11219 | + |
---|
| 11220 | + if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb")) |
---|
10936 | 11221 | { |
---|
10937 | | - LoadEnvy(newenvy); |
---|
| 11222 | + if (cubemaprgb == null) |
---|
| 11223 | + { |
---|
| 11224 | + cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false); |
---|
| 11225 | + } |
---|
| 11226 | + |
---|
| 11227 | + cubemap = cubemaprgb; |
---|
10938 | 11228 | } |
---|
10939 | | - |
---|
10940 | | - newenvy = -1; |
---|
10941 | | - |
---|
| 11229 | + else |
---|
| 11230 | + { |
---|
| 11231 | + if (object.skyboxname != null) |
---|
| 11232 | + { |
---|
| 11233 | + if (!object.skyboxname.equals(this.loadedskyboxname)) |
---|
| 11234 | + { |
---|
| 11235 | + if (cubemap != null && cubemap != cubemaprgb) |
---|
| 11236 | + cubemap.dispose(); |
---|
| 11237 | + cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false); |
---|
| 11238 | + loadedskyboxname = object.skyboxname; |
---|
| 11239 | + } |
---|
| 11240 | + } |
---|
| 11241 | + else |
---|
| 11242 | + { |
---|
| 11243 | + cubemapcustom = null; |
---|
| 11244 | + loadedskyboxname = null; |
---|
| 11245 | + } |
---|
| 11246 | + |
---|
| 11247 | + cubemap = cubemapcustom; |
---|
| 11248 | + } |
---|
| 11249 | + |
---|
10942 | 11250 | ratio = ((double) getWidth()) / getHeight(); |
---|
10943 | 11251 | //System.out.println("ratio = " + ratio); |
---|
10944 | 11252 | |
---|
.. | .. |
---|
10954 | 11262 | |
---|
10955 | 11263 | if (!IsFrozen() && !ambientOcclusion) |
---|
10956 | 11264 | { |
---|
10957 | | - DrawSkyBox(gl); |
---|
| 11265 | + DrawSkyBox(gl, (float)ratio); |
---|
10958 | 11266 | } |
---|
10959 | 11267 | |
---|
10960 | 11268 | //if (selection_view == -1) |
---|
.. | .. |
---|
11137 | 11445 | |
---|
11138 | 11446 | gl.glMatrixMode(GL.GL_MODELVIEW); |
---|
11139 | 11447 | |
---|
11140 | | -gl.glEnable(gl.GL_POLYGON_SMOOTH); |
---|
11141 | | -gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST); |
---|
11142 | | -gl.glEnable(gl.GL_MULTISAMPLE); |
---|
| 11448 | +//gl.glEnable(gl.GL_POLYGON_SMOOTH); |
---|
| 11449 | +//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST); |
---|
| 11450 | +//gl.glEnable(gl.GL_MULTISAMPLE); |
---|
11143 | 11451 | } else |
---|
11144 | 11452 | { |
---|
11145 | 11453 | //gl.glDisable(GL.GL_TEXTURE_2D); |
---|
.. | .. |
---|
11200 | 11508 | //gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000); |
---|
11201 | 11509 | } else |
---|
11202 | 11510 | { |
---|
11203 | | - glu.gluPerspective(cam.shaper_fovy / ratio, ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance()); |
---|
| 11511 | + boolean vr = capsLocked && !lightMode; |
---|
| 11512 | + |
---|
| 11513 | + glu.gluPerspective(cam.shaper_fovy / ratio * (vr ? 1.2 : 1), |
---|
| 11514 | + ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance()); |
---|
11204 | 11515 | } |
---|
11205 | 11516 | } |
---|
11206 | 11517 | |
---|
.. | .. |
---|
11240 | 11551 | |
---|
11241 | 11552 | // if (cam != lightCamera) |
---|
11242 | 11553 | //for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
11243 | | - LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013 |
---|
| 11554 | + LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013 |
---|
11244 | 11555 | } |
---|
11245 | 11556 | |
---|
11246 | 11557 | LA.xformDir(lightposition, cam.toScreen, lightposition); |
---|
.. | .. |
---|
11399 | 11710 | } |
---|
11400 | 11711 | } |
---|
11401 | 11712 | |
---|
11402 | | - if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion) |
---|
| 11713 | + if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion) |
---|
11403 | 11714 | { |
---|
11404 | 11715 | //gl.glDepthFunc(GL.GL_LEQUAL); |
---|
11405 | 11716 | //gl.glClear(gl.GL_COLOR_BUFFER_BIT | gl.GL_DEPTH_BUFFER_BIT); |
---|
.. | .. |
---|
11407 | 11718 | |
---|
11408 | 11719 | boolean texon = textureon; |
---|
11409 | 11720 | |
---|
11410 | | - if (RENDERPROGRAM > 0) |
---|
11411 | | - { |
---|
11412 | | - gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB); |
---|
11413 | | - textureon = false; |
---|
11414 | | - } |
---|
| 11721 | + gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB); |
---|
| 11722 | + textureon = false; |
---|
| 11723 | + |
---|
11415 | 11724 | //gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB); |
---|
11416 | 11725 | //System.out.println("ALLO"); |
---|
11417 | 11726 | gl.glColorMask(false, false, false, false); |
---|
11418 | 11727 | DrawObject(gl); |
---|
11419 | | - if (RENDERPROGRAM > 0) |
---|
11420 | | - { |
---|
11421 | | - gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB); |
---|
11422 | | - textureon = texon; |
---|
11423 | | - } |
---|
| 11728 | + |
---|
| 11729 | + gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB); |
---|
| 11730 | + textureon = texon; |
---|
| 11731 | + |
---|
11424 | 11732 | gl.glColorMask(true, true, true, true); |
---|
11425 | 11733 | |
---|
11426 | 11734 | gl.glDepthFunc(GL.GL_EQUAL); |
---|
11427 | | - //gl.glDepthMask(false); |
---|
| 11735 | + gl.glDepthMask(false); |
---|
11428 | 11736 | } |
---|
11429 | 11737 | |
---|
11430 | 11738 | if (false) // DrawMode() == SHADOW) |
---|
.. | .. |
---|
11559 | 11867 | repaint(); |
---|
11560 | 11868 | } |
---|
11561 | 11869 | |
---|
11562 | | - if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013 |
---|
| 11870 | + if (Globals.isLIVE() && DrawMode() == DEFAULT || pingthread.live) // may 2013 |
---|
| 11871 | + { |
---|
| 11872 | + renderCamera.computeTransform(); |
---|
11563 | 11873 | repaint(); |
---|
| 11874 | + } |
---|
11564 | 11875 | |
---|
11565 | 11876 | displaydone = true; |
---|
11566 | 11877 | } |
---|
.. | .. |
---|
11635 | 11946 | //GL gl = getGL(); |
---|
11636 | 11947 | if ((TRACK || SHADOWTRACK) || zoomonce) |
---|
11637 | 11948 | { |
---|
| 11949 | + if (TRACK) |
---|
| 11950 | + { |
---|
| 11951 | + if (object.selection != null && |
---|
| 11952 | + object.selection.size() > 0 && |
---|
| 11953 | + object.selection.elementAt(0) != null && |
---|
| 11954 | + !(object.selection.elementAt(0) instanceof Camera) && |
---|
| 11955 | + !(object.selection.elementAt(0) instanceof ScriptNode)) |
---|
| 11956 | + { |
---|
| 11957 | + trackedobject = object.selection.elementAt(0); |
---|
| 11958 | + //repaint(); |
---|
| 11959 | + } |
---|
| 11960 | + else |
---|
| 11961 | + trackedobject = null; |
---|
| 11962 | + } |
---|
11638 | 11963 | if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode) |
---|
11639 | 11964 | object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK); |
---|
11640 | | - pingthread.StepToTarget(true); // true); |
---|
| 11965 | + pingthread.StepToTarget(); // true); |
---|
11641 | 11966 | // zoomonce = false; |
---|
11642 | 11967 | } |
---|
11643 | 11968 | |
---|
.. | .. |
---|
12317 | 12642 | |
---|
12318 | 12643 | //gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0); |
---|
12319 | 12644 | |
---|
12320 | | - String program = |
---|
| 12645 | + String programmin = |
---|
| 12646 | + // Min shader |
---|
12321 | 12647 | "!!ARBfp1.0\n" + |
---|
| 12648 | + "PARAM zero12t = { 0.0, 1.0, 2, 1.25 };" + |
---|
| 12649 | + "PARAM pow_2 = { 0.5, 0.25, 0.125, 0.0 };" + |
---|
| 12650 | + "PARAM pow2 = { 2, 4, 8, 0.0 };" + |
---|
| 12651 | + "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" + |
---|
| 12652 | + "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" + |
---|
| 12653 | + "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" + |
---|
| 12654 | + "PARAM light2cam0 = program.env[10];" + |
---|
| 12655 | + "PARAM light2cam1 = program.env[11];" + |
---|
| 12656 | + "PARAM light2cam2 = program.env[12];" + |
---|
| 12657 | + "TEMP temp;" + |
---|
| 12658 | + "TEMP light;" + |
---|
| 12659 | + "TEMP ndotl;" + |
---|
| 12660 | + "TEMP normal;" + |
---|
| 12661 | + "TEMP depth;" + |
---|
| 12662 | + "TEMP eye;" + |
---|
| 12663 | + "TEMP pos;" + |
---|
| 12664 | + |
---|
| 12665 | + "MAD normal, fragment.color, zero12t.z, -zero12t.y;" + |
---|
| 12666 | + Normalize("normal") + |
---|
| 12667 | + "MOV light, state.light[0].position;" + |
---|
| 12668 | + "DP3 ndotl.x, light, normal;" + |
---|
| 12669 | + "MAX ndotl.x, ndotl.x, zero12t.x;" + |
---|
| 12670 | + |
---|
| 12671 | + // shadow |
---|
| 12672 | + "MOV pos, fragment.texcoord[1];" + |
---|
| 12673 | + "MOV temp, pos;" + |
---|
| 12674 | + ShadowTextureFetch("depth", "temp", "1") + |
---|
| 12675 | + //"TEX depth, fragment.texcoord[1], texture[1], 2D;" + |
---|
| 12676 | + "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" + |
---|
| 12677 | + |
---|
| 12678 | + // No shadow when out of frustum |
---|
| 12679 | + //"SGE temp.y, depth.z, zero123.y;" + |
---|
| 12680 | + //"LRP temp.x, temp.y, zero123.y, temp.x;" + |
---|
| 12681 | + |
---|
| 12682 | + "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow |
---|
| 12683 | + |
---|
| 12684 | + // Backlit |
---|
| 12685 | + "MOV pos.w, zero12t.y;" + // one |
---|
| 12686 | + "DP4 eye.x, pos, light2cam0;" + |
---|
| 12687 | + "DP4 eye.y, pos, light2cam1;" + |
---|
| 12688 | + "DP4 eye.z, pos, light2cam2;" + |
---|
| 12689 | + Normalize("eye") + |
---|
| 12690 | + |
---|
| 12691 | + "DP3 ndotl.y, -eye, normal;" + |
---|
| 12692 | + //"MUL ndotl.y, ndotl.y, pow2.x;" + |
---|
| 12693 | + "POW ndotl.y, ndotl.y, pow2.x;" + // backlit |
---|
| 12694 | + "SUB ndotl.y, zero12t.y, ndotl.y;" + // 1 - y |
---|
| 12695 | + //"POW ndotl.y, ndotl.y, pow2.z;" + // backlit |
---|
| 12696 | + //"SUB ndotl.y, zero123.y, ndotl.y;" + |
---|
| 12697 | + //"MUL ndotl.y, ndotl.y, pow2.z;" + |
---|
| 12698 | + "ADD ndotl.y, ndotl.y, one.x;" + |
---|
| 12699 | + "MUL ndotl.y, ndotl.y, pow_2.x;" + |
---|
| 12700 | + |
---|
| 12701 | + //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient |
---|
| 12702 | + //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient |
---|
| 12703 | + |
---|
| 12704 | + // Pigment |
---|
| 12705 | + "TEX temp, fragment.texcoord[0], texture[0], 2D;" + |
---|
| 12706 | + "LRP temp, zero12t.w, temp, one;" + // texture proportion |
---|
| 12707 | + "MUL temp, temp, zero12t.w;" + // Times x |
---|
| 12708 | + |
---|
| 12709 | + //"MUL temp, temp, ndotl.y;" + |
---|
| 12710 | + "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" + |
---|
| 12711 | + |
---|
| 12712 | + "MUL temp, temp, ndotl.x;" + // lambert |
---|
| 12713 | + |
---|
| 12714 | + "MOV temp.w, zero12t.y;" + // reset alpha |
---|
| 12715 | + "MOV result.color, temp;" + |
---|
| 12716 | + "END"; |
---|
| 12717 | + |
---|
| 12718 | + String programmax = |
---|
| 12719 | + "!!ARBfp1.0\n" + |
---|
| 12720 | + |
---|
12322 | 12721 | //"OPTION ARB_fragment_program_shadow;" + |
---|
12323 | 12722 | "PARAM light2cam0 = program.env[10];" + |
---|
12324 | 12723 | "PARAM light2cam1 = program.env[11];" + |
---|
.. | .. |
---|
12344 | 12743 | "PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow |
---|
12345 | 12744 | "PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias |
---|
12346 | 12745 | "PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough |
---|
12347 | | - "PARAM params7 = program.env[7];" + // noise power, opacity power |
---|
| 12746 | + "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax |
---|
12348 | 12747 | "PARAM options0 = program.env[63];" + // fog density, intensity, elevation |
---|
12349 | 12748 | "PARAM options1 = program.env[62];" + // fog rgb color |
---|
12350 | 12749 | "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen |
---|
.. | .. |
---|
12433 | 12832 | "TEMP shininess;" + |
---|
12434 | 12833 | "\n" + |
---|
12435 | 12834 | "MOV texSamp, one;" + |
---|
12436 | | - //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" + |
---|
12437 | | - |
---|
| 12835 | + |
---|
12438 | 12836 | "MOV mapgrid.x, one2048th.x;" + |
---|
12439 | 12837 | "MOV temp, fragment.texcoord[1];" + |
---|
12440 | 12838 | /* |
---|
.. | .. |
---|
12455 | 12853 | "MUL temp, floor, mapgrid.x;" + |
---|
12456 | 12854 | //"TEX depth0, temp, texture[1], 2D;" + |
---|
12457 | 12855 | (((mode & FP_SOFTSHADOW) == 0) ? "" : |
---|
12458 | | - TextureFetch("depth0", "temp", "1") + |
---|
| 12856 | + ShadowTextureFetch("depth0", "temp", "1") + |
---|
12459 | 12857 | "") + |
---|
12460 | 12858 | "ADD temp.x, temp.x, mapgrid.x;" + |
---|
12461 | 12859 | //"TEX depth1, temp, texture[1], 2D;" + |
---|
12462 | 12860 | (((mode & FP_SOFTSHADOW) == 0) ? "" : |
---|
12463 | | - TextureFetch("depth1", "temp", "1") + |
---|
| 12861 | + ShadowTextureFetch("depth1", "temp", "1") + |
---|
12464 | 12862 | "") + |
---|
12465 | 12863 | "ADD temp.y, temp.y, mapgrid.x;" + |
---|
12466 | 12864 | //"TEX depth2, temp, texture[1], 2D;" + |
---|
12467 | | - TextureFetch("depth2", "temp", "1") + |
---|
| 12865 | + ShadowTextureFetch("depth2", "temp", "1") + |
---|
12468 | 12866 | "SUB temp.x, temp.x, mapgrid.x;" + |
---|
12469 | 12867 | //"TEX depth3, temp, texture[1], 2D;" + |
---|
12470 | 12868 | (((mode & FP_SOFTSHADOW) == 0) ? "" : |
---|
12471 | | - TextureFetch("depth3", "temp", "1") + |
---|
| 12869 | + ShadowTextureFetch("depth3", "temp", "1") + |
---|
12472 | 12870 | "") + |
---|
12473 | 12871 | //"MUL texSamp0, texSamp0, state.material.front.diffuse;" + |
---|
12474 | 12872 | //"MOV params, material;" + |
---|
.. | .. |
---|
12590 | 12988 | "POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut |
---|
12591 | 12989 | // mar 2013 ??? "KIL alpha.a;" + |
---|
12592 | 12990 | "MOV alpha, texSamp.aaaa;" + // y;" + |
---|
12593 | | - "KIL alpha.a;" + |
---|
| 12991 | + "KIL alpha.a;" + // not sure with parallax mapping |
---|
12594 | 12992 | /* |
---|
12595 | 12993 | "MUL temp.xy, temp, two;" + |
---|
12596 | 12994 | "TXB bump, temp, texture[0], 2D;" + |
---|
.. | .. |
---|
12676 | 13074 | "SUB bump0, bump0, half;" + |
---|
12677 | 13075 | "ADD bump, bump, bump0;" + |
---|
12678 | 13076 | |
---|
12679 | | - "MOV temp.x, texSamp.a;" + |
---|
12680 | | - "LRP texSamp, params5.x, texSamp, one;" + // texture proportion |
---|
12681 | | - //"LRP texSamp0, params5.x, texSamp0, one;" + |
---|
12682 | | - "MOV texSamp.a, temp.x;" + |
---|
12683 | | - |
---|
12684 | 13077 | // double-sided |
---|
12685 | 13078 | /**/ |
---|
12686 | 13079 | (doublesided?"DP3 temp.z, normal, eye;" + |
---|
.. | .. |
---|
12690 | 13083 | "ADD temp.x, temp.x, one.x;" + |
---|
12691 | 13084 | "MUL normal, normal, temp.xxxx;":"" |
---|
12692 | 13085 | ) + |
---|
12693 | | - /**/ |
---|
12694 | | -//// Normalize("normal") + |
---|
12695 | | -//// "MAX normal.z, eps.x, normal.z;" + |
---|
12696 | | -// Normalize("normal") + |
---|
12697 | | - "MOV normald, normal;" + |
---|
12698 | | - "MOV normals, normal;" + |
---|
| 13086 | + /**/ |
---|
| 13087 | + |
---|
| 13088 | + "MOV temp, fragment.texcoord[4];" + |
---|
12699 | 13089 | |
---|
12700 | 13090 | // UV base |
---|
12701 | 13091 | //"DP3 UP.x,state.matrix.modelview.row[0],Y;" + |
---|
12702 | 13092 | //"DP3 UP.y,state.matrix.modelview.row[1],Y;" + |
---|
12703 | 13093 | //"DP3 UP.z,state.matrix.modelview.row[2],Y;" + |
---|
12704 | | - "DP3 UP.x,state.matrix.texture[7].row[0],Y;" + |
---|
12705 | | - "DP3 UP.y,state.matrix.texture[7].row[1],Y;" + |
---|
12706 | | - "DP3 UP.z,state.matrix.texture[7].row[2],Y;" + |
---|
| 13094 | + "DP3 UP.x,state.matrix.texture[7].row[0],temp;" + |
---|
| 13095 | + "DP3 UP.y,state.matrix.texture[7].row[1],temp;" + |
---|
| 13096 | + "DP3 UP.z,state.matrix.texture[7].row[2],temp;" + |
---|
| 13097 | + Normalize("UP") + |
---|
| 13098 | + |
---|
12707 | 13099 | "XPD V, normal, UP;" + |
---|
12708 | 13100 | Normalize("V") + |
---|
12709 | 13101 | "XPD U, V, normal;" + |
---|
12710 | 13102 | Normalize("U") + |
---|
12711 | 13103 | |
---|
| 13104 | + "MOV temp, fragment.texcoord[0];" + |
---|
| 13105 | + |
---|
| 13106 | +// "MAD normal, -temp.x, U, normal;" + |
---|
| 13107 | +// "MAD normal, -temp.y, V, normal;" + |
---|
| 13108 | +// Normalize("normal") + |
---|
| 13109 | + |
---|
| 13110 | +//// "MAX normal.z, eps.x, normal.z;" + |
---|
| 13111 | +// Normalize("normal") + |
---|
| 13112 | + "MOV normald, normal;" + |
---|
| 13113 | + "MOV normals, normal;" + |
---|
| 13114 | + |
---|
12712 | 13115 | // parallax mapping |
---|
| 13116 | + |
---|
| 13117 | + "DP3 temp2.x, V, eye;" + |
---|
| 13118 | + "DP3 temp2.y, U, eye;" + |
---|
| 13119 | + "DP3 temp2.z, normal, eye;" + |
---|
| 13120 | + "RCP temp2.z, temp2.z;" + |
---|
| 13121 | + |
---|
| 13122 | + "DP3 temp2.w, texSamp, texSamp;" + // Height |
---|
| 13123 | + "RSQ temp2.w, temp2.w;" + |
---|
| 13124 | + "RCP temp2.w, temp2.w;" + |
---|
| 13125 | + |
---|
| 13126 | + "SUB temp2.w, temp2.w, half;" + |
---|
| 13127 | + // "SGE temp.x, temp2.w, eps.x;" + |
---|
| 13128 | + // "MUL temp2.w, temp2.w, temp.x;" + |
---|
| 13129 | + |
---|
| 13130 | + // "MOV texSamp, U;" + |
---|
| 13131 | + |
---|
| 13132 | + "MUL temp2.z, temp2.z, temp2.w;" + |
---|
| 13133 | + "MUL temp2.z, temp2.z, params7.z;" + // parallax |
---|
| 13134 | + |
---|
| 13135 | + "MUL temp2, temp2, temp2.z;" + |
---|
| 13136 | + |
---|
| 13137 | + "SUB temp, temp, temp2;" + |
---|
| 13138 | + |
---|
| 13139 | + "TEX temp, temp, texture[0], 2D;" + |
---|
| 13140 | + "POW temp.a, temp.a, params6.w;" + // punch through |
---|
| 13141 | + |
---|
| 13142 | + "ADD texSamp, temp, texSamp;" + |
---|
| 13143 | + "MUL texSamp.xyz, half, texSamp;" + |
---|
| 13144 | + |
---|
| 13145 | + "MOV alpha, texSamp.aaaa;" + |
---|
| 13146 | + |
---|
| 13147 | +// parallax mapping |
---|
| 13148 | + |
---|
| 13149 | + "MOV temp.x, texSamp.a;" + |
---|
| 13150 | + "LRP texSamp, params5.x, texSamp, one;" + // texture proportion |
---|
| 13151 | + //"LRP texSamp0, params5.x, texSamp0, one;" + |
---|
| 13152 | + "MOV texSamp.a, temp.x;" + |
---|
12713 | 13153 | |
---|
12714 | 13154 | //"MOV temp, fragment.texcoord[0];" + |
---|
12715 | 13155 | // |
---|
.. | .. |
---|
12839 | 13279 | "MAD shadow.x, buffer.x, frac.y, shadow.x;" + |
---|
12840 | 13280 | "") + |
---|
12841 | 13281 | |
---|
12842 | | - // display shadow only (bump == 0) |
---|
| 13282 | + // display shadow only (fakedepth == 0) |
---|
12843 | 13283 | "SUB temp.x, half.x, shadow.x;" + |
---|
12844 | 13284 | "MOV temp.y, -params5.z;" + // params6.x;" + |
---|
12845 | | - "SLT temp.z, temp.y, -one2048th.x;" + |
---|
| 13285 | + "SLT temp.z, temp.y, -c256i.x;" + |
---|
12846 | 13286 | "SUB temp.y, one.x, temp.z;" + |
---|
12847 | 13287 | "MUL temp.x, temp.x, temp.y;" + |
---|
12848 | 13288 | "KIL temp.x;" + |
---|
.. | .. |
---|
13173 | 13613 | //once = true; |
---|
13174 | 13614 | } |
---|
13175 | 13615 | |
---|
13176 | | - System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length()); |
---|
13177 | | - System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : "")); |
---|
| 13616 | + String program = programmax; |
---|
| 13617 | + |
---|
| 13618 | + if (Globals.MINSHADER) |
---|
| 13619 | + { |
---|
| 13620 | + program = programmin; |
---|
| 13621 | + } |
---|
| 13622 | + |
---|
| 13623 | + if (Globals.DEBUG) |
---|
| 13624 | + { |
---|
| 13625 | + System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length()); |
---|
| 13626 | + System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : "")); |
---|
| 13627 | + } |
---|
| 13628 | + |
---|
13178 | 13629 | loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program); |
---|
13179 | 13630 | |
---|
13180 | 13631 | //gl.glNewList(displayListID, GL.GL_COMPILE); |
---|
.. | .. |
---|
13221 | 13672 | "\n" + |
---|
13222 | 13673 | "END\n"; |
---|
13223 | 13674 | |
---|
13224 | | - System.out.println("Program shadow #" + 0 + "; length = " + program.length()); |
---|
| 13675 | + if (Globals.DEBUG) |
---|
| 13676 | + System.out.println("Program shadow #" + 0 + "; length = " + program.length()); |
---|
13225 | 13677 | loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program); |
---|
13226 | 13678 | |
---|
13227 | 13679 | //gl.glNewList(displayListID, GL.GL_COMPILE); |
---|
.. | .. |
---|
13266 | 13718 | return out; |
---|
13267 | 13719 | } |
---|
13268 | 13720 | |
---|
13269 | | - String TextureFetch(String dest, String src, String unit) |
---|
| 13721 | + // Also does frustum culling |
---|
| 13722 | + String ShadowTextureFetch(String dest, String src, String unit) |
---|
13270 | 13723 | { |
---|
13271 | 13724 | return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" + |
---|
13272 | 13725 | "SGE " + src + ".w, " + src + ".x, eps.x;" + |
---|
13273 | 13726 | "SGE " + src + ".z, " + src + ".y, eps.x;" + |
---|
| 13727 | + "SLT " + dest + ".x, " + src + ".x, one.x;" + |
---|
| 13728 | + "SLT " + dest + ".y, " + src + ".y, one.x;" + |
---|
13274 | 13729 | "MUL " + src + ".w, " + src + ".z, " + src + ".w;" + |
---|
13275 | | - "SLT " + src + ".z, " + src + ".x, one.x;" + |
---|
13276 | | - "MUL " + src + ".w, " + src + ".z, " + src + ".w;" + |
---|
13277 | | - "SLT " + src + ".z, " + src + ".y, one.x;" + |
---|
13278 | | - "MUL " + src + ".w, " + src + ".z, " + src + ".w;" + |
---|
| 13730 | + "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" + |
---|
| 13731 | + "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" + |
---|
13279 | 13732 | //"SWZ buffer, temp, w,w,w,w;"; |
---|
13280 | | - "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" + |
---|
| 13733 | + //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" + |
---|
13281 | 13734 | "SUB " + src + ".z, " + "one.x, " + src + ".w;" + |
---|
13282 | 13735 | //"MUL " + src + ".z, " + src + ".z, infinity.x;" + |
---|
13283 | 13736 | //"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;"; |
---|
13284 | | - "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;"; |
---|
| 13737 | + //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;"; |
---|
13285 | 13738 | |
---|
13286 | | - //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;"; |
---|
13287 | | - //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;"; |
---|
| 13739 | + //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;"; |
---|
| 13740 | + "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;"; |
---|
13288 | 13741 | } |
---|
13289 | 13742 | |
---|
13290 | 13743 | String Shadow(String depth, String shadow) |
---|
.. | .. |
---|
13331 | 13784 | "SLT temp.x, temp.x, zero.x;" + // shadoweps |
---|
13332 | 13785 | "LRP " + shadow + ", temp.x, one, " + shadow + ";" + |
---|
13333 | 13786 | |
---|
13334 | | - // No shadow when out of frustrum |
---|
| 13787 | + // No shadow when out of frustum |
---|
13335 | 13788 | "SGE temp.x, " + depth + ".z, one.z;" + |
---|
13336 | 13789 | "LRP " + shadow + ", temp.x, one, " + shadow + ";" + |
---|
13337 | 13790 | ""; |
---|
.. | .. |
---|
13478 | 13931 | /*static*/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow |
---|
13479 | 13932 | /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias |
---|
13480 | 13933 | /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough |
---|
13481 | | - /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power |
---|
| 13934 | + /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax |
---|
13482 | 13935 | |
---|
13483 | 13936 | //Object3D.cVector2[] vector2buffer; |
---|
13484 | 13937 | |
---|
.. | .. |
---|
13645 | 14098 | "PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" + |
---|
13646 | 14099 | "PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" + |
---|
13647 | 14100 | "PARAM half = { 0.5, 0.5, 0.5, 1.0 };" + |
---|
13648 | | - "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" + |
---|
| 14101 | + "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" + |
---|
13649 | 14102 | "PARAM two = { 2.0, 2.0, 2.0, 1.0 };" + |
---|
13650 | 14103 | "PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" + |
---|
13651 | 14104 | //"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" + |
---|
.. | .. |
---|
13706 | 14159 | "DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" + |
---|
13707 | 14160 | "DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" + |
---|
13708 | 14161 | "DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" + |
---|
13709 | | - //"MOV result.texcoord, vertex.texcoord;" + |
---|
| 14162 | + //"MOV result.texcoord, vertex.fogcoord;" + |
---|
13710 | 14163 | "MOV result.texcoord, temp;" + |
---|
13711 | 14164 | // border fade |
---|
13712 | 14165 | "MOV result.texcoord[3], vertex.texcoord;" + |
---|
.. | .. |
---|
13753 | 14206 | |
---|
13754 | 14207 | //"ADD temp.z, temp.z, one;" + |
---|
13755 | 14208 | |
---|
13756 | | - "MOV result.color, temp;" |
---|
| 14209 | + "MOV result.texcoord[4], vertex.attrib[4];" + // U dir |
---|
| 14210 | + |
---|
| 14211 | + "MOV result.color, temp;" // Normal |
---|
13757 | 14212 | : "MOV result.color, vertex.color;") + |
---|
13758 | 14213 | ((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;" |
---|
13759 | 14214 | : "") + |
---|
.. | .. |
---|
13888 | 14343 | public void mouseClicked(MouseEvent e) |
---|
13889 | 14344 | { |
---|
13890 | 14345 | System.out.println("mouseClicked: " + e); |
---|
| 14346 | + System.exit(0); |
---|
13891 | 14347 | } |
---|
13892 | 14348 | |
---|
13893 | 14349 | public void mousePressed(MouseEvent e) |
---|
.. | .. |
---|
13926 | 14382 | return; |
---|
13927 | 14383 | } |
---|
13928 | 14384 | |
---|
13929 | | - boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK); |
---|
| 14385 | + //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK); |
---|
| 14386 | + |
---|
| 14387 | + boolean vr = capsLocked && !lightMode; |
---|
13930 | 14388 | |
---|
13931 | 14389 | // TIMER |
---|
13932 | | - if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR |
---|
| 14390 | + if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR |
---|
13933 | 14391 | { |
---|
13934 | 14392 | keepboxmode = BOXMODE; |
---|
13935 | 14393 | keepsupport = SUPPORT; |
---|
.. | .. |
---|
13970 | 14428 | //} |
---|
13971 | 14429 | |
---|
13972 | 14430 | SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx()); |
---|
13973 | | - drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0); |
---|
| 14431 | + drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx()); |
---|
13974 | 14432 | anchorX = ax; |
---|
13975 | 14433 | anchorY = ay; |
---|
13976 | 14434 | prevX = px; |
---|
.. | .. |
---|
14065 | 14523 | // fev 2014??? |
---|
14066 | 14524 | if ((TRACK || SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode) |
---|
14067 | 14525 | object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK); |
---|
14068 | | - pingthread.StepToTarget(true); // true); |
---|
| 14526 | + pingthread.StepToTarget(); // true); |
---|
14069 | 14527 | } |
---|
| 14528 | + |
---|
14070 | 14529 | // if (!LIVE) |
---|
14071 | 14530 | super.repaint(); |
---|
14072 | 14531 | } |
---|
.. | .. |
---|
14129 | 14588 | drag = false; |
---|
14130 | 14589 | //System.out.println("Mouse DOWN"); |
---|
14131 | 14590 | editObj = false; |
---|
14132 | | - ClickInfo info = new ClickInfo(); |
---|
14133 | | - info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom)); |
---|
14134 | | - info.pane = this; |
---|
14135 | | - info.camera = renderCamera; |
---|
14136 | | - info.x = x; |
---|
14137 | | - info.y = y; |
---|
14138 | | - info.modifiers = modifiersex; |
---|
14139 | | - editObj = object.doEditClick(info, 0); |
---|
| 14591 | + //ClickInfo info = new ClickInfo(); |
---|
| 14592 | + object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom)); |
---|
| 14593 | + object.clickInfo.pane = this; |
---|
| 14594 | + object.clickInfo.camera = renderCamera; |
---|
| 14595 | + object.clickInfo.x = x; |
---|
| 14596 | + object.clickInfo.y = y; |
---|
| 14597 | + object.clickInfo.modifiers = modifiersex; |
---|
| 14598 | + editObj = object.doEditClick(//info, |
---|
| 14599 | + 0); |
---|
14140 | 14600 | if (!editObj) |
---|
14141 | 14601 | { |
---|
14142 | 14602 | hasMarquee = true; |
---|
.. | .. |
---|
14160 | 14620 | |
---|
14161 | 14621 | //if (drawing) |
---|
14162 | 14622 | //return; |
---|
14163 | | - if ((e.getModifiersEx() & CTRL) != 0 |
---|
14164 | | - || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen()) |
---|
| 14623 | + if ((e.getModifiersEx() & CTRL) != 0 || |
---|
| 14624 | + (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen()) |
---|
14165 | 14625 | { |
---|
14166 | 14626 | //System.out.println("mouseDragged: " + e); |
---|
14167 | 14627 | clickEnd(e.getX(), e.getY(), e.getModifiersEx()); |
---|
.. | .. |
---|
14185 | 14645 | return targetLookAt; |
---|
14186 | 14646 | } |
---|
14187 | 14647 | |
---|
| 14648 | + javax.vecmath.Point3d eye = new javax.vecmath.Point3d(); |
---|
| 14649 | + javax.vecmath.Point3d eye2 = new javax.vecmath.Point3d(); |
---|
| 14650 | + javax.vecmath.Vector3d dir = new javax.vecmath.Vector3d(); |
---|
| 14651 | + |
---|
| 14652 | + |
---|
14188 | 14653 | class PingThread extends Thread |
---|
14189 | 14654 | { |
---|
14190 | 14655 | boolean jump; |
---|
| 14656 | + boolean live; |
---|
| 14657 | + |
---|
| 14658 | + boolean mute = false; |
---|
14191 | 14659 | |
---|
14192 | 14660 | // void JumpToTarget() |
---|
14193 | 14661 | // { |
---|
.. | .. |
---|
14203 | 14671 | // only one thread!? synchronized |
---|
14204 | 14672 | void StepToTarget(boolean jump) |
---|
14205 | 14673 | { |
---|
| 14674 | + RigidBody.pos.x = 0; |
---|
| 14675 | + RigidBody.pos.y = 0; |
---|
| 14676 | + RigidBody.pos.z = 0; |
---|
| 14677 | + if (RigidBody.justclicked) |
---|
| 14678 | + { |
---|
| 14679 | +// RigidBody.pos.x = (float)manipCamera.lookAt.x; |
---|
| 14680 | +// RigidBody.pos.y = (float)manipCamera.lookAt.y; |
---|
| 14681 | +// RigidBody.pos.z = (float)manipCamera.lookAt.z; |
---|
| 14682 | + // System.err.println("selected point = " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][1]) + " " + Trunk(selectedpoint.toParent[3][2])); |
---|
| 14683 | + CreateSelectedPoint(); |
---|
| 14684 | + |
---|
| 14685 | + RigidBody.pos.x = (float)selectedpoint.toParent[3][0]; |
---|
| 14686 | + RigidBody.pos.y = (float)selectedpoint.toParent[3][1]; |
---|
| 14687 | + RigidBody.pos.z = (float)selectedpoint.toParent[3][2]; |
---|
| 14688 | + |
---|
| 14689 | + RigidBody.wind.set(RigidBody.pos); |
---|
| 14690 | + RigidBody.wind.x -= (float)manipCamera.location.x; |
---|
| 14691 | + RigidBody.wind.y -= (float)manipCamera.location.y; |
---|
| 14692 | + RigidBody.wind.z -= (float)manipCamera.location.z; |
---|
| 14693 | + RigidBody.wind.normalize(); |
---|
| 14694 | + } |
---|
| 14695 | + |
---|
| 14696 | + if (mute) |
---|
| 14697 | + return; |
---|
| 14698 | + |
---|
| 14699 | + if (capsLocked && manipCamera.viewCode == 0) |
---|
| 14700 | + { |
---|
| 14701 | + eye.x = manipCamera.location.x; |
---|
| 14702 | + eye.y = manipCamera.location.y + 0.25; |
---|
| 14703 | + eye.z = manipCamera.location.z; |
---|
| 14704 | + |
---|
| 14705 | + dir.y = -1; |
---|
| 14706 | + |
---|
| 14707 | + Ray ray = new Ray(eye, dir); |
---|
| 14708 | + |
---|
| 14709 | + IntersectResult res = new IntersectResult(); |
---|
| 14710 | + res.t = Double.POSITIVE_INFINITY; |
---|
| 14711 | + |
---|
| 14712 | + tmp.set(targetLookAt); |
---|
| 14713 | + tmp.sub(manipCamera.location); |
---|
| 14714 | + |
---|
| 14715 | + double dist = tmp.length(); |
---|
| 14716 | + |
---|
| 14717 | + tmp.normalize(); |
---|
| 14718 | + |
---|
| 14719 | + eye2.x = manipCamera.location.x + tmp.x * 0.25; |
---|
| 14720 | + eye2.y = manipCamera.location.y + 0.25; |
---|
| 14721 | + eye2.z = manipCamera.location.z + tmp.z * 0.25; |
---|
| 14722 | + |
---|
| 14723 | + Ray ray2 = new Ray(eye2, dir); |
---|
| 14724 | + |
---|
| 14725 | + IntersectResult res2 = new IntersectResult(); |
---|
| 14726 | + res2.t = Double.POSITIVE_INFINITY; |
---|
| 14727 | + |
---|
| 14728 | + if (object.intersect(ray, res) && object.intersect(ray2, res2) && Math.abs(res.t - res2.t) < 0.25) |
---|
| 14729 | + { |
---|
| 14730 | + //tmp.set(manipCamera.location); |
---|
| 14731 | + |
---|
| 14732 | + manipCamera.location.x = ray.eyePoint.x + ray.viewDirection.x * res.t; |
---|
| 14733 | + manipCamera.location.y = ray.eyePoint.y + ray.viewDirection.y * res.t + 0.5; |
---|
| 14734 | + manipCamera.location.z = ray.eyePoint.z + ray.viewDirection.z * res.t; |
---|
| 14735 | + |
---|
| 14736 | + //tmp.sub(manipCamera.location); |
---|
| 14737 | + |
---|
| 14738 | + targetLookAt.x = ray2.eyePoint.x + ray2.viewDirection.x * res2.t; |
---|
| 14739 | + targetLookAt.y = ray2.eyePoint.y + ray2.viewDirection.y * res2.t + 0.5; |
---|
| 14740 | + targetLookAt.z = ray2.eyePoint.z + ray2.viewDirection.z * res2.t; |
---|
| 14741 | + |
---|
| 14742 | + targetLookAt.sub(manipCamera.location); |
---|
| 14743 | + targetLookAt.normalize(); |
---|
| 14744 | + targetLookAt.mul(dist); |
---|
| 14745 | + targetLookAt.add(manipCamera.location); |
---|
| 14746 | + |
---|
| 14747 | + //if (tmp.dot(tmp) > 0.000001) |
---|
| 14748 | + // System.out.println("INTERSECTION " + manipCamera.location); |
---|
| 14749 | + |
---|
| 14750 | + manipCamera.lookAt.set(targetLookAt); |
---|
| 14751 | + |
---|
| 14752 | + tmp.x = res.n.x; |
---|
| 14753 | + tmp.y = res.n.y; |
---|
| 14754 | + tmp.z = res.n.z; |
---|
| 14755 | + tmp.x += res2.n.x; |
---|
| 14756 | + tmp.y += res2.n.y; |
---|
| 14757 | + tmp.z += res2.n.z; |
---|
| 14758 | + tmp.normalize(); |
---|
| 14759 | + manipCamera.UP.set(tmp); |
---|
| 14760 | + } |
---|
| 14761 | + } |
---|
| 14762 | + |
---|
14206 | 14763 | tmp.set(targetLookAt); |
---|
14207 | 14764 | tmp.sub(manipCamera.lookAt); // june 2014 |
---|
14208 | 14765 | |
---|
.. | .. |
---|
14240 | 14797 | |
---|
14241 | 14798 | if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target |
---|
14242 | 14799 | { |
---|
14243 | | - jump = true; // step = 1; |
---|
| 14800 | + // sep 2019 jump = true; // step = 1; |
---|
14244 | 14801 | } |
---|
14245 | 14802 | |
---|
14246 | 14803 | if (OEILONCE && OEIL) |
---|
.. | .. |
---|
14275 | 14832 | if (tmp.dot(tmp) < 0.00001) |
---|
14276 | 14833 | { |
---|
14277 | 14834 | zoomonce = false; |
---|
| 14835 | + live = false; |
---|
14278 | 14836 | } |
---|
| 14837 | + else |
---|
| 14838 | + live = true; |
---|
14279 | 14839 | |
---|
14280 | 14840 | tmp.mul(step > step2 ? step : step2); |
---|
14281 | 14841 | } |
---|
.. | .. |
---|
14302 | 14862 | { |
---|
14303 | 14863 | if (LOOKAT) |
---|
14304 | 14864 | manipCamera.lookAt.add(tmp); |
---|
14305 | | - if (OEIL) |
---|
| 14865 | + if (OEIL && !capsLocked) |
---|
14306 | 14866 | manipCamera.location.add(tmp); |
---|
14307 | 14867 | |
---|
14308 | 14868 | { |
---|
.. | .. |
---|
14317 | 14877 | lightCamera.computeTransform(); |
---|
14318 | 14878 | } |
---|
14319 | 14879 | } |
---|
14320 | | - manipCamera.computeTransform(); |
---|
| 14880 | + if (tmp.x != 0 || tmp.y != 0 || tmp.z != 0) |
---|
| 14881 | + { |
---|
| 14882 | + manipCamera.computeTransform(); |
---|
| 14883 | + } |
---|
14321 | 14884 | } |
---|
14322 | 14885 | // ?????? mouseDown = true; |
---|
14323 | 14886 | //System.out.println("---------------- ---------- Paint " + tmp.length2()); |
---|
.. | .. |
---|
14410 | 14973 | } |
---|
14411 | 14974 | } |
---|
14412 | 14975 | } |
---|
| 14976 | + |
---|
14413 | 14977 | PingThread pingthread = new PingThread(); |
---|
14414 | | - int delta = 5; |
---|
14415 | | - int speed = 5; |
---|
| 14978 | + int delta = 1; |
---|
| 14979 | + int speed = 1; |
---|
| 14980 | + int walk = 8; |
---|
14416 | 14981 | boolean autorepeat = false; |
---|
14417 | 14982 | |
---|
| 14983 | + void Walk() |
---|
| 14984 | + { |
---|
| 14985 | + manipCamera.BackForth(0, walk, 1000); |
---|
| 14986 | + |
---|
| 14987 | + targetLookAt.set(manipCamera.lookAt); |
---|
| 14988 | + } |
---|
| 14989 | + |
---|
| 14990 | + void ViewAngle(float dy) |
---|
| 14991 | + { |
---|
| 14992 | + double factor = Math.exp(-dy/300.0); // (1 + dy/100); |
---|
| 14993 | + |
---|
| 14994 | + if (manipCamera.shaper_fovy * factor > 1 && |
---|
| 14995 | + manipCamera.shaper_fovy * factor < 150) |
---|
| 14996 | + { |
---|
| 14997 | + manipCamera.shaper_fovy *= factor; |
---|
| 14998 | + //System.out.println("fovy = " + shaper_fovy); |
---|
| 14999 | + } |
---|
| 15000 | + } |
---|
| 15001 | + |
---|
14418 | 15002 | void GoDown(int mod) |
---|
14419 | 15003 | { |
---|
14420 | 15004 | MODIFIERS |= COMMAND; |
---|
| 15005 | + boolean isVR = (mouseMode&VR)!=0; |
---|
14421 | 15006 | /**/ |
---|
14422 | 15007 | if((mod&SHIFT) == SHIFT) |
---|
14423 | | - manipCamera.RotatePosition(0, -speed); |
---|
14424 | | - else |
---|
14425 | | - manipCamera.BackForth(0, -speed*delta, 0); // getWidth()); |
---|
14426 | | - /**/ |
---|
14427 | | - if ((mod & SHIFT) == SHIFT) |
---|
14428 | 15008 | { |
---|
14429 | | - mouseMode = mouseMode; // VR?? |
---|
14430 | | - } else |
---|
14431 | | - { |
---|
14432 | | - mouseMode |= BACKFORTH; |
---|
| 15009 | +// if (isVR) |
---|
| 15010 | +// manipCamera.RotateInterest(0, speed); |
---|
| 15011 | +// else |
---|
| 15012 | + if (isVR) |
---|
| 15013 | + ViewAngle(-speed*delta); |
---|
| 15014 | + else |
---|
| 15015 | + manipCamera.Translate(0, -speed*delta, getWidth()); |
---|
14433 | 15016 | } |
---|
| 15017 | + else |
---|
| 15018 | + { |
---|
| 15019 | + if (isVR) |
---|
| 15020 | + manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth()); |
---|
| 15021 | + else |
---|
| 15022 | + manipCamera.RotatePosition(0, -speed); |
---|
| 15023 | + } |
---|
| 15024 | + |
---|
| 15025 | + /**/ |
---|
| 15026 | +// if ((mod & SHIFT) == SHIFT) |
---|
| 15027 | +// { |
---|
| 15028 | +// mouseMode = mouseMode; // VR?? |
---|
| 15029 | +// } else |
---|
| 15030 | +// { |
---|
| 15031 | +// mouseMode |= BACKFORTH; |
---|
| 15032 | +// } |
---|
14434 | 15033 | |
---|
| 15034 | + targetLookAt.set(manipCamera.lookAt); |
---|
| 15035 | + |
---|
14435 | 15036 | //prevX = X = anchorX; |
---|
14436 | 15037 | prevY = Y = anchorY - (int) (renderCamera.Distance()); |
---|
14437 | 15038 | } |
---|
14438 | 15039 | |
---|
14439 | 15040 | void GoUp(int mod) |
---|
14440 | 15041 | { |
---|
| 15042 | + RigidBody.justclicked = true; |
---|
| 15043 | + |
---|
14441 | 15044 | MODIFIERS |= COMMAND; |
---|
14442 | 15045 | /**/ |
---|
| 15046 | + boolean isVR = (mouseMode&VR)!=0; |
---|
| 15047 | + |
---|
14443 | 15048 | if((mod&SHIFT) == SHIFT) |
---|
14444 | | - manipCamera.RotatePosition(0, speed); |
---|
14445 | | - else |
---|
14446 | | - manipCamera.BackForth(0, speed*delta, 0); // getWidth()); |
---|
14447 | | - /**/ |
---|
14448 | | - if ((mod & SHIFT) == SHIFT) |
---|
14449 | 15049 | { |
---|
14450 | | - mouseMode = mouseMode; |
---|
14451 | | - } else |
---|
14452 | | - { |
---|
14453 | | - mouseMode |= BACKFORTH; |
---|
| 15050 | +// if (isVR) |
---|
| 15051 | +// manipCamera.RotateInterest(0, -speed); |
---|
| 15052 | +// else |
---|
| 15053 | + if (isVR) |
---|
| 15054 | + ViewAngle(speed*delta); |
---|
| 15055 | + else |
---|
| 15056 | + manipCamera.Translate(0, speed*delta, getWidth()); |
---|
14454 | 15057 | } |
---|
| 15058 | + else |
---|
| 15059 | + { |
---|
| 15060 | + if (isVR) |
---|
| 15061 | + manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth()); |
---|
| 15062 | + else |
---|
| 15063 | + manipCamera.RotatePosition(0, speed); |
---|
| 15064 | + } |
---|
| 15065 | + |
---|
| 15066 | + /**/ |
---|
| 15067 | +// if ((mod & SHIFT) == SHIFT) |
---|
| 15068 | +// { |
---|
| 15069 | +// mouseMode = mouseMode; |
---|
| 15070 | +// } else |
---|
| 15071 | +// { |
---|
| 15072 | +// mouseMode |= BACKFORTH; |
---|
| 15073 | +// } |
---|
14455 | 15074 | |
---|
| 15075 | + targetLookAt.set(manipCamera.lookAt); |
---|
| 15076 | + |
---|
14456 | 15077 | //prevX = X = anchorX; |
---|
14457 | 15078 | prevY = Y = anchorY + (int) (renderCamera.Distance()); |
---|
14458 | 15079 | } |
---|
.. | .. |
---|
14462 | 15083 | MODIFIERS |= COMMAND; |
---|
14463 | 15084 | /**/ |
---|
14464 | 15085 | if((mod&SHIFT) == SHIFT) |
---|
14465 | | - manipCamera.Translate(speed*delta, 0, getWidth()); |
---|
| 15086 | + manipCamera.Translate(speed, 0, getWidth()); |
---|
14466 | 15087 | else |
---|
14467 | | - manipCamera.RotatePosition(speed, 0); |
---|
| 15088 | + { |
---|
| 15089 | + if ((mouseMode&VR)!=0) |
---|
| 15090 | + manipCamera.RotateInterest(-speed*manipCamera.shaper_fovy/90, 0); |
---|
| 15091 | + else |
---|
| 15092 | + manipCamera.RotatePosition(speed*manipCamera.shaper_fovy/90, 0); |
---|
| 15093 | + } |
---|
| 15094 | + |
---|
14468 | 15095 | /**/ |
---|
14469 | | - if ((mod & SHIFT) == SHIFT) |
---|
14470 | | - { |
---|
14471 | | - mouseMode = mouseMode; |
---|
14472 | | - } else |
---|
14473 | | - { |
---|
14474 | | - mouseMode |= ROTATE; |
---|
14475 | | - } // TRANSLATE; |
---|
| 15096 | +// if ((mod & SHIFT) == SHIFT) |
---|
| 15097 | +// { |
---|
| 15098 | +// mouseMode = mouseMode; |
---|
| 15099 | +// } else |
---|
| 15100 | +// { |
---|
| 15101 | +// mouseMode |= ROTATE; |
---|
| 15102 | +// } // TRANSLATE; |
---|
14476 | 15103 | |
---|
| 15104 | + //System.err.println("lookAt = " + manipCamera.lookAt); |
---|
| 15105 | + //System.err.println("location = " + manipCamera.location); |
---|
| 15106 | + |
---|
| 15107 | + targetLookAt.set(manipCamera.lookAt); |
---|
| 15108 | + |
---|
14477 | 15109 | prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance()); |
---|
14478 | 15110 | prevY = Y = anchorY; |
---|
14479 | 15111 | } |
---|
.. | .. |
---|
14483 | 15115 | MODIFIERS |= COMMAND; |
---|
14484 | 15116 | /**/ |
---|
14485 | 15117 | if((mod&SHIFT) == SHIFT) |
---|
14486 | | - manipCamera.Translate(-speed*delta, 0, getWidth()); |
---|
| 15118 | + manipCamera.Translate(-speed, 0, getWidth()); |
---|
14487 | 15119 | else |
---|
14488 | | - manipCamera.RotatePosition(-speed, 0); |
---|
| 15120 | + { |
---|
| 15121 | + if ((mouseMode&VR)!=0) |
---|
| 15122 | + manipCamera.RotateInterest(speed*manipCamera.shaper_fovy/90, 0); |
---|
| 15123 | + else |
---|
| 15124 | + manipCamera.RotatePosition(-speed*manipCamera.shaper_fovy/90, 0); |
---|
| 15125 | + } |
---|
| 15126 | + |
---|
14489 | 15127 | /**/ |
---|
14490 | | - if ((mod & SHIFT) == SHIFT) |
---|
14491 | | - { |
---|
14492 | | - mouseMode = mouseMode; |
---|
14493 | | - } else |
---|
14494 | | - { |
---|
14495 | | - mouseMode |= ROTATE; |
---|
14496 | | - } // TRANSLATE; |
---|
| 15128 | +// if ((mod & SHIFT) == SHIFT) |
---|
| 15129 | +// { |
---|
| 15130 | +// mouseMode = mouseMode; |
---|
| 15131 | +// } else |
---|
| 15132 | +// { |
---|
| 15133 | +// mouseMode |= ROTATE; |
---|
| 15134 | +// } // TRANSLATE; |
---|
14497 | 15135 | |
---|
| 15136 | + targetLookAt.set(manipCamera.lookAt); |
---|
| 15137 | + |
---|
14498 | 15138 | prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance()); |
---|
14499 | 15139 | prevY = Y = anchorY; |
---|
14500 | 15140 | } |
---|
.. | .. |
---|
14536 | 15176 | if (editObj) |
---|
14537 | 15177 | { |
---|
14538 | 15178 | drag = true; |
---|
14539 | | - ClickInfo info = new ClickInfo(); |
---|
14540 | | - info.bounds.setBounds(0, 0, |
---|
| 15179 | + //ClickInfo info = new ClickInfo(); |
---|
| 15180 | + object.clickInfo.bounds.setBounds(0, 0, |
---|
14541 | 15181 | (int) (getBounds().width * zoom), (int) (getBounds().height * zoom)); |
---|
14542 | | - info.pane = this; |
---|
14543 | | - info.camera = renderCamera; |
---|
14544 | | - info.x = x; |
---|
14545 | | - info.y = y; |
---|
14546 | | - object.GetWindow().copy |
---|
14547 | | - .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0); |
---|
| 15182 | + object.clickInfo.pane = this; |
---|
| 15183 | + object.clickInfo.camera = renderCamera; |
---|
| 15184 | + object.clickInfo.x = x; |
---|
| 15185 | + object.clickInfo.y = y; |
---|
| 15186 | + object //.GetWindow().copy |
---|
| 15187 | + .doEditDrag(//info, |
---|
| 15188 | + (modifiers & MouseEvent.BUTTON3_MASK) != 0); |
---|
14548 | 15189 | } else |
---|
14549 | 15190 | { |
---|
14550 | 15191 | if (x < startX) |
---|
.. | .. |
---|
14627 | 15268 | if ((mouseMode & ZOOM) != 0) |
---|
14628 | 15269 | { |
---|
14629 | 15270 | //if ((mouseMode & BACKFORTH) != 0) |
---|
| 15271 | + if ((modifiersex & SHIFT) == SHIFT) |
---|
| 15272 | + { |
---|
| 15273 | + ViewAngle(dy); |
---|
| 15274 | + } |
---|
| 15275 | + else |
---|
14630 | 15276 | if ((mouseMode & VR) != 0) |
---|
14631 | 15277 | manipCamera.BackForth(dx, dy, getWidth()); |
---|
14632 | 15278 | else |
---|
.. | .. |
---|
14693 | 15339 | } |
---|
14694 | 15340 | } |
---|
14695 | 15341 | |
---|
| 15342 | +// ClickInfo clickInfo = new ClickInfo(); |
---|
| 15343 | + |
---|
14696 | 15344 | public void mouseMoved(MouseEvent e) |
---|
14697 | 15345 | { |
---|
| 15346 | +//object.editWindow.frame. |
---|
| 15347 | + setCursor(Cursor.getDefaultCursor()); |
---|
| 15348 | + |
---|
14698 | 15349 | //System.out.println("mouseMoved: " + e); |
---|
14699 | 15350 | if (isRenderer) |
---|
14700 | 15351 | return; |
---|
14701 | 15352 | |
---|
14702 | | - ClickInfo ci = new ClickInfo(); |
---|
14703 | | - ci.x = e.getX(); |
---|
14704 | | - ci.y = e.getY(); |
---|
14705 | | - ci.modifiers = e.getModifiersEx(); |
---|
14706 | | - ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom)); |
---|
14707 | | - ci.pane = this; |
---|
14708 | | - ci.camera = renderCamera; |
---|
| 15353 | + // Mouse cursor feedback |
---|
| 15354 | + object.clickInfo.x = e.getX(); |
---|
| 15355 | + object.clickInfo.y = e.getY(); |
---|
| 15356 | + object.clickInfo.modifiers = e.getModifiersEx(); |
---|
| 15357 | + object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom)); |
---|
| 15358 | + object.clickInfo.pane = this; |
---|
| 15359 | + object.clickInfo.camera = renderCamera; |
---|
14709 | 15360 | if (!isRenderer) |
---|
14710 | 15361 | { |
---|
14711 | 15362 | //ObjEditor editWindow = object.editWindow; |
---|
14712 | 15363 | //Object3D copy = editWindow.copy; |
---|
14713 | | - if (object.doEditClick(ci, 0)) |
---|
| 15364 | + if (object.doEditClick(//clickInfo, |
---|
| 15365 | + 0)) |
---|
14714 | 15366 | { |
---|
14715 | 15367 | setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); |
---|
14716 | 15368 | } else |
---|
.. | .. |
---|
14722 | 15374 | |
---|
14723 | 15375 | public void mouseReleased(MouseEvent e) |
---|
14724 | 15376 | { |
---|
| 15377 | + if (isRenderer && !movingcamera) |
---|
| 15378 | + { |
---|
| 15379 | + RigidBody.justclicked = true; |
---|
| 15380 | + System.out.println("justclicked: " + e); |
---|
| 15381 | + } |
---|
| 15382 | + |
---|
14725 | 15383 | Globals.MOUSEDRAGGED = false; |
---|
14726 | 15384 | |
---|
14727 | 15385 | movingcamera = false; |
---|
.. | .. |
---|
14878 | 15536 | mouseMode |= ZOOM; |
---|
14879 | 15537 | } |
---|
14880 | 15538 | |
---|
14881 | | - boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK); |
---|
14882 | | - if (capsLocked) // || (modifiers & META) == META) |
---|
| 15539 | + //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK); |
---|
| 15540 | + boolean vr = capsLocked && !lightMode; |
---|
| 15541 | + |
---|
| 15542 | + if (vr) // || (modifiers & META) == META) |
---|
14883 | 15543 | { |
---|
14884 | 15544 | mouseMode |= VR; // BACKFORTH; |
---|
14885 | 15545 | } |
---|
.. | .. |
---|
14891 | 15551 | { |
---|
14892 | 15552 | mouseMode |= SELECT; |
---|
14893 | 15553 | } |
---|
14894 | | - if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0) |
---|
| 15554 | + if (//(modifiersex & SHIFT) == SHIFT || |
---|
| 15555 | + forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0) |
---|
14895 | 15556 | { |
---|
14896 | 15557 | mouseMode &= ~VR; |
---|
14897 | 15558 | mouseMode |= TRANSLATE; |
---|
.. | .. |
---|
14935 | 15596 | float SATPOW = 1; // 2; // 0.5f; |
---|
14936 | 15597 | float BRIPOW = 1; // 0.5f; // 0.5f; |
---|
14937 | 15598 | |
---|
| 15599 | +static BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB); |
---|
| 15600 | + |
---|
| 15601 | +// Create a new blank cursor. |
---|
| 15602 | +static Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor( |
---|
| 15603 | + cursorImg, new Point(0, 0), "blank cursor"); |
---|
| 15604 | + |
---|
14938 | 15605 | public void keyPressed(int key) |
---|
14939 | 15606 | { |
---|
| 15607 | +// Set the blank cursor to the JFrame. |
---|
| 15608 | +//object.editWindow.frame. |
---|
| 15609 | + setCursor(blankCursor); |
---|
| 15610 | + |
---|
14940 | 15611 | if (key >= '0' && key <= '5') |
---|
14941 | 15612 | clampbit = (key-'0'); |
---|
14942 | 15613 | |
---|
.. | .. |
---|
14993 | 15664 | case 'K': |
---|
14994 | 15665 | KOMPACTTEXTURE ^= true; |
---|
14995 | 15666 | //textures.clear(); |
---|
14996 | | - break; |
---|
14997 | | - case 'P': // Texture Projection macros |
---|
| 15667 | + // break; |
---|
| 15668 | + //case 'P': // Texture Projection macros |
---|
14998 | 15669 | // SAVETEXTURE ^= true; |
---|
14999 | 15670 | macromode = true; |
---|
15000 | 15671 | Udebug = Vdebug = NORMALdebug = false; programInitialized = false; |
---|
.. | .. |
---|
15095 | 15766 | RevertCamera(); |
---|
15096 | 15767 | repaint(); |
---|
15097 | 15768 | break; |
---|
15098 | | - case 'l': |
---|
15099 | | - //case 'L': |
---|
| 15769 | + //case 'l': |
---|
| 15770 | + case 'L': |
---|
15100 | 15771 | if (lightMode) |
---|
15101 | 15772 | { |
---|
15102 | 15773 | lightMode = false; |
---|
.. | .. |
---|
15115 | 15786 | targetLookAt.set(manipCamera.lookAt); |
---|
15116 | 15787 | repaint(); |
---|
15117 | 15788 | break; |
---|
15118 | | - case 'p': |
---|
| 15789 | + case 'P': // p': |
---|
15119 | 15790 | // c'est quoi ca au juste? spherical ^= true; |
---|
15120 | 15791 | Skinshader ^= true; programInitialized = false; |
---|
15121 | 15792 | repaint(); |
---|
.. | .. |
---|
15126 | 15797 | break; |
---|
15127 | 15798 | case 'm': |
---|
15128 | 15799 | { |
---|
15129 | | - PrintMemory(); |
---|
| 15800 | + //PrintMemory(); |
---|
| 15801 | + ToggleImageFlip(); |
---|
15130 | 15802 | break; |
---|
15131 | 15803 | } |
---|
15132 | 15804 | case 'M': |
---|
.. | .. |
---|
15153 | 15825 | repaint(); |
---|
15154 | 15826 | break; |
---|
15155 | 15827 | case 'O': |
---|
15156 | | - Globals.drawMode = OCCLUSION; // WARNING |
---|
15157 | | - repaint(); |
---|
15158 | | - break; |
---|
| 15828 | + // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING |
---|
| 15829 | + //repaint(); |
---|
| 15830 | + //break; |
---|
15159 | 15831 | case 'o': |
---|
15160 | 15832 | OCCLUSION_CULLING ^= true; |
---|
15161 | 15833 | System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING); |
---|
15162 | 15834 | break; |
---|
15163 | | - case '0': envyoff ^= true; repaint(); break; |
---|
| 15835 | + //case '0': envyoff ^= true; repaint(); break; |
---|
15164 | 15836 | case '1': |
---|
15165 | 15837 | case '2': |
---|
15166 | 15838 | case '3': |
---|
15167 | 15839 | case '4': |
---|
15168 | 15840 | case '5': |
---|
15169 | | - newenvy = Character.getNumericValue(key); |
---|
15170 | | - repaint(); |
---|
15171 | | - break; |
---|
15172 | 15841 | case '6': |
---|
15173 | 15842 | case '7': |
---|
15174 | 15843 | case '8': |
---|
15175 | 15844 | case '9': |
---|
15176 | | - BGcolor = (key - '6')/3.f; |
---|
| 15845 | + if (true) // envyoff) |
---|
| 15846 | + { |
---|
| 15847 | + BGcolor = (key - '1')/8.f; |
---|
| 15848 | + } |
---|
| 15849 | + else |
---|
| 15850 | + { |
---|
| 15851 | + //newenvy = Character.getNumericValue(key); |
---|
| 15852 | + } |
---|
15177 | 15853 | repaint(); |
---|
15178 | 15854 | break; |
---|
15179 | 15855 | case '!': |
---|
.. | .. |
---|
15243 | 15919 | // kompactbit = 6; |
---|
15244 | 15920 | // break; |
---|
15245 | 15921 | case ' ': |
---|
| 15922 | + capsLocked ^= true; |
---|
| 15923 | + repaint(); |
---|
| 15924 | + break; |
---|
| 15925 | + case 'l': |
---|
15246 | 15926 | lightMode ^= true; |
---|
| 15927 | + if (lightMode) |
---|
| 15928 | + { |
---|
| 15929 | + keepshadow = Globals.RENDERSHADOW; |
---|
| 15930 | + Globals.RENDERSHADOW = false; |
---|
| 15931 | + } |
---|
| 15932 | + else |
---|
| 15933 | + { |
---|
| 15934 | + Globals.RENDERSHADOW = keepshadow; |
---|
| 15935 | + } |
---|
| 15936 | + |
---|
15247 | 15937 | Globals.lighttouched = true; |
---|
15248 | 15938 | manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera; |
---|
15249 | 15939 | targetLookAt.set(manipCamera.lookAt); |
---|
.. | .. |
---|
15251 | 15941 | break; |
---|
15252 | 15942 | //case '`' : |
---|
15253 | 15943 | case ESC: |
---|
| 15944 | + if (FULLSCREEN) |
---|
| 15945 | + object.editWindow.ToggleFullScreen(); |
---|
| 15946 | + break; |
---|
| 15947 | + case 'p': |
---|
15254 | 15948 | RENDERPROGRAM += 1; |
---|
15255 | 15949 | RENDERPROGRAM %= 3; |
---|
15256 | 15950 | |
---|
.. | .. |
---|
15289 | 15983 | case ENTER: |
---|
15290 | 15984 | // object.editWindow.ScreenFit(); // Edit(); |
---|
15291 | 15985 | ToggleLive(); |
---|
| 15986 | + if (capsLocked) |
---|
| 15987 | + { |
---|
| 15988 | + Globals.WALK ^= true; |
---|
| 15989 | + } |
---|
15292 | 15990 | break; |
---|
15293 | 15991 | case DELETE: |
---|
15294 | 15992 | ClearSelection(); |
---|
.. | .. |
---|
15325 | 16023 | object.GetWindow().refreshContents(true); |
---|
15326 | 16024 | break; |
---|
15327 | 16025 | case '{': |
---|
15328 | | - manipCamera.shaper_fovy /= 1.1; |
---|
| 16026 | + double factor = 1.1; |
---|
| 16027 | + if (manipCamera.shaper_fovy / factor > 0.1) |
---|
| 16028 | + manipCamera.shaper_fovy /= factor; |
---|
15329 | 16029 | System.out.println("FOV = " + manipCamera.shaper_fovy); |
---|
15330 | 16030 | repaint(); |
---|
15331 | 16031 | break; |
---|
15332 | 16032 | case '}': |
---|
15333 | | - manipCamera.shaper_fovy *= 1.1; |
---|
| 16033 | + factor = 1.1; |
---|
| 16034 | + if (manipCamera.shaper_fovy * factor < 150) |
---|
| 16035 | + manipCamera.shaper_fovy *= factor; |
---|
15334 | 16036 | System.out.println("FOV = " + manipCamera.shaper_fovy); |
---|
15335 | 16037 | repaint(); |
---|
15336 | 16038 | break; |
---|
15337 | 16039 | case '[': |
---|
15338 | | - manipCamera.shaper_fovy /= 1.01; |
---|
| 16040 | + factor = 1.01; |
---|
| 16041 | + if (manipCamera.shaper_fovy / factor > 0.1) |
---|
| 16042 | + manipCamera.shaper_fovy /= factor; |
---|
15339 | 16043 | if (false) //manipCamera.hAspect == 0) |
---|
15340 | 16044 | { |
---|
15341 | 16045 | double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2); |
---|
.. | .. |
---|
15351 | 16055 | break; |
---|
15352 | 16056 | case ']': |
---|
15353 | 16057 | //manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1; |
---|
15354 | | - manipCamera.shaper_fovy *= 1.01; |
---|
| 16058 | + factor = 1.01; |
---|
| 16059 | + if (manipCamera.shaper_fovy * factor < 150) |
---|
| 16060 | + manipCamera.shaper_fovy *= factor; |
---|
15355 | 16061 | if (false) //manipCamera.hAspect == 0) |
---|
15356 | 16062 | { |
---|
15357 | 16063 | double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2); |
---|
.. | .. |
---|
15389 | 16095 | } |
---|
15390 | 16096 | } |
---|
15391 | 16097 | |
---|
| 16098 | + boolean keys[] = new boolean[256]; |
---|
| 16099 | + int speedkey[] = new int[256]; |
---|
| 16100 | + int modifiers = 0; |
---|
| 16101 | + |
---|
15392 | 16102 | public void processKeyEvent(KeyEvent e) |
---|
15393 | 16103 | { |
---|
15394 | 16104 | switch (e.getID()) |
---|
15395 | 16105 | { |
---|
15396 | 16106 | case KeyEvent.KEY_PRESSED: |
---|
15397 | | - if (!autorepeat) |
---|
15398 | | - { |
---|
15399 | | - //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode())); |
---|
15400 | | - keyPressed(e.getKeyChar(), e.getModifiersEx()); |
---|
15401 | | - } |
---|
15402 | | - if (manipCamera == lightCamera) |
---|
15403 | | - { |
---|
15404 | | - switch (e.getKeyCode()) |
---|
15405 | | - { |
---|
15406 | | - case DOWN_ARROW: |
---|
15407 | | - lightCamera.DECAL /= 2; |
---|
15408 | | - repaint(); |
---|
15409 | | - break; |
---|
15410 | | - case UP_ARROW: |
---|
15411 | | - lightCamera.DECAL *= 2; |
---|
15412 | | - repaint(); |
---|
15413 | | - break; |
---|
15414 | | - case LEFT_ARROW: |
---|
15415 | | - lightCamera.SCALE /= 2; |
---|
15416 | | - repaint(); |
---|
15417 | | - break; |
---|
15418 | | - case RIGHT_ARROW: |
---|
15419 | | - lightCamera.SCALE *= 2; |
---|
15420 | | - repaint(); |
---|
15421 | | - break; |
---|
15422 | | - default: |
---|
15423 | | - break; |
---|
15424 | | - } |
---|
15425 | | - |
---|
15426 | | - System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE); |
---|
15427 | | - } else |
---|
15428 | | - { |
---|
15429 | | - if (true) // !autorepeat) |
---|
15430 | | - { |
---|
15431 | | - boolean reset = true; |
---|
15432 | | - |
---|
15433 | | - switch (e.getKeyCode()) |
---|
15434 | | - { |
---|
15435 | | - case DOWN_ARROW: |
---|
15436 | | - GoDown(e.getModifiersEx()); |
---|
15437 | | - repaint(); |
---|
15438 | | - break; |
---|
15439 | | - case UP_ARROW: |
---|
15440 | | - GoUp(e.getModifiersEx()); |
---|
15441 | | - repaint(); |
---|
15442 | | - break; |
---|
15443 | | - case LEFT_ARROW: |
---|
15444 | | - GoLeft(e.getModifiersEx()); |
---|
15445 | | - repaint(); |
---|
15446 | | - break; |
---|
15447 | | - case RIGHT_ARROW: |
---|
15448 | | - GoRight(e.getModifiersEx()); |
---|
15449 | | - repaint(); |
---|
15450 | | - break; |
---|
15451 | | - default: |
---|
15452 | | - reset = false; |
---|
15453 | | - break; |
---|
15454 | | - } |
---|
15455 | | - |
---|
15456 | | - if (reset) |
---|
15457 | | - { |
---|
15458 | | - autorepeat = true; |
---|
15459 | | - |
---|
15460 | | - targetLookAt.set(manipCamera.lookAt); |
---|
15461 | | - } |
---|
15462 | | - } |
---|
15463 | | - } |
---|
| 16107 | + keys[e.getKeyCode()] = true; |
---|
| 16108 | + modifiers = e.getModifiersEx(); |
---|
| 16109 | + keyPressed(e.getKeyChar(), modifiers); |
---|
| 16110 | + //Globals.theRenderer.keyPressed(e.getKeyChar()); |
---|
| 16111 | + repaint(); |
---|
15464 | 16112 | break; |
---|
15465 | | - case KeyEvent.KEY_TYPED: |
---|
15466 | | - break; |
---|
| 16113 | +// if (!autorepeat) |
---|
| 16114 | +// { |
---|
| 16115 | +// //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode())); |
---|
| 16116 | +// keyPressed(e.getKeyChar(), e.getModifiersEx()); |
---|
| 16117 | +// } |
---|
| 16118 | +// if (manipCamera == lightCamera) |
---|
| 16119 | +// { |
---|
| 16120 | +// switch (e.getKeyCode()) |
---|
| 16121 | +// { |
---|
| 16122 | +// case DOWN_ARROW: |
---|
| 16123 | +// lightCamera.DECAL /= 2; |
---|
| 16124 | +// repaint(); |
---|
| 16125 | +// break; |
---|
| 16126 | +// case UP_ARROW: |
---|
| 16127 | +// lightCamera.DECAL *= 2; |
---|
| 16128 | +// repaint(); |
---|
| 16129 | +// break; |
---|
| 16130 | +// case LEFT_ARROW: |
---|
| 16131 | +// lightCamera.SCALE /= 2; |
---|
| 16132 | +// repaint(); |
---|
| 16133 | +// break; |
---|
| 16134 | +// case RIGHT_ARROW: |
---|
| 16135 | +// lightCamera.SCALE *= 2; |
---|
| 16136 | +// repaint(); |
---|
| 16137 | +// break; |
---|
| 16138 | +// default: |
---|
| 16139 | +// break; |
---|
| 16140 | +// } |
---|
| 16141 | +// |
---|
| 16142 | +// System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE); |
---|
| 16143 | +// } else |
---|
| 16144 | +// { |
---|
| 16145 | +// if (true) // !autorepeat) |
---|
| 16146 | +// { |
---|
| 16147 | +// boolean reset = true; |
---|
| 16148 | +// |
---|
| 16149 | +// switch (e.getKeyCode()) |
---|
| 16150 | +// { |
---|
| 16151 | +// case DOWN_ARROW: |
---|
| 16152 | +// GoDown(e.getModifiersEx()); |
---|
| 16153 | +// repaint(); |
---|
| 16154 | +// break; |
---|
| 16155 | +// case UP_ARROW: |
---|
| 16156 | +// GoUp(e.getModifiersEx()); |
---|
| 16157 | +// repaint(); |
---|
| 16158 | +// break; |
---|
| 16159 | +// case LEFT_ARROW: |
---|
| 16160 | +// GoLeft(e.getModifiersEx()); |
---|
| 16161 | +// repaint(); |
---|
| 16162 | +// break; |
---|
| 16163 | +// case RIGHT_ARROW: |
---|
| 16164 | +// GoRight(e.getModifiersEx()); |
---|
| 16165 | +// repaint(); |
---|
| 16166 | +// break; |
---|
| 16167 | +// default: |
---|
| 16168 | +// reset = false; |
---|
| 16169 | +// break; |
---|
| 16170 | +// } |
---|
| 16171 | +// |
---|
| 16172 | +// if (reset) |
---|
| 16173 | +// { |
---|
| 16174 | +// autorepeat = true; |
---|
| 16175 | +// |
---|
| 16176 | +// targetLookAt.set(manipCamera.lookAt); |
---|
| 16177 | +// } |
---|
| 16178 | +// } |
---|
| 16179 | +// } |
---|
| 16180 | +// break; |
---|
| 16181 | +// case KeyEvent.KEY_TYPED: |
---|
| 16182 | +// break; |
---|
15467 | 16183 | case KeyEvent.KEY_RELEASED: |
---|
15468 | | - { |
---|
15469 | | - switch (e.getKeyCode()) |
---|
15470 | | - { |
---|
15471 | | - case DOWN_ARROW: |
---|
15472 | | - case UP_ARROW: |
---|
15473 | | - case LEFT_ARROW: |
---|
15474 | | - case RIGHT_ARROW: |
---|
15475 | | - MODIFIERS &= ~COMMAND; |
---|
15476 | | - autorepeat = false; |
---|
15477 | | - break; |
---|
15478 | | - default: |
---|
15479 | | - break; |
---|
15480 | | - } |
---|
| 16184 | + keys[e.getKeyCode()] = false; |
---|
| 16185 | + modifiers = e.getModifiersEx(); |
---|
15481 | 16186 | keyReleased(e.getKeyChar(), e.getModifiersEx()); |
---|
| 16187 | + repaint(); |
---|
15482 | 16188 | break; |
---|
15483 | | - } |
---|
| 16189 | +// { |
---|
| 16190 | +// switch (e.getKeyCode()) |
---|
| 16191 | +// { |
---|
| 16192 | +// case DOWN_ARROW: |
---|
| 16193 | +// case UP_ARROW: |
---|
| 16194 | +// case LEFT_ARROW: |
---|
| 16195 | +// case RIGHT_ARROW: |
---|
| 16196 | +// MODIFIERS &= ~COMMAND; |
---|
| 16197 | +// autorepeat = false; |
---|
| 16198 | +// break; |
---|
| 16199 | +// default: |
---|
| 16200 | +// break; |
---|
| 16201 | +// } |
---|
| 16202 | +// keyReleased(e.getKeyChar(), e.getModifiersEx()); |
---|
| 16203 | +// break; |
---|
| 16204 | +// } |
---|
15484 | 16205 | default: |
---|
15485 | 16206 | break; |
---|
15486 | 16207 | } |
---|
.. | .. |
---|
15736 | 16457 | |
---|
15737 | 16458 | int width = getBounds().width; |
---|
15738 | 16459 | int height = getBounds().height; |
---|
15739 | | - ClickInfo info = new ClickInfo(); |
---|
15740 | | - info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom)); |
---|
15741 | 16460 | //Image img = CreateImage(width, height); |
---|
15742 | 16461 | //System.out.println("width = " + width + "; height = " + height + "\n"); |
---|
15743 | 16462 | |
---|
.. | .. |
---|
15814 | 16533 | } |
---|
15815 | 16534 | if (object != null && !hasMarquee) |
---|
15816 | 16535 | { |
---|
| 16536 | + if (object.clickInfo == null) |
---|
| 16537 | + object.clickInfo = new ClickInfo(); |
---|
| 16538 | + ClickInfo info = object.clickInfo; |
---|
| 16539 | + //ClickInfo info = new ClickInfo(); |
---|
| 16540 | + info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom)); |
---|
| 16541 | + |
---|
15817 | 16542 | if (isRenderer) |
---|
15818 | 16543 | { |
---|
15819 | | - info.flags++; |
---|
| 16544 | + object.clickInfo.flags++; |
---|
15820 | 16545 | double frameAspect = (double) width / (double) height; |
---|
15821 | 16546 | if (frameAspect > renderCamera.aspect) |
---|
15822 | 16547 | { |
---|
15823 | 16548 | int desired = (int) ((double) height * renderCamera.aspect); |
---|
15824 | | - info.bounds.width -= width - desired; |
---|
15825 | | - info.bounds.x += (width - desired) / 2; |
---|
| 16549 | + object.clickInfo.bounds.width -= width - desired; |
---|
| 16550 | + object.clickInfo.bounds.x += (width - desired) / 2; |
---|
15826 | 16551 | } else |
---|
15827 | 16552 | { |
---|
15828 | 16553 | int desired = (int) ((double) width / renderCamera.aspect); |
---|
15829 | | - info.bounds.height -= height - desired; |
---|
15830 | | - info.bounds.y += (height - desired) / 2; |
---|
| 16554 | + object.clickInfo.bounds.height -= height - desired; |
---|
| 16555 | + object.clickInfo.bounds.y += (height - desired) / 2; |
---|
15831 | 16556 | } |
---|
15832 | 16557 | } |
---|
15833 | 16558 | |
---|
15834 | | - info.g = gr; |
---|
15835 | | - info.camera = renderCamera; |
---|
| 16559 | + object.clickInfo.g = gr; |
---|
| 16560 | + object.clickInfo.camera = renderCamera; |
---|
15836 | 16561 | /* |
---|
15837 | 16562 | // Memory intensive (brep.verticescopy) |
---|
15838 | 16563 | if (!(object instanceof Composite)) |
---|
15839 | 16564 | object.draw(info, 0, false); // SLOW : |
---|
15840 | 16565 | */ |
---|
15841 | | - if (!isRenderer) |
---|
| 16566 | + if (!isRenderer) // && drag) |
---|
15842 | 16567 | { |
---|
15843 | 16568 | Grafreed.Assert(object != null); |
---|
15844 | 16569 | Grafreed.Assert(object.selection != null); |
---|
.. | .. |
---|
15846 | 16571 | { |
---|
15847 | 16572 | int hitSomething = object.selection.get(0).hitSomething; |
---|
15848 | 16573 | |
---|
15849 | | - info.DX = 0; |
---|
15850 | | - info.DY = 0; |
---|
15851 | | - info.W = 1; |
---|
| 16574 | + object.clickInfo.DX = 0; |
---|
| 16575 | + object.clickInfo.DY = 0; |
---|
| 16576 | + object.clickInfo.W = 1; |
---|
15852 | 16577 | if (hitSomething == Object3D.hitCenter) |
---|
15853 | 16578 | { |
---|
15854 | 16579 | info.DX = X; |
---|
.. | .. |
---|
15860 | 16585 | info.DY -= info.bounds.height/2; |
---|
15861 | 16586 | } |
---|
15862 | 16587 | |
---|
15863 | | - object.drawEditHandles(info, 0); |
---|
| 16588 | + object.drawEditHandles(//info, |
---|
| 16589 | + 0); |
---|
15864 | 16590 | |
---|
15865 | 16591 | if (drag && (X != 0 || Y != 0)) |
---|
15866 | 16592 | { |
---|
15867 | 16593 | switch (hitSomething) |
---|
15868 | 16594 | { |
---|
15869 | | - case Object3D.hitCenter: gr.setColor(Color.pink); |
---|
| 16595 | + case Object3D.hitCenter: gr.setColor(Color.white); |
---|
15870 | 16596 | gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2); |
---|
15871 | 16597 | break; |
---|
15872 | 16598 | case Object3D.hitRotate: gr.setColor(Color.yellow); |
---|
.. | .. |
---|
15892 | 16618 | if (hasMarquee) |
---|
15893 | 16619 | { |
---|
15894 | 16620 | gr.setXORMode(Color.white); |
---|
15895 | | - gr.setColor(Color.red); |
---|
| 16621 | + gr.setColor(Color.white); |
---|
15896 | 16622 | if (!firstime) |
---|
15897 | 16623 | { |
---|
15898 | 16624 | gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH); |
---|
.. | .. |
---|
16051 | 16777 | |
---|
16052 | 16778 | public boolean mouseDrag(Event evt, int x, int y) |
---|
16053 | 16779 | { |
---|
16054 | | - //System.out.println("mouseDrag: " + evt); |
---|
| 16780 | + System.out.println("mouseDrag: " + evt); |
---|
| 16781 | + System.exit(0); |
---|
16055 | 16782 | /* |
---|
16056 | 16783 | drag = true; |
---|
16057 | 16784 | //System.out.println("Mouse DRAG"); |
---|
.. | .. |
---|
16170 | 16897 | public boolean mouseUp(Event evt, int x, int y) |
---|
16171 | 16898 | { |
---|
16172 | 16899 | System.out.println("mouseUp: " + evt); |
---|
| 16900 | + System.exit(0); |
---|
16173 | 16901 | /* |
---|
16174 | 16902 | locked = false; |
---|
16175 | 16903 | if (isRenderer) |
---|
.. | .. |
---|
16359 | 17087 | private /*static*/ boolean firstime; |
---|
16360 | 17088 | private /*static*/ cVector newView = new cVector(); |
---|
16361 | 17089 | private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"}; |
---|
| 17090 | + private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"}; |
---|
| 17091 | + private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"}; |
---|
16362 | 17092 | private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X, |
---|
16363 | 17093 | GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X, |
---|
16364 | 17094 | GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y, |
---|
.. | .. |
---|
16371 | 17101 | { |
---|
16372 | 17102 | com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP); |
---|
16373 | 17103 | |
---|
| 17104 | + int usedsuf = 0; |
---|
| 17105 | + |
---|
16374 | 17106 | for (int i = 0; i < suffixes.length; i++) |
---|
16375 | 17107 | { |
---|
16376 | | - String resourceName = basename + suffixes[i] + "." + suffix; |
---|
16377 | | - TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName), |
---|
16378 | | - mipmapped, |
---|
16379 | | - FileUtil.getFileSuffix(resourceName)); |
---|
16380 | | - if (data == null) |
---|
| 17108 | + String[] suffixe = suffixes; |
---|
| 17109 | + String[] fallback = suffixes2; |
---|
| 17110 | + String[] fallfallback = suffixes3; |
---|
| 17111 | + |
---|
| 17112 | + for (int c=usedsuf; --c>=0;) |
---|
16381 | 17113 | { |
---|
16382 | | - throw new IOException("Unable to load texture " + resourceName); |
---|
| 17114 | +// String[] temp = suffixe; |
---|
| 17115 | +// suffixe = fallback; |
---|
| 17116 | +// fallback = fallfallback; |
---|
| 17117 | +// fallfallback = temp; |
---|
16383 | 17118 | } |
---|
| 17119 | + |
---|
| 17120 | + String resourceName = basename + suffixe[i] + "." + suffix; |
---|
| 17121 | + TextureData data; |
---|
| 17122 | + |
---|
| 17123 | + try |
---|
| 17124 | + { |
---|
| 17125 | + data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName), |
---|
| 17126 | + mipmapped, |
---|
| 17127 | + FileUtil.getFileSuffix(resourceName)); |
---|
| 17128 | + } |
---|
| 17129 | + catch (Exception e) |
---|
| 17130 | + { |
---|
| 17131 | + try |
---|
| 17132 | + { |
---|
| 17133 | + resourceName = basename + fallback[i] + "." + suffix; |
---|
| 17134 | + data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName), |
---|
| 17135 | + mipmapped, |
---|
| 17136 | + FileUtil.getFileSuffix(resourceName)); |
---|
| 17137 | + } |
---|
| 17138 | + catch (Exception e2) |
---|
| 17139 | + { |
---|
| 17140 | + resourceName = basename + fallfallback[i] + "." + suffix; |
---|
| 17141 | + data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName), |
---|
| 17142 | + mipmapped, |
---|
| 17143 | + FileUtil.getFileSuffix(resourceName)); |
---|
| 17144 | + } |
---|
| 17145 | + } |
---|
| 17146 | + |
---|
16384 | 17147 | //System.out.println("Target = " + targets[i]); |
---|
16385 | 17148 | cubemap.updateImage(data, targets[i]); |
---|
16386 | 17149 | } |
---|
16387 | 17150 | |
---|
16388 | 17151 | return cubemap; |
---|
16389 | 17152 | } |
---|
| 17153 | + |
---|
16390 | 17154 | int bigsphere = -1; |
---|
16391 | 17155 | |
---|
16392 | 17156 | float BGcolor = 0.5f; |
---|
16393 | 17157 | |
---|
16394 | | - private void DrawSkyBox(GL gl) |
---|
| 17158 | + float ambientLight[] = {1f, 1f, 1f, 1.0f}; |
---|
| 17159 | + |
---|
| 17160 | + private void DrawSkyBox(GL gl, float ratio) |
---|
16395 | 17161 | { |
---|
16396 | | - if (envyoff || cubemap == null) |
---|
| 17162 | + if (//envyoff || |
---|
| 17163 | + WIREFRAME || |
---|
| 17164 | + cubemap == null) |
---|
16397 | 17165 | { |
---|
16398 | 17166 | gl.glClearColor(BGcolor, BGcolor, BGcolor, 1); |
---|
16399 | 17167 | gl.glClear(gl.GL_COLOR_BUFFER_BIT); |
---|
16400 | 17168 | return; |
---|
16401 | 17169 | } |
---|
16402 | 17170 | |
---|
16403 | | - if (WIREFRAME) |
---|
| 17171 | + //if (WIREFRAME) |
---|
16404 | 17172 | gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL); |
---|
16405 | 17173 | |
---|
16406 | 17174 | gl.glDisable(gl.GL_CULL_FACE); |
---|
.. | .. |
---|
16408 | 17176 | // Compensates for ExaminerViewer's modification of modelview matrix |
---|
16409 | 17177 | gl.glMatrixMode(GL.GL_MODELVIEW); |
---|
16410 | 17178 | gl.glLoadIdentity(); |
---|
| 17179 | + gl.glScalef(1,ratio,1); |
---|
16411 | 17180 | |
---|
| 17181 | +// colorV[0] = 2; |
---|
| 17182 | +// colorV[1] = 2; |
---|
| 17183 | +// colorV[2] = 2; |
---|
| 17184 | +// colorV[3] = 1; |
---|
| 17185 | +// gl.glDisable(gl.GL_COLOR_MATERIAL); |
---|
| 17186 | +// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0); |
---|
| 17187 | +// |
---|
| 17188 | +// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0); |
---|
| 17189 | + |
---|
16412 | 17190 | //gl.glActiveTexture(GL.GL_TEXTURE1); |
---|
16413 | 17191 | //gl.glDisable(GL.GL_TEXTURE_CUBE_MAP); |
---|
16414 | 17192 | |
---|
.. | .. |
---|
16440 | 17218 | { |
---|
16441 | 17219 | gl.glScalef(1.0f, -1.0f, 1.0f); |
---|
16442 | 17220 | } |
---|
| 17221 | + gl.glScalef(-1.0f, 1.0f, 1.0f); |
---|
16443 | 17222 | gl.glMultMatrixd(viewrot_1, 0); |
---|
16444 | 17223 | gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f); |
---|
16445 | 17224 | //viewer.updateInverseRotation(gl); |
---|
.. | .. |
---|
16480 | 17259 | gl.glDisable(GL.GL_TEXTURE_GEN_R); |
---|
16481 | 17260 | |
---|
16482 | 17261 | cubemap.disable(); |
---|
16483 | | - ////cubemap.unbind(); |
---|
| 17262 | + //cubemap.dispose(); |
---|
| 17263 | + |
---|
16484 | 17264 | if (CULLFACE) |
---|
16485 | 17265 | { |
---|
16486 | 17266 | gl.glEnable(gl.GL_CULL_FACE); |
---|
.. | .. |
---|
16488 | 17268 | |
---|
16489 | 17269 | if (WIREFRAME) |
---|
16490 | 17270 | gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_LINE); |
---|
| 17271 | + else |
---|
| 17272 | + gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL); |
---|
16491 | 17273 | } |
---|
16492 | 17274 | |
---|
16493 | 17275 | private void DrawChecker(GL gl) |
---|
.. | .. |
---|
16536 | 17318 | gl.glScalef(1.0f, -1.0f, 1.0f); |
---|
16537 | 17319 | } |
---|
16538 | 17320 | |
---|
16539 | | - gl.glNormal3f(0.0f, 0.0f, 1.0f); |
---|
| 17321 | + SetGLNormal(gl, 0.0f, 0.0f, 1.0f); |
---|
16540 | 17322 | |
---|
16541 | 17323 | float step = 2; // 0.1666f; //0.25f; |
---|
16542 | 17324 | float stepv = 2; // step * 1652 / 998; |
---|
.. | .. |
---|
16698 | 17480 | //new Exception().printStackTrace(); |
---|
16699 | 17481 | System.out.println("select buffer init"); |
---|
16700 | 17482 | // Use debug pipeline |
---|
16701 | | - drawable.setGL(new DebugGL(drawable.getGL())); |
---|
| 17483 | + //drawable.setGL(new DebugGL(drawable.getGL())); |
---|
16702 | 17484 | |
---|
16703 | 17485 | GL gl = drawable.getGL(); |
---|
16704 | 17486 | |
---|
.. | .. |
---|
16825 | 17607 | |
---|
16826 | 17608 | float depth = depths[y * TEX_SIZE + x]; |
---|
16827 | 17609 | |
---|
16828 | | - if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1) |
---|
| 17610 | + if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1) |
---|
16829 | 17611 | { |
---|
16830 | 17612 | pointselection = false; |
---|
16831 | 17613 | |
---|
.. | .. |
---|
17016 | 17798 | |
---|
17017 | 17799 | public void init(GLAutoDrawable drawable) |
---|
17018 | 17800 | { |
---|
| 17801 | + if (Globals.DEBUG) |
---|
17019 | 17802 | System.out.println("shadow buffer init"); |
---|
17020 | 17803 | |
---|
17021 | 17804 | GL gl = drawable.getGL(); |
---|
.. | .. |
---|
17244 | 18027 | gl.glFlush(); |
---|
17245 | 18028 | |
---|
17246 | 18029 | /**/ |
---|
17247 | | - gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer); |
---|
| 18030 | + gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer); |
---|
17248 | 18031 | |
---|
17249 | | - float[] pixels = occlusionsizebuffer.array(); |
---|
| 18032 | + float[] depths = occlusiondepthbuffer.array(); |
---|
17250 | 18033 | |
---|
| 18034 | + gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer); |
---|
| 18035 | + |
---|
| 18036 | + int[] pixels = selectsizebuffer.array(); |
---|
| 18037 | + |
---|
17251 | 18038 | double r = 0, g = 0, b = 0; |
---|
17252 | 18039 | |
---|
17253 | 18040 | double count = 0; |
---|
.. | .. |
---|
17258 | 18045 | |
---|
17259 | 18046 | double FACTOR = 1; |
---|
17260 | 18047 | |
---|
17261 | | - for (int i = 0; i < pixels.length; i++) |
---|
| 18048 | + for (int i = 0; i < depths.length; i++) |
---|
17262 | 18049 | { |
---|
17263 | 18050 | int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2; |
---|
17264 | 18051 | int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2; |
---|
.. | .. |
---|
17341 | 18128 | |
---|
17342 | 18129 | double scale = ray.z; // 1; // cos |
---|
17343 | 18130 | |
---|
17344 | | - float depth = pixels[newindex]; |
---|
| 18131 | + float depth = depths[newindex]; |
---|
17345 | 18132 | |
---|
17346 | 18133 | /* |
---|
17347 | 18134 | int newindex2 = (x + 1) * OCCLUSION_SIZE + y; |
---|
.. | .. |
---|
17484 | 18271 | static boolean DEBUG_SELECTION = false; |
---|
17485 | 18272 | boolean OCCLUSION_CULLING = false; //true; |
---|
17486 | 18273 | public boolean lightMode = false; |
---|
| 18274 | + |
---|
| 18275 | + private boolean keepshadow; |
---|
| 18276 | + |
---|
| 18277 | + static public boolean capsLocked = false; // VR |
---|
| 18278 | + |
---|
17487 | 18279 | static public int indexcount = 0; |
---|
17488 | 18280 | /*static*/ cColor vertexOcclusion = new cColor(); |
---|
17489 | 18281 | //private int selection_view = -1; |
---|
.. | .. |
---|
17538 | 18330 | static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE); |
---|
17539 | 18331 | static IntBuffer bigAAbuffer; |
---|
17540 | 18332 | static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3); |
---|
17541 | | - static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE); |
---|
| 18333 | + //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE); |
---|
17542 | 18334 | static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE); |
---|
17543 | 18335 | static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE); |
---|
17544 | 18336 | //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE); |
---|
17545 | | - static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE); |
---|
| 18337 | + static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE); |
---|
| 18338 | + |
---|
| 18339 | + static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE); |
---|
| 18340 | + |
---|
17546 | 18341 | static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB); |
---|
17547 | 18342 | static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB); |
---|
17548 | 18343 | static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>(); |
---|