.. | .. |
---|
56 | 56 | static int CURRENTANTIALIAS = 0; // 1; |
---|
57 | 57 | /*static*/ boolean RENDERSHADOW = true; |
---|
58 | 58 | /*static*/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal |
---|
59 | | - static boolean ANIMATION = false; |
---|
60 | | - static String filename; |
---|
61 | 59 | |
---|
62 | 60 | boolean DISPLAYTEXT = false; |
---|
63 | 61 | //boolean REDUCETEXTURE = true; |
---|
.. | .. |
---|
92 | 90 | |
---|
93 | 91 | static int tickcount = 0; // slow pose issue |
---|
94 | 92 | |
---|
| 93 | +static boolean BUTTONLESSWHEEL = false; |
---|
| 94 | +static boolean ZOOMBOXMODE = false; |
---|
95 | 95 | static boolean BOXMODE = false; |
---|
96 | 96 | static boolean IMAGEFLIP = false; |
---|
97 | 97 | static boolean SMOOTHFOCUS = false; |
---|
.. | .. |
---|
106 | 106 | static boolean OEIL = true; |
---|
107 | 107 | static boolean OEILONCE = false; // do oeilon then oeiloff |
---|
108 | 108 | static boolean LOOKAT = true; |
---|
109 | | -static boolean RANDOM = true; // false; |
---|
| 109 | +static boolean SWITCH = true; // false; |
---|
110 | 110 | static boolean HANDLES = false; // selection doesn't work!! |
---|
111 | 111 | static boolean PAINTMODE = false; |
---|
112 | 112 | |
---|
.. | .. |
---|
149 | 149 | defaultcaps.setAccumBlueBits(16); |
---|
150 | 150 | defaultcaps.setAccumAlphaBits(16); |
---|
151 | 151 | } |
---|
| 152 | + |
---|
| 153 | + private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory(); |
---|
152 | 154 | |
---|
153 | 155 | void SetAsGLRenderer(boolean b) |
---|
154 | 156 | { |
---|
.. | .. |
---|
223 | 225 | public boolean IsBoxMode() |
---|
224 | 226 | { |
---|
225 | 227 | return BOXMODE; |
---|
| 228 | + } |
---|
| 229 | + |
---|
| 230 | + public boolean IsZoomBoxMode() |
---|
| 231 | + { |
---|
| 232 | + return ZOOMBOXMODE; |
---|
226 | 233 | } |
---|
227 | 234 | |
---|
228 | 235 | public void ClearDepth() |
---|
.. | .. |
---|
457 | 464 | if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0) |
---|
458 | 465 | { |
---|
459 | 466 | //gl.glBegin(gl.GL_TRIANGLES); |
---|
460 | | - boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0); |
---|
| 467 | + boolean hasnorm = pv.norm != null && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0) |
---|
| 468 | + // TEST LIVE NORMALS && !obj.dontselect |
---|
| 469 | + ; |
---|
461 | 470 | if (!hasnorm) |
---|
462 | 471 | { |
---|
463 | | - // System.out.println("FUCK!!"); |
---|
| 472 | + // System.out.println("Mesh normal"); |
---|
464 | 473 | LA.vecSub(pv/*.pos*/, qv/*.pos*/, obj.v0); |
---|
465 | 474 | LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1); |
---|
466 | 475 | LA.vecCross(obj.v0, obj.v1, obj.v2); |
---|
.. | .. |
---|
1185 | 1194 | gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1); |
---|
1186 | 1195 | } |
---|
1187 | 1196 | } |
---|
| 1197 | + |
---|
1188 | 1198 | if (flipV) |
---|
1189 | 1199 | gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]); |
---|
1190 | 1200 | else |
---|
1191 | 1201 | gl.glTexCoord2f(uv[count2], uv[count2 + 1]); |
---|
| 1202 | + |
---|
1192 | 1203 | //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]); |
---|
1193 | 1204 | gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]); |
---|
1194 | 1205 | |
---|
.. | .. |
---|
1208 | 1219 | gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1); |
---|
1209 | 1220 | } |
---|
1210 | 1221 | } |
---|
| 1222 | + |
---|
1211 | 1223 | if (flipV) |
---|
1212 | 1224 | gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]); |
---|
1213 | 1225 | else |
---|
1214 | 1226 | gl.glTexCoord2f(uv[count2], uv[count2 + 1]); |
---|
| 1227 | + |
---|
1215 | 1228 | //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]); |
---|
1216 | 1229 | gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]); |
---|
1217 | 1230 | |
---|
.. | .. |
---|
1239 | 1252 | gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]); |
---|
1240 | 1253 | else |
---|
1241 | 1254 | gl.glTexCoord2f(uv[count2], uv[count2 + 1]); |
---|
| 1255 | + |
---|
1242 | 1256 | //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]); |
---|
1243 | 1257 | gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]); |
---|
| 1258 | + |
---|
1244 | 1259 | count2 += 2; |
---|
1245 | 1260 | count3 += 3; |
---|
1246 | 1261 | } |
---|
.. | .. |
---|
1612 | 1627 | //col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0); |
---|
1613 | 1628 | if (!material.multiply) |
---|
1614 | 1629 | { |
---|
1615 | | - display.color = color; |
---|
| 1630 | + display.color = material.color; |
---|
1616 | 1631 | display.saturation = material.modulation; |
---|
1617 | 1632 | } |
---|
1618 | 1633 | else |
---|
1619 | 1634 | { |
---|
1620 | | - display.color *= color*2; |
---|
| 1635 | + display.color *= material.color*2; |
---|
1621 | 1636 | display.saturation *= material.modulation*2; |
---|
1622 | 1637 | } |
---|
1623 | 1638 | |
---|
1624 | 1639 | cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0); |
---|
1625 | 1640 | |
---|
1626 | | - float[] colorV = GrafreeD.colorV; |
---|
| 1641 | + float[] colorV = Grafreed.colorV; |
---|
1627 | 1642 | |
---|
1628 | 1643 | /**/ |
---|
1629 | 1644 | if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0) |
---|
.. | .. |
---|
1883 | 1898 | void PushMatrix(double[][] matrix) |
---|
1884 | 1899 | { |
---|
1885 | 1900 | // GrafreeD.tracein(matrix); |
---|
1886 | | - PushMatrix(matrix,1); |
---|
| 1901 | + PushMatrix(matrix, 1); |
---|
1887 | 1902 | } |
---|
1888 | 1903 | |
---|
1889 | 1904 | void PushMatrix() |
---|
.. | .. |
---|
2135 | 2150 | System.err.println("LIVE = " + Globals.isLIVE()); |
---|
2136 | 2151 | |
---|
2137 | 2152 | if (!Globals.isLIVE()) // save sound |
---|
2138 | | - GrafreeD.savesound = true; // wav.save(); |
---|
| 2153 | + Grafreed.savesound = true; // wav.save(); |
---|
2139 | 2154 | // else |
---|
2140 | 2155 | repaint(); // start loop // may 2013 |
---|
2141 | 2156 | } |
---|
.. | .. |
---|
2168 | 2183 | public void ToggleBoxMode() |
---|
2169 | 2184 | { |
---|
2170 | 2185 | BOXMODE ^= true; |
---|
| 2186 | + } |
---|
| 2187 | + |
---|
| 2188 | + public void ToggleZoomBoxMode() |
---|
| 2189 | + { |
---|
| 2190 | + ZOOMBOXMODE ^= true; |
---|
2171 | 2191 | } |
---|
2172 | 2192 | |
---|
2173 | 2193 | public void ToggleSmoothFocus() |
---|
.. | .. |
---|
2255 | 2275 | LOOKAT ^= true; |
---|
2256 | 2276 | } |
---|
2257 | 2277 | |
---|
2258 | | - void ToggleRandom() |
---|
| 2278 | + void ToggleSwitch() |
---|
2259 | 2279 | { |
---|
2260 | | - RANDOM ^= true; |
---|
| 2280 | + SWITCH ^= true; |
---|
2261 | 2281 | } |
---|
2262 | 2282 | |
---|
2263 | 2283 | void ToggleHandles() |
---|
.. | .. |
---|
2364 | 2384 | { |
---|
2365 | 2385 | return currentGL; |
---|
2366 | 2386 | } |
---|
2367 | | - |
---|
| 2387 | + |
---|
2368 | 2388 | /**/ |
---|
2369 | 2389 | class CacheTexture |
---|
2370 | 2390 | { |
---|
.. | .. |
---|
4196 | 4216 | |
---|
4197 | 4217 | com.sun.opengl.util.texture.Texture CompressTexture2(String name) |
---|
4198 | 4218 | { |
---|
| 4219 | + new Exception().printStackTrace(); |
---|
4199 | 4220 | System.exit(0); |
---|
4200 | 4221 | com.sun.opengl.util.texture.Texture texture = null; |
---|
4201 | 4222 | |
---|
.. | .. |
---|
7908 | 7929 | ReleaseTexture(pigment, false); |
---|
7909 | 7930 | } |
---|
7910 | 7931 | |
---|
| 7932 | + public void ReleasePigmentTexture(cTexture tex) // INTERFACE |
---|
| 7933 | + { |
---|
| 7934 | + if (/*tex == null ||*/ ambientOcclusion ) // || !textureon) |
---|
| 7935 | + { |
---|
| 7936 | + return; |
---|
| 7937 | + } |
---|
| 7938 | + |
---|
| 7939 | + if (tex == null) |
---|
| 7940 | + { |
---|
| 7941 | + ReleaseTexture(null, false); |
---|
| 7942 | + return; |
---|
| 7943 | + } |
---|
| 7944 | + |
---|
| 7945 | + String pigment = Object3D.GetPigment(tex); |
---|
| 7946 | + |
---|
| 7947 | + if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES)) |
---|
| 7948 | + { |
---|
| 7949 | + // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment); |
---|
| 7950 | + // System.out.println("; bump = " + bump); |
---|
| 7951 | + } |
---|
| 7952 | + |
---|
| 7953 | + if (pigment.equals("")) |
---|
| 7954 | + { |
---|
| 7955 | + pigment = null; |
---|
| 7956 | + } |
---|
| 7957 | + |
---|
| 7958 | + ReleaseTexture(pigment, false); |
---|
| 7959 | + } |
---|
| 7960 | + |
---|
| 7961 | + public void ReleaseBumpTexture(cTexture tex) // INTERFACE |
---|
| 7962 | + { |
---|
| 7963 | + if (/*tex == null ||*/ ambientOcclusion ) // || !textureon) |
---|
| 7964 | + { |
---|
| 7965 | + return; |
---|
| 7966 | + } |
---|
| 7967 | + |
---|
| 7968 | + if (tex == null) |
---|
| 7969 | + { |
---|
| 7970 | + ReleaseTexture(null, true); |
---|
| 7971 | + return; |
---|
| 7972 | + } |
---|
| 7973 | + |
---|
| 7974 | + String bump = Object3D.GetBump(tex); |
---|
| 7975 | + |
---|
| 7976 | + if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES)) |
---|
| 7977 | + { |
---|
| 7978 | + // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment); |
---|
| 7979 | + // System.out.println("; bump = " + bump); |
---|
| 7980 | + } |
---|
| 7981 | + |
---|
| 7982 | + if (bump.equals("")) |
---|
| 7983 | + { |
---|
| 7984 | + bump = null; |
---|
| 7985 | + } |
---|
| 7986 | + |
---|
| 7987 | + ReleaseTexture(bump, true); |
---|
| 7988 | + } |
---|
| 7989 | + |
---|
7911 | 7990 | void ReleaseTexture(String tex, boolean bump) |
---|
7912 | 7991 | { |
---|
7913 | 7992 | if (// DrawMode() != 0 || /*tex == null ||*/ |
---|
.. | .. |
---|
8011 | 8090 | } |
---|
8012 | 8091 | } |
---|
8013 | 8092 | |
---|
8014 | | - /*boolean*/ public void BindTextures(cTexture tex, int resolution) // INTERFACE |
---|
| 8093 | + /*boolean*/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE |
---|
8015 | 8094 | { |
---|
8016 | 8095 | if (// DrawMode() != 0 || /*tex == null ||*/ |
---|
8017 | 8096 | ambientOcclusion ) // || !textureon) |
---|
.. | .. |
---|
8056 | 8135 | return; // true; |
---|
8057 | 8136 | } |
---|
8058 | 8137 | |
---|
8059 | | - CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) |
---|
| 8138 | + /*boolean*/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE |
---|
| 8139 | + { |
---|
| 8140 | + if (// DrawMode() != 0 || /*tex == null ||*/ |
---|
| 8141 | + ambientOcclusion ) // || !textureon) |
---|
| 8142 | + { |
---|
| 8143 | + return; // false; |
---|
| 8144 | + } |
---|
| 8145 | + |
---|
| 8146 | + if (tex == null) |
---|
| 8147 | + { |
---|
| 8148 | + BindTexture(null,false,resolution); |
---|
| 8149 | + return; |
---|
| 8150 | + } |
---|
| 8151 | + |
---|
| 8152 | + String pigment = Object3D.GetPigment(tex); |
---|
| 8153 | + |
---|
| 8154 | + usedtextures.put(pigment, pigment); |
---|
| 8155 | + |
---|
| 8156 | + if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES)) |
---|
| 8157 | + { |
---|
| 8158 | + // System.out.print("BIND +++++++++++++++ pigment = " + pigment); |
---|
| 8159 | + // System.out.println("; bump = " + bump); |
---|
| 8160 | + } |
---|
| 8161 | + |
---|
| 8162 | + if (pigment.equals("")) |
---|
| 8163 | + { |
---|
| 8164 | + pigment = null; |
---|
| 8165 | + } |
---|
| 8166 | + |
---|
| 8167 | + GetGL().glActiveTexture(GetGL().GL_TEXTURE0); |
---|
| 8168 | + BindTexture(pigment, false, resolution); |
---|
| 8169 | + } |
---|
| 8170 | + |
---|
| 8171 | + /*boolean*/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE |
---|
| 8172 | + { |
---|
| 8173 | + if (// DrawMode() != 0 || /*tex == null ||*/ |
---|
| 8174 | + ambientOcclusion ) // || !textureon) |
---|
| 8175 | + { |
---|
| 8176 | + return; // false; |
---|
| 8177 | + } |
---|
| 8178 | + |
---|
| 8179 | + if (tex == null) |
---|
| 8180 | + { |
---|
| 8181 | + BindTexture(null,true,resolution); |
---|
| 8182 | + return; |
---|
| 8183 | + } |
---|
| 8184 | + |
---|
| 8185 | + String bump = Object3D.GetBump(tex); |
---|
| 8186 | + |
---|
| 8187 | + usedtextures.put(bump, bump); |
---|
| 8188 | + |
---|
| 8189 | + if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES)) |
---|
| 8190 | + { |
---|
| 8191 | + // System.out.print("BIND +++++++++++++++ pigment = " + pigment); |
---|
| 8192 | + // System.out.println("; bump = " + bump); |
---|
| 8193 | + } |
---|
| 8194 | + |
---|
| 8195 | + if (bump.equals("")) |
---|
| 8196 | + { |
---|
| 8197 | + bump = null; |
---|
| 8198 | + } |
---|
| 8199 | + |
---|
| 8200 | + GetGL().glActiveTexture(GetGL().GL_TEXTURE2); |
---|
| 8201 | + BindTexture(bump, true, resolution); |
---|
| 8202 | + GetGL().glActiveTexture(GetGL().GL_TEXTURE0); |
---|
| 8203 | + } |
---|
| 8204 | + |
---|
| 8205 | + java.util.HashSet<String> missingTextures = new java.util.HashSet<String>(); |
---|
| 8206 | + |
---|
| 8207 | + private boolean FileExists(String tex) |
---|
| 8208 | + { |
---|
| 8209 | + if (missingTextures.contains(tex)) |
---|
| 8210 | + { |
---|
| 8211 | + return false; |
---|
| 8212 | + } |
---|
| 8213 | + |
---|
| 8214 | + boolean fileExists = new File(tex).exists(); |
---|
| 8215 | + |
---|
| 8216 | + if (!fileExists) |
---|
| 8217 | + { |
---|
| 8218 | + // If file exists, the "new File()" is not executed sgain |
---|
| 8219 | + missingTextures.add(tex); |
---|
| 8220 | + } |
---|
| 8221 | + |
---|
| 8222 | + return fileExists; |
---|
| 8223 | + } |
---|
| 8224 | + |
---|
| 8225 | + CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception |
---|
8060 | 8226 | { |
---|
8061 | 8227 | CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null; |
---|
8062 | 8228 | |
---|
.. | .. |
---|
8064 | 8230 | { |
---|
8065 | 8231 | String texname = tex; |
---|
8066 | 8232 | |
---|
8067 | | - String[] split = tex.split("Textures"); |
---|
8068 | | - if (split.length > 1) |
---|
8069 | | - texname = "/Users/nbriere/Textures" + split[split.length-1]; |
---|
8070 | | - else |
---|
8071 | | - if (!texname.startsWith("/")) |
---|
8072 | | - texname = "/Users/nbriere/Textures/" + texname; |
---|
| 8233 | + String fallbackTextureName = defaultDirectory + "/Textures/" + texname; |
---|
| 8234 | + |
---|
| 8235 | +// String[] split = tex.split("Textures"); |
---|
| 8236 | +// if (split.length > 1) |
---|
| 8237 | +// texname = "/Users/nbriere/Textures" + split[split.length-1]; |
---|
| 8238 | +// else |
---|
| 8239 | +// if (!texname.startsWith("/")) |
---|
| 8240 | +// texname = "/Users/nbriere/Textures/" + texname; |
---|
| 8241 | + if (!FileExists(tex)) |
---|
| 8242 | + { |
---|
| 8243 | + texname = fallbackTextureName; |
---|
| 8244 | + } |
---|
8073 | 8245 | |
---|
8074 | 8246 | if (CACHETEXTURE) |
---|
8075 | 8247 | texture = textures.get(texname); // TEXTURE CACHE |
---|
.. | .. |
---|
8138 | 8310 | } |
---|
8139 | 8311 | |
---|
8140 | 8312 | cachename = texname.substring(0, texname.length()-4)+ext+".jpg"; |
---|
8141 | | - if (!new File(cachename).exists()) |
---|
| 8313 | + if (!FileExists(cachename)) |
---|
8142 | 8314 | cachename = texname; |
---|
8143 | 8315 | else |
---|
8144 | 8316 | processbump = false; // don't process bump map again |
---|
.. | .. |
---|
8160 | 8332 | } |
---|
8161 | 8333 | |
---|
8162 | 8334 | cachename = texname.substring(0, texname.length()-4)+ext+".png"; |
---|
8163 | | - if (!new File(cachename).exists()) |
---|
| 8335 | + if (!FileExists(cachename)) |
---|
8164 | 8336 | cachename = texname; |
---|
8165 | 8337 | else |
---|
8166 | 8338 | processbump = false; // don't process bump map again |
---|
.. | .. |
---|
8169 | 8341 | texturedata = GetFileTexture(cachename, processbump, resolution); |
---|
8170 | 8342 | |
---|
8171 | 8343 | |
---|
8172 | | - if (texturedata != null) |
---|
| 8344 | + if (texturedata == null) |
---|
| 8345 | + throw new Exception(); |
---|
| 8346 | + |
---|
8173 | 8347 | texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution); |
---|
8174 | 8348 | //texture = GetTexture(tex, bump); |
---|
8175 | 8349 | } |
---|
.. | .. |
---|
8291 | 8465 | return texture; |
---|
8292 | 8466 | } |
---|
8293 | 8467 | |
---|
8294 | | - com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) |
---|
| 8468 | + com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception |
---|
8295 | 8469 | { |
---|
8296 | 8470 | CacheTexture texture = GetCacheTexture(tex, bump, resolution); |
---|
8297 | 8471 | |
---|
.. | .. |
---|
8309 | 8483 | return texture!=null?texture.texture:null; |
---|
8310 | 8484 | } |
---|
8311 | 8485 | |
---|
8312 | | - public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) |
---|
| 8486 | + public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception |
---|
8313 | 8487 | { |
---|
8314 | 8488 | CacheTexture texture = GetCacheTexture(tex, bump, resolution); |
---|
8315 | 8489 | |
---|
8316 | 8490 | return texture!=null?texture.texturedata:null; |
---|
8317 | 8491 | } |
---|
8318 | 8492 | |
---|
8319 | | - boolean BindTexture(String tex, boolean bump, int resolution) |
---|
| 8493 | + boolean BindTexture(String tex, boolean bump, int resolution) throws Exception |
---|
8320 | 8494 | { |
---|
8321 | 8495 | if (/*tex == null ||*/ ambientOcclusion ) // || !textureon) |
---|
8322 | 8496 | { |
---|
.. | .. |
---|
9293 | 9467 | assert (parentcam != renderCamera); |
---|
9294 | 9468 | |
---|
9295 | 9469 | if (renderCamera != lightCamera) |
---|
9296 | | - for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
9297 | | - LA.matConcat(matrix, parentcam.toParent, matrix); |
---|
| 9470 | + //for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
| 9471 | + LA.matConcat(matrix, parentcam.GlobalTransform(), matrix); |
---|
9298 | 9472 | |
---|
9299 | 9473 | // LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix); |
---|
9300 | 9474 | |
---|
.. | .. |
---|
9309 | 9483 | LA.matCopy(renderCamera.fromScreen, matrix); |
---|
9310 | 9484 | |
---|
9311 | 9485 | if (renderCamera != lightCamera) |
---|
9312 | | - for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
9313 | | - LA.matConcat(parentcam.fromParent, matrix, matrix); |
---|
| 9486 | + //for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
| 9487 | + LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix); |
---|
9314 | 9488 | |
---|
9315 | 9489 | // LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix); |
---|
9316 | 9490 | |
---|
.. | .. |
---|
9382 | 9556 | //gl.glFlush(); |
---|
9383 | 9557 | gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE); |
---|
9384 | 9558 | |
---|
9385 | | - if (ANIMATION && ABORTED) |
---|
| 9559 | + if (Globals.ANIMATION && ABORTED) |
---|
9386 | 9560 | { |
---|
9387 | 9561 | System.err.println(" ABORTED FRAME"); |
---|
9388 | 9562 | break; |
---|
.. | .. |
---|
9412 | 9586 | setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); |
---|
9413 | 9587 | |
---|
9414 | 9588 | // save image |
---|
9415 | | - if (ANIMATION && !ABORTED) |
---|
| 9589 | + if (Globals.ANIMATION && !ABORTED) |
---|
9416 | 9590 | { |
---|
9417 | 9591 | VPwidth = viewport[2]; |
---|
9418 | 9592 | VPheight = viewport[3]; |
---|
.. | .. |
---|
9523 | 9697 | |
---|
9524 | 9698 | // imagecount++; |
---|
9525 | 9699 | |
---|
9526 | | - String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext; |
---|
| 9700 | + String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext; |
---|
9527 | 9701 | |
---|
9528 | 9702 | if (!BOXMODE) |
---|
9529 | 9703 | { |
---|
9530 | | - System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")"); |
---|
| 9704 | + System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")"); |
---|
9531 | 9705 | } |
---|
9532 | 9706 | |
---|
9533 | 9707 | if (!BOXMODE) |
---|
.. | .. |
---|
9565 | 9739 | ABORTED = false; |
---|
9566 | 9740 | } |
---|
9567 | 9741 | else |
---|
9568 | | - GrafreeD.wav.cursor += 735 * ACSIZE; |
---|
| 9742 | + Grafreed.wav.cursor += 735 * ACSIZE; |
---|
9569 | 9743 | |
---|
9570 | 9744 | if (false) |
---|
9571 | 9745 | { |
---|
.. | .. |
---|
10228 | 10402 | |
---|
10229 | 10403 | public void display(GLAutoDrawable drawable) |
---|
10230 | 10404 | { |
---|
10231 | | - if (GrafreeD.savesound && GrafreeD.hassound) |
---|
| 10405 | + if (Grafreed.savesound && Grafreed.hassound) |
---|
10232 | 10406 | { |
---|
10233 | | - GrafreeD.wav.save(); |
---|
10234 | | - GrafreeD.savesound = false; |
---|
10235 | | - GrafreeD.hassound = false; |
---|
| 10407 | + Grafreed.wav.save(); |
---|
| 10408 | + Grafreed.savesound = false; |
---|
| 10409 | + Grafreed.hassound = false; |
---|
10236 | 10410 | } |
---|
10237 | 10411 | // if (DEBUG_SELECTION) |
---|
10238 | 10412 | // { |
---|
.. | .. |
---|
10362 | 10536 | Object3D theobject = object; |
---|
10363 | 10537 | Object3D theparent = object.parent; |
---|
10364 | 10538 | object.parent = null; |
---|
10365 | | - object = (Object3D)GrafreeD.clone(object); |
---|
| 10539 | + object = (Object3D)Grafreed.clone(object); |
---|
10366 | 10540 | object.Stripify(); |
---|
10367 | 10541 | if (theobject.selection == null || theobject.selection.Size() == 0) |
---|
10368 | 10542 | theobject.PreprocessOcclusion(this); |
---|
.. | .. |
---|
10375 | 10549 | ambientOcclusion = false; |
---|
10376 | 10550 | } |
---|
10377 | 10551 | |
---|
10378 | | - if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN) |
---|
| 10552 | + if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN) |
---|
10379 | 10553 | { |
---|
10380 | 10554 | //if (RENDERSHADOW) // ? |
---|
10381 | 10555 | if (!IsFrozen()) |
---|
10382 | 10556 | { |
---|
10383 | 10557 | // dec 2012 |
---|
10384 | | - if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0)) |
---|
| 10558 | + if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0)) |
---|
10385 | 10559 | { |
---|
10386 | 10560 | Globals.framecount++; |
---|
10387 | 10561 | shadowbuffer.display(); |
---|
.. | .. |
---|
10508 | 10682 | |
---|
10509 | 10683 | // if (parentcam != renderCamera) // not a light |
---|
10510 | 10684 | if (cam != lightCamera) |
---|
10511 | | - for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
10512 | | - LA.matConcat(matrix, parentcam.toParent, matrix); |
---|
| 10685 | + //for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
| 10686 | + LA.matConcat(matrix, parentcam.GlobalTransform(), matrix); |
---|
10513 | 10687 | |
---|
10514 | 10688 | for (int j = 0; j < 4; j++) |
---|
10515 | 10689 | { |
---|
.. | .. |
---|
10523 | 10697 | |
---|
10524 | 10698 | // if (parentcam != renderCamera) // not a light |
---|
10525 | 10699 | if (cam != lightCamera) |
---|
10526 | | - for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
10527 | | - LA.matConcat(parentcam.fromParent, matrix, matrix); |
---|
| 10700 | + //for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
| 10701 | + LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix); |
---|
10528 | 10702 | |
---|
10529 | 10703 | //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix); |
---|
10530 | 10704 | |
---|
.. | .. |
---|
10783 | 10957 | // Bump noise |
---|
10784 | 10958 | gl.glActiveTexture(GL.GL_TEXTURE6); |
---|
10785 | 10959 | //gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise); |
---|
10786 | | - BindTexture(NOISE_TEXTURE, false, 2); |
---|
| 10960 | + |
---|
| 10961 | + try |
---|
| 10962 | + { |
---|
| 10963 | + BindTexture(NOISE_TEXTURE, false, 2); |
---|
| 10964 | + } |
---|
| 10965 | + catch (Exception e) |
---|
| 10966 | + { |
---|
| 10967 | + System.err.println("FAILED: " + NOISE_TEXTURE); |
---|
| 10968 | + } |
---|
| 10969 | + |
---|
10787 | 10970 | |
---|
10788 | 10971 | gl.glActiveTexture(GL.GL_TEXTURE0); |
---|
10789 | 10972 | gl.glEnable(GL.GL_TEXTURE_2D); |
---|
.. | .. |
---|
10908 | 11091 | System.err.println("parentcam != renderCamera"); |
---|
10909 | 11092 | |
---|
10910 | 11093 | // if (cam != lightCamera) |
---|
10911 | | - for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
10912 | | - LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013 |
---|
| 11094 | + //for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
| 11095 | + LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013 |
---|
10913 | 11096 | } |
---|
10914 | 11097 | |
---|
10915 | 11098 | LA.xformDir(lightposition, cam.toScreen, lightposition); |
---|
.. | .. |
---|
10930 | 11113 | if (true) // TODO |
---|
10931 | 11114 | { |
---|
10932 | 11115 | if (cam != lightCamera) |
---|
10933 | | - for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
10934 | | - LA.xformDir(light0, parentcam.toParent, light0); // may 2013 |
---|
| 11116 | + //for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
| 11117 | + LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013 |
---|
10935 | 11118 | } |
---|
10936 | 11119 | |
---|
10937 | 11120 | LA.xformPos(light0, cam.toScreen, light0); |
---|
.. | .. |
---|
11247 | 11430 | { |
---|
11248 | 11431 | renderpass++; |
---|
11249 | 11432 | // System.out.println("Draw object... "); |
---|
| 11433 | + STEP = 1; |
---|
11250 | 11434 | if (FAST) // in case there is no script |
---|
11251 | | - STEP = 16; |
---|
| 11435 | + STEP = 8; |
---|
| 11436 | + |
---|
| 11437 | + if (CURRENTANTIALIAS == 0 || ACSIZE == 1) |
---|
| 11438 | + { |
---|
| 11439 | + STEP *= 4; |
---|
| 11440 | + } |
---|
11252 | 11441 | |
---|
11253 | 11442 | //object.FullInvariants(); |
---|
11254 | 11443 | |
---|
.. | .. |
---|
11262 | 11451 | e.printStackTrace(); |
---|
11263 | 11452 | } |
---|
11264 | 11453 | |
---|
11265 | | - if (GrafreeD.RENDERME > 0) |
---|
11266 | | - GrafreeD.RENDERME--; // mechante magouille |
---|
| 11454 | + if (Grafreed.RENDERME > 0) |
---|
| 11455 | + Grafreed.RENDERME--; // mechante magouille |
---|
11267 | 11456 | |
---|
11268 | 11457 | Globals.ONESTEP = false; |
---|
11269 | 11458 | } |
---|
.. | .. |
---|
11333 | 11522 | |
---|
11334 | 11523 | usedtextures.clear(); |
---|
11335 | 11524 | |
---|
11336 | | - BindTextures(DEFAULT_TEXTURES, 2); |
---|
| 11525 | + try |
---|
| 11526 | + { |
---|
| 11527 | + BindTextures(DEFAULT_TEXTURES, 2); |
---|
| 11528 | + } |
---|
| 11529 | + catch (Exception e) |
---|
| 11530 | + { |
---|
| 11531 | + System.err.println("FAILED: " + DEFAULT_TEXTURES); |
---|
| 11532 | + } |
---|
11337 | 11533 | } |
---|
11338 | 11534 | //System.out.println("--> " + stackdepth); |
---|
11339 | 11535 | // GrafreeD.traceon(); |
---|
.. | .. |
---|
11424 | 11620 | if (checker != null && DrawMode() == DEFAULT) |
---|
11425 | 11621 | { |
---|
11426 | 11622 | //BindTexture(IMMORTAL_TEXTURE); |
---|
11427 | | - BindTextures(checker.GetTextures(), checker.texres); |
---|
| 11623 | + try |
---|
| 11624 | + { |
---|
| 11625 | + BindTextures(checker.GetTextures(), checker.texres); |
---|
| 11626 | + } |
---|
| 11627 | + catch (Exception e) |
---|
| 11628 | + { |
---|
| 11629 | + System.err.println("FAILED: " + checker.GetTextures()); |
---|
| 11630 | + } |
---|
11428 | 11631 | // NEAREST |
---|
11429 | 11632 | GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR); |
---|
11430 | 11633 | DrawChecker(gl); |
---|
.. | .. |
---|
11506 | 11709 | return; |
---|
11507 | 11710 | } |
---|
11508 | 11711 | |
---|
11509 | | - String string = obj.GetToolTip(); |
---|
| 11712 | + String string = obj.toString(); //.GetToolTip(); |
---|
11510 | 11713 | |
---|
11511 | 11714 | GL gl = GetGL(); |
---|
11512 | 11715 | |
---|
.. | .. |
---|
11823 | 12026 | //obj.TransformToWorld(light, light); |
---|
11824 | 12027 | for (int i = tp.size(); --i >= 0;) |
---|
11825 | 12028 | { |
---|
11826 | | - for (int count = tp.get(i).GetTransformCount(); --count>=0;) |
---|
11827 | | - LA.xformPos(light, tp.get(i).toParent, light); |
---|
| 12029 | + //for (int count = tp.get(i).GetTransformCount(); --count>=0;) |
---|
| 12030 | + LA.xformPos(light, tp.get(i).GlobalTransform(), light); |
---|
11828 | 12031 | } |
---|
11829 | 12032 | |
---|
11830 | 12033 | |
---|
.. | .. |
---|
11841 | 12044 | parentcam = cameras[0]; |
---|
11842 | 12045 | } |
---|
11843 | 12046 | |
---|
11844 | | - for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
11845 | | - LA.xformPos(light, parentcam.toParent, light); // may 2013 |
---|
| 12047 | + //for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
| 12048 | + LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013 |
---|
11846 | 12049 | |
---|
11847 | 12050 | LA.xformPos(light, renderCamera.toScreen, light); |
---|
11848 | 12051 | |
---|
.. | .. |
---|
12456 | 12659 | |
---|
12457 | 12660 | // display shadow only (bump == 0) |
---|
12458 | 12661 | "SUB temp.x, half.x, shadow.x;" + |
---|
12459 | | - "MOV temp.y, -params6.x;" + |
---|
12460 | | - "SLT temp.z, temp.y, zero.x;" + |
---|
| 12662 | + "MOV temp.y, -params5.z;" + // params6.x;" + |
---|
| 12663 | + "SLT temp.z, temp.y, -one2048th.x;" + |
---|
12461 | 12664 | "SUB temp.y, one.x, temp.z;" + |
---|
12462 | 12665 | "MUL temp.x, temp.x, temp.y;" + |
---|
12463 | 12666 | "KIL temp.x;" + |
---|
.. | .. |
---|
12586 | 12789 | "MAX ndotl.x, ndotl.x, -ndotl.x;" + |
---|
12587 | 12790 | |
---|
12588 | 12791 | "SUB temp.x, one.x, ndotl.x;" + |
---|
12589 | | - "ADD temp.x, temp.x, options2.z;" + // lightsheen |
---|
12590 | | - "ADD temp.y, one.y, options2.y;" + // sursurface |
---|
| 12792 | + // Tuning for default skin |
---|
| 12793 | + //"ADD temp.x, temp.x, options2.z;" + // lightsheen |
---|
| 12794 | + "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen |
---|
| 12795 | + "ADD temp.y, one.y, options2.y;" + // subsurface |
---|
12591 | 12796 | "MUL temp.x, temp.x, temp.y;" + |
---|
12592 | 12797 | |
---|
12593 | 12798 | "MUL saturation, saturation, temp.xxxx;" + |
---|
.. | .. |
---|
12786 | 12991 | //once = true; |
---|
12787 | 12992 | } |
---|
12788 | 12993 | |
---|
12789 | | - System.out.print("Program #" + mode + "; length = " + program.length()); |
---|
| 12994 | + System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length()); |
---|
12790 | 12995 | System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : "")); |
---|
12791 | 12996 | loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program); |
---|
12792 | 12997 | |
---|
.. | .. |
---|
12919 | 13124 | |
---|
12920 | 13125 | "ADD " + depth + ".z, " + depth + ".z, temp.x;" + |
---|
12921 | 13126 | //"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing! |
---|
| 13127 | + |
---|
| 13128 | + // Compare fragment depth in light space with shadowmap. |
---|
12922 | 13129 | "SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" + |
---|
12923 | 13130 | "SGE temp.y, temp.x, zero.x;" + |
---|
12924 | | - "SUB " + shadow + ".y, one.x, temp.y;" + |
---|
| 13131 | + "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded |
---|
| 13132 | + |
---|
| 13133 | + // Reverse comparison |
---|
12925 | 13134 | "SUB temp.x, one.x, temp.x;" + |
---|
12926 | 13135 | "MUL " + shadow + ".x, temp.x, temp.y;" + |
---|
12927 | | - "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded |
---|
| 13136 | + "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse |
---|
12928 | 13137 | "POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth |
---|
12929 | 13138 | |
---|
12930 | 13139 | "SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" + |
---|
.. | .. |
---|
12938 | 13147 | // No shadow for backface |
---|
12939 | 13148 | "DP3 temp.x, normal, lightd;" + |
---|
12940 | 13149 | "SLT temp.x, temp.x, zero.x;" + // shadoweps |
---|
| 13150 | + "LRP " + shadow + ", temp.x, one, " + shadow + ";" + |
---|
| 13151 | + |
---|
| 13152 | + // No shadow when out of frustrum |
---|
| 13153 | + "SGE temp.x, " + depth + ".z, one.z;" + |
---|
12941 | 13154 | "LRP " + shadow + ", temp.x, one, " + shadow + ";" + |
---|
12942 | 13155 | ""; |
---|
12943 | 13156 | } |
---|
.. | .. |
---|
13496 | 13709 | public void mousePressed(MouseEvent e) |
---|
13497 | 13710 | { |
---|
13498 | 13711 | //System.out.println("mousePressed: " + e); |
---|
13499 | | - clickStart(e.getX(), e.getY(), e.getModifiersEx()); |
---|
| 13712 | + clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx()); |
---|
13500 | 13713 | } |
---|
13501 | 13714 | |
---|
13502 | 13715 | static long prevtime = 0; |
---|
.. | .. |
---|
13523 | 13736 | |
---|
13524 | 13737 | //System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio); |
---|
13525 | 13738 | |
---|
| 13739 | + if (BUTTONLESSWHEEL) |
---|
13526 | 13740 | if (Math.abs(ratio) < 0.1 || Math.abs(Dtime) == 0) // < 30) |
---|
13527 | 13741 | { |
---|
13528 | 13742 | return; |
---|
.. | .. |
---|
13531 | 13745 | boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK); |
---|
13532 | 13746 | |
---|
13533 | 13747 | // TIMER |
---|
13534 | | - if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR |
---|
| 13748 | + if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR |
---|
13535 | 13749 | { |
---|
13536 | 13750 | keepboxmode = BOXMODE; |
---|
13537 | 13751 | keepsupport = SUPPORT; |
---|
.. | .. |
---|
13571 | 13785 | // mode |= META; |
---|
13572 | 13786 | //} |
---|
13573 | 13787 | |
---|
13574 | | - SetMouseMode(WHEEL | e.getModifiersEx()); |
---|
13575 | | - drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0); |
---|
| 13788 | + SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx()); |
---|
| 13789 | + drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0); |
---|
13576 | 13790 | anchorX = ax; |
---|
13577 | 13791 | anchorY = ay; |
---|
13578 | 13792 | prevX = px; |
---|
.. | .. |
---|
13632 | 13846 | // wasliveok = true; |
---|
13633 | 13847 | // waslive = false; |
---|
13634 | 13848 | |
---|
| 13849 | + // May 2019 Forget it: |
---|
| 13850 | + if (true) |
---|
| 13851 | + return; |
---|
| 13852 | + |
---|
13635 | 13853 | // source == timer |
---|
13636 | 13854 | if (mouseDown) |
---|
13637 | 13855 | { |
---|
.. | .. |
---|
13670 | 13888 | |
---|
13671 | 13889 | javax.swing.Timer timer = new javax.swing.Timer(350, this); |
---|
13672 | 13890 | |
---|
13673 | | - void clickStart(int x, int y, int modifiers) |
---|
| 13891 | + void clickStart(int x, int y, int modifiers, int modifiersex) |
---|
13674 | 13892 | { |
---|
13675 | 13893 | if (!wasliveok) |
---|
13676 | 13894 | return; |
---|
.. | .. |
---|
13687 | 13905 | // touched = true; // main DL |
---|
13688 | 13906 | if (isRenderer) |
---|
13689 | 13907 | { |
---|
13690 | | - SetMouseMode(modifiers); |
---|
| 13908 | + SetMouseMode(modifiers, modifiersex); |
---|
13691 | 13909 | } |
---|
13692 | 13910 | |
---|
13693 | 13911 | selectX = anchorX = x; |
---|
.. | .. |
---|
13700 | 13918 | clicked = true; |
---|
13701 | 13919 | hold = false; |
---|
13702 | 13920 | |
---|
13703 | | - if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection |
---|
| 13921 | + if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection |
---|
13704 | 13922 | // june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection |
---|
13705 | 13923 | { |
---|
13706 | 13924 | // System.out.println("RESTART II " + modifiers); |
---|
.. | .. |
---|
13731 | 13949 | info.camera = renderCamera; |
---|
13732 | 13950 | info.x = x; |
---|
13733 | 13951 | info.y = y; |
---|
13734 | | - info.modifiers = modifiers; |
---|
| 13952 | + info.modifiers = modifiersex; |
---|
13735 | 13953 | editObj = object.doEditClick(info, 0); |
---|
13736 | 13954 | if (!editObj) |
---|
13737 | 13955 | { |
---|
.. | .. |
---|
13748 | 13966 | |
---|
13749 | 13967 | public void mouseDragged(MouseEvent e) |
---|
13750 | 13968 | { |
---|
| 13969 | + Globals.MOUSEDRAGGED = true; |
---|
| 13970 | + |
---|
| 13971 | + //System.out.println("mouseDragged: " + e); |
---|
13751 | 13972 | if (isRenderer) |
---|
13752 | 13973 | movingcamera = true; |
---|
| 13974 | + |
---|
13753 | 13975 | //if (drawing) |
---|
13754 | 13976 | //return; |
---|
13755 | | - //System.out.println("mouseDragged: " + e); |
---|
13756 | 13977 | if ((e.getModifiersEx() & CTRL) != 0 |
---|
13757 | 13978 | || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen()) |
---|
13758 | 13979 | { |
---|
.. | .. |
---|
13760 | 13981 | clickEnd(e.getX(), e.getY(), e.getModifiersEx()); |
---|
13761 | 13982 | } |
---|
13762 | 13983 | else |
---|
13763 | | - drag(e.getX(), e.getY(), e.getModifiersEx()); |
---|
| 13984 | + drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx()); |
---|
13764 | 13985 | |
---|
13765 | 13986 | //try { Thread.sleep(1); } catch (Exception ex) {} |
---|
13766 | 13987 | } |
---|
.. | .. |
---|
13933 | 14154 | |
---|
13934 | 14155 | public void run() |
---|
13935 | 14156 | { |
---|
| 14157 | + new Exception().printStackTrace(); |
---|
13936 | 14158 | System.exit(0); |
---|
13937 | 14159 | for (;;) |
---|
13938 | 14160 | { |
---|
.. | .. |
---|
13996 | 14218 | { |
---|
13997 | 14219 | Globals.lighttouched = true; |
---|
13998 | 14220 | } |
---|
13999 | | - drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS); |
---|
| 14221 | + drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS); |
---|
14000 | 14222 | } |
---|
14001 | 14223 | //else |
---|
14002 | 14224 | } |
---|
.. | .. |
---|
14096 | 14318 | int X, Y; |
---|
14097 | 14319 | boolean SX, SY; |
---|
14098 | 14320 | |
---|
14099 | | - void drag(int x, int y, int modifiers) |
---|
| 14321 | + void drag(int x, int y, int modifiers, int modifiersex) |
---|
14100 | 14322 | { |
---|
14101 | 14323 | if (IsFrozen()) |
---|
14102 | 14324 | { |
---|
.. | .. |
---|
14105 | 14327 | |
---|
14106 | 14328 | drag = true; // NEW |
---|
14107 | 14329 | |
---|
14108 | | - boolean continuous = (modifiers & COMMAND) == COMMAND; |
---|
| 14330 | + boolean continuous = (modifiersex & COMMAND) == COMMAND; |
---|
14109 | 14331 | |
---|
14110 | 14332 | X = x; |
---|
14111 | 14333 | Y = y; |
---|
14112 | 14334 | // floating state for animation |
---|
14113 | | - MODIFIERS = modifiers; |
---|
14114 | | - modifiers &= ~1024; |
---|
| 14335 | + MODIFIERS = modifiersex; |
---|
| 14336 | + modifiersex &= ~1024; |
---|
14115 | 14337 | if (false) // modifiers != 0) |
---|
14116 | 14338 | { |
---|
14117 | 14339 | //new Exception().printStackTrace(); |
---|
14118 | | - System.out.println("mouseDragged: " + modifiers); |
---|
| 14340 | + System.out.println("mouseDragged: " + modifiersex); |
---|
14119 | 14341 | System.out.println("SHIFT = " + SHIFT); |
---|
14120 | 14342 | System.out.println("CONTROL = " + COMMAND); |
---|
14121 | 14343 | System.out.println("META = " + META); |
---|
.. | .. |
---|
14135 | 14357 | info.camera = renderCamera; |
---|
14136 | 14358 | info.x = x; |
---|
14137 | 14359 | info.y = y; |
---|
14138 | | - object.editWindow.copy.doEditDrag(info); |
---|
| 14360 | + object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0); |
---|
14139 | 14361 | } else |
---|
14140 | 14362 | { |
---|
14141 | 14363 | if (x < startX) |
---|
.. | .. |
---|
14287 | 14509 | public void mouseMoved(MouseEvent e) |
---|
14288 | 14510 | { |
---|
14289 | 14511 | //System.out.println("mouseMoved: " + e); |
---|
14290 | | - |
---|
14291 | 14512 | if (isRenderer) |
---|
14292 | 14513 | return; |
---|
14293 | 14514 | |
---|
.. | .. |
---|
14312 | 14533 | |
---|
14313 | 14534 | public void mouseReleased(MouseEvent e) |
---|
14314 | 14535 | { |
---|
| 14536 | + Globals.MOUSEDRAGGED = false; |
---|
| 14537 | + |
---|
14315 | 14538 | movingcamera = false; |
---|
| 14539 | + X = Y = 0; |
---|
14316 | 14540 | //System.out.println("mouseReleased: " + e); |
---|
14317 | 14541 | clickEnd(e.getX(), e.getY(), e.getModifiersEx()); |
---|
14318 | 14542 | } |
---|
.. | .. |
---|
14335 | 14559 | boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection |
---|
14336 | 14560 | boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection |
---|
14337 | 14561 | |
---|
14338 | | - if (control || command || IsFrozen()) |
---|
| 14562 | +// No delay if (control || command || IsFrozen()) |
---|
14339 | 14563 | timeout = true; |
---|
14340 | | - else |
---|
| 14564 | +// ?? May 2019 else |
---|
14341 | 14565 | // timer.setDelay((modifiers & 128) != 0?0:350); |
---|
14342 | 14566 | mouseDown = false; |
---|
14343 | 14567 | if (!control && !command) // june 2013 |
---|
.. | .. |
---|
14447 | 14671 | System.out.println("keyReleased: " + e); |
---|
14448 | 14672 | } |
---|
14449 | 14673 | |
---|
14450 | | - void SetMouseMode(int modifiers) |
---|
| 14674 | + void SetMouseMode(int modifiers, int modifiersex) |
---|
14451 | 14675 | { |
---|
14452 | 14676 | //System.out.println("SetMouseMode = " + modifiers); |
---|
14453 | 14677 | //modifiers &= ~1024; |
---|
.. | .. |
---|
14459 | 14683 | //if (modifiers == 0) // || (modifiers == (1024 | CONTROL))) |
---|
14460 | 14684 | // return; |
---|
14461 | 14685 | //System.out.println("SetMode = " + modifiers); |
---|
14462 | | - if ((modifiers & WHEEL) == WHEEL) |
---|
| 14686 | + if ((modifiersex & WHEEL) == WHEEL) |
---|
14463 | 14687 | { |
---|
14464 | 14688 | mouseMode |= ZOOM; |
---|
14465 | 14689 | } |
---|
14466 | 14690 | |
---|
14467 | 14691 | boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK); |
---|
14468 | | - if (capsLocked || (modifiers & META) == META) |
---|
| 14692 | + if (capsLocked) // || (modifiers & META) == META) |
---|
14469 | 14693 | { |
---|
14470 | 14694 | mouseMode |= VR; // BACKFORTH; |
---|
14471 | 14695 | } |
---|
14472 | | - if ((modifiers & CTRLCLICK) == CTRLCLICK) |
---|
| 14696 | + if ((modifiersex & CTRLCLICK) == CTRLCLICK) |
---|
14473 | 14697 | { |
---|
14474 | 14698 | mouseMode |= SELECT; |
---|
14475 | 14699 | } |
---|
14476 | | - if ((modifiers & COMMAND) == COMMAND) |
---|
| 14700 | + if ((modifiersex & COMMAND) == COMMAND) |
---|
14477 | 14701 | { |
---|
14478 | 14702 | mouseMode |= SELECT; |
---|
14479 | 14703 | } |
---|
14480 | | - if ((modifiers & SHIFT) == SHIFT || forcetranslate) |
---|
| 14704 | + if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0) |
---|
14481 | 14705 | { |
---|
14482 | 14706 | mouseMode &= ~VR; |
---|
14483 | 14707 | mouseMode |= TRANSLATE; |
---|
.. | .. |
---|
14506 | 14730 | |
---|
14507 | 14731 | if (isRenderer) // |
---|
14508 | 14732 | { |
---|
14509 | | - SetMouseMode(modifiers); |
---|
| 14733 | + SetMouseMode(0, modifiers); |
---|
14510 | 14734 | } |
---|
14511 | 14735 | |
---|
14512 | 14736 | Globals.theRenderer.keyPressed(key); |
---|
.. | .. |
---|
14842 | 15066 | //RESIZETEXTURE ^= true; |
---|
14843 | 15067 | //break; |
---|
14844 | 15068 | case 'z': |
---|
14845 | | - RENDERSHADOW ^= true; |
---|
| 15069 | + Globals.RENDERSHADOW ^= true; |
---|
14846 | 15070 | Globals.lighttouched = true; |
---|
14847 | 15071 | repaint(); |
---|
14848 | 15072 | break; |
---|
.. | .. |
---|
14966 | 15190 | //mode = ROTATE; |
---|
14967 | 15191 | if ((MODIFIERS & COMMAND) == 0) // VR?? |
---|
14968 | 15192 | { |
---|
14969 | | - SetMouseMode(modifiers); |
---|
| 15193 | + SetMouseMode(0, modifiers); |
---|
14970 | 15194 | } |
---|
14971 | 15195 | } |
---|
14972 | 15196 | |
---|
.. | .. |
---|
15100 | 15324 | |
---|
15101 | 15325 | protected void processMouseMotionEvent(MouseEvent e) |
---|
15102 | 15326 | { |
---|
15103 | | - //System.out.println("processMouseMotionEvent: " + mouseMode); |
---|
15104 | | - if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0) |
---|
| 15327 | + //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton()); |
---|
| 15328 | + //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0) |
---|
| 15329 | + if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0) |
---|
15105 | 15330 | { |
---|
15106 | 15331 | mouseMoved(e); |
---|
15107 | 15332 | } else |
---|
.. | .. |
---|
15131 | 15356 | |
---|
15132 | 15357 | void SelectParent() |
---|
15133 | 15358 | { |
---|
| 15359 | + new Exception().printStackTrace(); |
---|
15134 | 15360 | System.exit(0); |
---|
15135 | 15361 | Composite group = (Composite) object; |
---|
15136 | 15362 | java.util.Vector selectees = new java.util.Vector(group.selection); |
---|
.. | .. |
---|
15154 | 15380 | |
---|
15155 | 15381 | void SelectChildren() |
---|
15156 | 15382 | { |
---|
| 15383 | + new Exception().printStackTrace(); |
---|
15157 | 15384 | System.exit(0); |
---|
15158 | 15385 | /* |
---|
15159 | 15386 | Composite group = (Composite) object; |
---|
.. | .. |
---|
15318 | 15545 | info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom)); |
---|
15319 | 15546 | //Image img = CreateImage(width, height); |
---|
15320 | 15547 | //System.out.println("width = " + width + "; height = " + height + "\n"); |
---|
| 15548 | + |
---|
15321 | 15549 | Graphics gr = g; // img.getGraphics(); |
---|
| 15550 | + |
---|
15322 | 15551 | if (!hasMarquee) |
---|
15323 | 15552 | { |
---|
15324 | 15553 | if (Xmin < Xmax) // !locked) |
---|
.. | .. |
---|
15416 | 15645 | if (!isRenderer) |
---|
15417 | 15646 | { |
---|
15418 | 15647 | object.drawEditHandles(info, 0); |
---|
| 15648 | + |
---|
| 15649 | + if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0) |
---|
| 15650 | + { |
---|
| 15651 | + switch (object.selection.get(0).hitSomething) |
---|
| 15652 | + { |
---|
| 15653 | + case Object3D.hitCenter: gr.setColor(Color.pink); |
---|
| 15654 | + gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2); |
---|
| 15655 | + break; |
---|
| 15656 | + case Object3D.hitRotate: gr.setColor(Color.yellow); |
---|
| 15657 | + gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2); |
---|
| 15658 | + break; |
---|
| 15659 | + case Object3D.hitScale: gr.setColor(Color.cyan); |
---|
| 15660 | + gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2); |
---|
| 15661 | + break; |
---|
| 15662 | + } |
---|
| 15663 | + |
---|
| 15664 | + } |
---|
15419 | 15665 | } |
---|
15420 | 15666 | } |
---|
| 15667 | + |
---|
15421 | 15668 | if (isRenderer) |
---|
15422 | 15669 | { |
---|
15423 | 15670 | //gr.setColor(Color.black); |
---|
15424 | 15671 | //gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1); |
---|
15425 | 15672 | //gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3); |
---|
15426 | 15673 | } |
---|
| 15674 | + |
---|
15427 | 15675 | if (hasMarquee) |
---|
15428 | 15676 | { |
---|
15429 | 15677 | gr.setXORMode(Color.white); |
---|
.. | .. |
---|
15536 | 15784 | public boolean mouseDown(Event evt, int x, int y) |
---|
15537 | 15785 | { |
---|
15538 | 15786 | System.out.println("mouseDown: " + evt); |
---|
| 15787 | + System.exit(0); |
---|
15539 | 15788 | /* |
---|
15540 | 15789 | locked = true; |
---|
15541 | 15790 | drag = false; |
---|
.. | .. |
---|
15579 | 15828 | { |
---|
15580 | 15829 | keyPressed(0, modifiers); |
---|
15581 | 15830 | } |
---|
15582 | | - clickStart(x, y, modifiers); |
---|
| 15831 | + // clickStart(x, y, modifiers); |
---|
15583 | 15832 | return true; |
---|
15584 | 15833 | } |
---|
15585 | 15834 | |
---|
.. | .. |
---|
15697 | 15946 | { |
---|
15698 | 15947 | keyReleased(0, 0); |
---|
15699 | 15948 | } |
---|
15700 | | - drag(x, y, modifiers); |
---|
| 15949 | + drag(x, y, 0, modifiers); |
---|
15701 | 15950 | return true; |
---|
15702 | 15951 | } |
---|
15703 | 15952 | |
---|
.. | .. |
---|
15829 | 16078 | Object3D object; |
---|
15830 | 16079 | static Object3D trackedobject; |
---|
15831 | 16080 | Camera renderCamera; // Light or Eye (or Occlusion) |
---|
15832 | | - /*static*/ Camera manipCamera; // Light or Eye |
---|
| 16081 | + /*static*/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light |
---|
15833 | 16082 | /*static*/ Camera eyeCamera; |
---|
15834 | 16083 | /*static*/ Camera lightCamera; |
---|
15835 | 16084 | int cameracount; |
---|
.. | .. |
---|
16267 | 16516 | { |
---|
16268 | 16517 | if (!selection) |
---|
16269 | 16518 | { |
---|
| 16519 | + new Exception().printStackTrace(); |
---|
16270 | 16520 | System.exit(0); |
---|
16271 | 16521 | return; |
---|
16272 | 16522 | } |
---|
.. | .. |
---|
16394 | 16644 | System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2])); |
---|
16395 | 16645 | } |
---|
16396 | 16646 | |
---|
16397 | | - previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint); |
---|
| 16647 | + previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint); |
---|
16398 | 16648 | } |
---|
16399 | 16649 | } |
---|
16400 | 16650 | |
---|
16401 | 16651 | if (!movingcamera && !PAINTMODE) |
---|
16402 | 16652 | object.editWindow.ScreenFitPoint(); // fev 2014 |
---|
16403 | 16653 | |
---|
16404 | | - if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0) |
---|
| 16654 | + if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0) |
---|
16405 | 16655 | { |
---|
16406 | | - Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0); |
---|
| 16656 | + Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0); |
---|
16407 | 16657 | |
---|
16408 | 16658 | Object3D group = new Object3D("inst" + paintcount++); |
---|
16409 | 16659 | |
---|
.. | .. |
---|
16559 | 16809 | gl.glDisable(gl.GL_CULL_FACE); |
---|
16560 | 16810 | } |
---|
16561 | 16811 | |
---|
16562 | | - if (!RENDERSHADOW) |
---|
| 16812 | + if (!Globals.RENDERSHADOW) |
---|
16563 | 16813 | gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT); |
---|
16564 | 16814 | |
---|
16565 | 16815 | // SB gl.glPolygonOffset(2.5f, 10); |
---|
.. | .. |
---|
16569 | 16819 | //gl.glColorMask(false, false, false, false); |
---|
16570 | 16820 | |
---|
16571 | 16821 | //render_scene_from_light_view(gl, drawable, 0, 0); |
---|
16572 | | - if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed()) |
---|
| 16822 | + if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera || !Globals.FREEZEONMOVE)) // && !parent.IsFreezed()) |
---|
16573 | 16823 | { |
---|
16574 | 16824 | gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT); |
---|
16575 | 16825 | |
---|