.. | .. |
---|
37 | 37 | static boolean[] selectedstack = new boolean[65536]; |
---|
38 | 38 | static int materialdepth = 0; |
---|
39 | 39 | |
---|
40 | | - static boolean DEBUG = false; |
---|
41 | 40 | static boolean FRUSTUM = false; // still bogus true; // frustum culling |
---|
42 | 41 | |
---|
43 | 42 | // camera change fix |
---|
.. | .. |
---|
327 | 326 | cStatic.objectstack[materialdepth++] = obj; |
---|
328 | 327 | //System.out.println("material " + material); |
---|
329 | 328 | //Applet3D.tracein(this, selected); |
---|
330 | | - display.vector2buffer = obj.projectedVertices; |
---|
| 329 | + //display.vector2buffer = obj.projectedVertices; |
---|
331 | 330 | if (obj instanceof Camera) |
---|
332 | 331 | { |
---|
333 | 332 | display.options1[0] = material.shift; |
---|
.. | .. |
---|
359 | 358 | /**/ |
---|
360 | 359 | } else |
---|
361 | 360 | { |
---|
362 | | - DrawMaterial(material, selected); |
---|
| 361 | + DrawMaterial(material, selected, obj.projectedVertices); |
---|
363 | 362 | } |
---|
364 | 363 | } else |
---|
365 | 364 | { |
---|
.. | .. |
---|
383 | 382 | cStatic.objectstack[materialdepth++] = obj; |
---|
384 | 383 | //System.out.println("material " + material); |
---|
385 | 384 | //Applet3D.tracein("selected ", selected); |
---|
386 | | - display.vector2buffer = obj.projectedVertices; |
---|
387 | | - display.DrawMaterial(material, selected); |
---|
| 385 | + //display.vector2buffer = obj.projectedVertices; |
---|
| 386 | + display.DrawMaterial(material, selected, obj.projectedVertices); |
---|
388 | 387 | } |
---|
389 | 388 | } |
---|
390 | 389 | |
---|
.. | .. |
---|
401 | 400 | materialdepth -= 1; |
---|
402 | 401 | if (materialdepth > 0) |
---|
403 | 402 | { |
---|
404 | | - display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices; |
---|
405 | | - display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]); |
---|
| 403 | + //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices; |
---|
| 404 | + display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices); |
---|
406 | 405 | } |
---|
407 | 406 | //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???"); |
---|
408 | 407 | } else if (selected && CameraPane.flash && obj.GetMaterial() != null) |
---|
.. | .. |
---|
422 | 421 | materialdepth -= 1; |
---|
423 | 422 | if (materialdepth > 0) |
---|
424 | 423 | { |
---|
425 | | - display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices; |
---|
426 | | - display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]); |
---|
| 424 | + //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices; |
---|
| 425 | + display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices); |
---|
427 | 426 | } |
---|
428 | 427 | //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???"); |
---|
429 | 428 | //else |
---|
.. | .. |
---|
464 | 463 | if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0) |
---|
465 | 464 | { |
---|
466 | 465 | //gl.glBegin(gl.GL_TRIANGLES); |
---|
467 | | - boolean hasnorm = pv.norm != null && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0); |
---|
| 466 | + boolean hasnorm = pv.norm != null && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0) |
---|
| 467 | + // TEST LIVE NORMALS && !obj.dontselect |
---|
| 468 | + ; |
---|
468 | 469 | if (!hasnorm) |
---|
469 | 470 | { |
---|
470 | | - // System.out.println("FUCK!!"); |
---|
| 471 | + // System.out.println("Mesh normal"); |
---|
471 | 472 | LA.vecSub(pv/*.pos*/, qv/*.pos*/, obj.v0); |
---|
472 | 473 | LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1); |
---|
473 | 474 | LA.vecCross(obj.v0, obj.v1, obj.v2); |
---|
.. | .. |
---|
1192 | 1193 | gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1); |
---|
1193 | 1194 | } |
---|
1194 | 1195 | } |
---|
| 1196 | + |
---|
1195 | 1197 | if (flipV) |
---|
1196 | 1198 | gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]); |
---|
1197 | 1199 | else |
---|
1198 | 1200 | gl.glTexCoord2f(uv[count2], uv[count2 + 1]); |
---|
| 1201 | + |
---|
1199 | 1202 | //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]); |
---|
1200 | 1203 | gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]); |
---|
1201 | 1204 | |
---|
.. | .. |
---|
1215 | 1218 | gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1); |
---|
1216 | 1219 | } |
---|
1217 | 1220 | } |
---|
| 1221 | + |
---|
1218 | 1222 | if (flipV) |
---|
1219 | 1223 | gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]); |
---|
1220 | 1224 | else |
---|
1221 | 1225 | gl.glTexCoord2f(uv[count2], uv[count2 + 1]); |
---|
| 1226 | + |
---|
1222 | 1227 | //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]); |
---|
1223 | 1228 | gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]); |
---|
1224 | 1229 | |
---|
.. | .. |
---|
1246 | 1251 | gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]); |
---|
1247 | 1252 | else |
---|
1248 | 1253 | gl.glTexCoord2f(uv[count2], uv[count2 + 1]); |
---|
| 1254 | + |
---|
1249 | 1255 | //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]); |
---|
1250 | 1256 | gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]); |
---|
| 1257 | + |
---|
1251 | 1258 | count2 += 2; |
---|
1252 | 1259 | count3 += 3; |
---|
1253 | 1260 | } |
---|
.. | .. |
---|
1603 | 1610 | // gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0); |
---|
1604 | 1611 | } |
---|
1605 | 1612 | |
---|
1606 | | - void DrawMaterial(cMaterial material, boolean selected) |
---|
| 1613 | + void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others) |
---|
1607 | 1614 | { |
---|
1608 | 1615 | CameraPane display = this; |
---|
1609 | 1616 | //new Exception().printStackTrace(); |
---|
.. | .. |
---|
1638 | 1645 | colorV[0] = display.modelParams0[0] * material.diffuse; |
---|
1639 | 1646 | colorV[1] = display.modelParams0[1] * material.diffuse; |
---|
1640 | 1647 | colorV[2] = display.modelParams0[2] * material.diffuse; |
---|
1641 | | - colorV[3] = material.opacity; |
---|
| 1648 | + colorV[3] = 1; // material.opacity; |
---|
1642 | 1649 | |
---|
1643 | 1650 | gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity); |
---|
1644 | 1651 | //System.out.println("Opacity = " + opacity); |
---|
.. | .. |
---|
1746 | 1753 | display.modelParams7[2] = 0; |
---|
1747 | 1754 | display.modelParams7[3] = 0; |
---|
1748 | 1755 | |
---|
1749 | | - display.modelParams6[0] = 100; // criss de bug de bump |
---|
| 1756 | + //display.modelParams6[0] = 100; // criss de bug de bump |
---|
1750 | 1757 | |
---|
1751 | | - Object3D.cVector2[] extparams = display.vector2buffer; |
---|
| 1758 | + Object3D.cVector2[] extparams = others; // display.vector2buffer; |
---|
1752 | 1759 | if (extparams != null && extparams.length > 0 && extparams[0] != null) |
---|
1753 | 1760 | { |
---|
1754 | 1761 | display.modelParams6[0] = extparams[0].x / 1000.0f; // bump |
---|
.. | .. |
---|
1890 | 1897 | void PushMatrix(double[][] matrix) |
---|
1891 | 1898 | { |
---|
1892 | 1899 | // GrafreeD.tracein(matrix); |
---|
1893 | | - PushMatrix(matrix,1); |
---|
| 1900 | + PushMatrix(matrix, 1); |
---|
1894 | 1901 | } |
---|
1895 | 1902 | |
---|
1896 | 1903 | void PushMatrix() |
---|
.. | .. |
---|
2259 | 2266 | |
---|
2260 | 2267 | void ToggleDebug() |
---|
2261 | 2268 | { |
---|
2262 | | - DEBUG ^= true; |
---|
| 2269 | + Globals.DEBUG ^= true; |
---|
2263 | 2270 | } |
---|
2264 | 2271 | |
---|
2265 | 2272 | void ToggleLookAt() |
---|
.. | .. |
---|
7921 | 7928 | ReleaseTexture(pigment, false); |
---|
7922 | 7929 | } |
---|
7923 | 7930 | |
---|
| 7931 | + public void ReleasePigmentTexture(cTexture tex) // INTERFACE |
---|
| 7932 | + { |
---|
| 7933 | + if (/*tex == null ||*/ ambientOcclusion ) // || !textureon) |
---|
| 7934 | + { |
---|
| 7935 | + return; |
---|
| 7936 | + } |
---|
| 7937 | + |
---|
| 7938 | + if (tex == null) |
---|
| 7939 | + { |
---|
| 7940 | + ReleaseTexture(null, false); |
---|
| 7941 | + return; |
---|
| 7942 | + } |
---|
| 7943 | + |
---|
| 7944 | + String pigment = Object3D.GetPigment(tex); |
---|
| 7945 | + |
---|
| 7946 | + if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES)) |
---|
| 7947 | + { |
---|
| 7948 | + // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment); |
---|
| 7949 | + // System.out.println("; bump = " + bump); |
---|
| 7950 | + } |
---|
| 7951 | + |
---|
| 7952 | + if (pigment.equals("")) |
---|
| 7953 | + { |
---|
| 7954 | + pigment = null; |
---|
| 7955 | + } |
---|
| 7956 | + |
---|
| 7957 | + ReleaseTexture(pigment, false); |
---|
| 7958 | + } |
---|
| 7959 | + |
---|
| 7960 | + public void ReleaseBumpTexture(cTexture tex) // INTERFACE |
---|
| 7961 | + { |
---|
| 7962 | + if (/*tex == null ||*/ ambientOcclusion ) // || !textureon) |
---|
| 7963 | + { |
---|
| 7964 | + return; |
---|
| 7965 | + } |
---|
| 7966 | + |
---|
| 7967 | + if (tex == null) |
---|
| 7968 | + { |
---|
| 7969 | + ReleaseTexture(null, true); |
---|
| 7970 | + return; |
---|
| 7971 | + } |
---|
| 7972 | + |
---|
| 7973 | + String bump = Object3D.GetBump(tex); |
---|
| 7974 | + |
---|
| 7975 | + if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES)) |
---|
| 7976 | + { |
---|
| 7977 | + // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment); |
---|
| 7978 | + // System.out.println("; bump = " + bump); |
---|
| 7979 | + } |
---|
| 7980 | + |
---|
| 7981 | + if (bump.equals("")) |
---|
| 7982 | + { |
---|
| 7983 | + bump = null; |
---|
| 7984 | + } |
---|
| 7985 | + |
---|
| 7986 | + ReleaseTexture(bump, true); |
---|
| 7987 | + } |
---|
| 7988 | + |
---|
7924 | 7989 | void ReleaseTexture(String tex, boolean bump) |
---|
7925 | 7990 | { |
---|
7926 | 7991 | if (// DrawMode() != 0 || /*tex == null ||*/ |
---|
.. | .. |
---|
8067 | 8132 | GetGL().glActiveTexture(GetGL().GL_TEXTURE0); |
---|
8068 | 8133 | |
---|
8069 | 8134 | return; // true; |
---|
| 8135 | + } |
---|
| 8136 | + |
---|
| 8137 | + /*boolean*/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE |
---|
| 8138 | + { |
---|
| 8139 | + if (// DrawMode() != 0 || /*tex == null ||*/ |
---|
| 8140 | + ambientOcclusion ) // || !textureon) |
---|
| 8141 | + { |
---|
| 8142 | + return; // false; |
---|
| 8143 | + } |
---|
| 8144 | + |
---|
| 8145 | + if (tex == null) |
---|
| 8146 | + { |
---|
| 8147 | + BindTexture(null,false,resolution); |
---|
| 8148 | + return; |
---|
| 8149 | + } |
---|
| 8150 | + |
---|
| 8151 | + String pigment = Object3D.GetPigment(tex); |
---|
| 8152 | + |
---|
| 8153 | + usedtextures.put(pigment, pigment); |
---|
| 8154 | + |
---|
| 8155 | + if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES)) |
---|
| 8156 | + { |
---|
| 8157 | + // System.out.print("BIND +++++++++++++++ pigment = " + pigment); |
---|
| 8158 | + // System.out.println("; bump = " + bump); |
---|
| 8159 | + } |
---|
| 8160 | + |
---|
| 8161 | + if (pigment.equals("")) |
---|
| 8162 | + { |
---|
| 8163 | + pigment = null; |
---|
| 8164 | + } |
---|
| 8165 | + |
---|
| 8166 | + GetGL().glActiveTexture(GetGL().GL_TEXTURE0); |
---|
| 8167 | + BindTexture(pigment, false, resolution); |
---|
| 8168 | + } |
---|
| 8169 | + |
---|
| 8170 | + /*boolean*/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE |
---|
| 8171 | + { |
---|
| 8172 | + if (// DrawMode() != 0 || /*tex == null ||*/ |
---|
| 8173 | + ambientOcclusion ) // || !textureon) |
---|
| 8174 | + { |
---|
| 8175 | + return; // false; |
---|
| 8176 | + } |
---|
| 8177 | + |
---|
| 8178 | + if (tex == null) |
---|
| 8179 | + { |
---|
| 8180 | + BindTexture(null,true,resolution); |
---|
| 8181 | + return; |
---|
| 8182 | + } |
---|
| 8183 | + |
---|
| 8184 | + String bump = Object3D.GetBump(tex); |
---|
| 8185 | + |
---|
| 8186 | + usedtextures.put(bump, bump); |
---|
| 8187 | + |
---|
| 8188 | + if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES)) |
---|
| 8189 | + { |
---|
| 8190 | + // System.out.print("BIND +++++++++++++++ pigment = " + pigment); |
---|
| 8191 | + // System.out.println("; bump = " + bump); |
---|
| 8192 | + } |
---|
| 8193 | + |
---|
| 8194 | + if (bump.equals("")) |
---|
| 8195 | + { |
---|
| 8196 | + bump = null; |
---|
| 8197 | + } |
---|
| 8198 | + |
---|
| 8199 | + GetGL().glActiveTexture(GetGL().GL_TEXTURE2); |
---|
| 8200 | + BindTexture(bump, true, resolution); |
---|
| 8201 | + GetGL().glActiveTexture(GetGL().GL_TEXTURE0); |
---|
8070 | 8202 | } |
---|
8071 | 8203 | |
---|
8072 | 8204 | java.util.HashSet<String> missingTextures = new java.util.HashSet<String>(); |
---|
.. | .. |
---|
9335 | 9467 | |
---|
9336 | 9468 | if (renderCamera != lightCamera) |
---|
9337 | 9469 | //for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
9338 | | - LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix); |
---|
| 9470 | + LA.matConcat(matrix, parentcam.GlobalTransform(), matrix); |
---|
9339 | 9471 | |
---|
9340 | 9472 | // LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix); |
---|
9341 | 9473 | |
---|
.. | .. |
---|
9351 | 9483 | |
---|
9352 | 9484 | if (renderCamera != lightCamera) |
---|
9353 | 9485 | //for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
9354 | | - LA.matConcat(parentcam.GlobalTransform(), matrix, matrix); |
---|
| 9486 | + LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix); |
---|
9355 | 9487 | |
---|
9356 | 9488 | // LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix); |
---|
9357 | 9489 | |
---|
.. | .. |
---|
10416 | 10548 | ambientOcclusion = false; |
---|
10417 | 10549 | } |
---|
10418 | 10550 | |
---|
10419 | | - if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN) |
---|
| 10551 | + if (//Globals.lighttouched && |
---|
| 10552 | + DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN) |
---|
10420 | 10553 | { |
---|
10421 | 10554 | //if (RENDERSHADOW) // ? |
---|
10422 | 10555 | if (!IsFrozen()) |
---|
.. | .. |
---|
10550 | 10683 | // if (parentcam != renderCamera) // not a light |
---|
10551 | 10684 | if (cam != lightCamera) |
---|
10552 | 10685 | //for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
10553 | | - LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix); |
---|
| 10686 | + LA.matConcat(matrix, parentcam.GlobalTransform(), matrix); |
---|
10554 | 10687 | |
---|
10555 | 10688 | for (int j = 0; j < 4; j++) |
---|
10556 | 10689 | { |
---|
.. | .. |
---|
10565 | 10698 | // if (parentcam != renderCamera) // not a light |
---|
10566 | 10699 | if (cam != lightCamera) |
---|
10567 | 10700 | //for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
10568 | | - LA.matConcat(parentcam.GlobalTransform(), matrix, matrix); |
---|
| 10701 | + LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix); |
---|
10569 | 10702 | |
---|
10570 | 10703 | //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix); |
---|
10571 | 10704 | |
---|
.. | .. |
---|
10959 | 11092 | |
---|
10960 | 11093 | // if (cam != lightCamera) |
---|
10961 | 11094 | //for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
10962 | | - LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013 |
---|
| 11095 | + LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013 |
---|
10963 | 11096 | } |
---|
10964 | 11097 | |
---|
10965 | 11098 | LA.xformDir(lightposition, cam.toScreen, lightposition); |
---|
.. | .. |
---|
10981 | 11114 | { |
---|
10982 | 11115 | if (cam != lightCamera) |
---|
10983 | 11116 | //for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
10984 | | - LA.xformDir(light0, parentcam.GlobalTransformInv(), light0); // may 2013 |
---|
| 11117 | + LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013 |
---|
10985 | 11118 | } |
---|
10986 | 11119 | |
---|
10987 | 11120 | LA.xformPos(light0, cam.toScreen, light0); |
---|
.. | .. |
---|
11326 | 11459 | |
---|
11327 | 11460 | static boolean zoomonce = false; |
---|
11328 | 11461 | |
---|
| 11462 | + static void CreateSelectedPoint() |
---|
| 11463 | + { |
---|
| 11464 | + if (selectedpoint == null) |
---|
| 11465 | + { |
---|
| 11466 | + debugpointG = new Sphere(); |
---|
| 11467 | + debugpointP = new Sphere(); |
---|
| 11468 | + debugpointC = new Sphere(); |
---|
| 11469 | + debugpointR = new Sphere(); |
---|
| 11470 | + |
---|
| 11471 | + selectedpoint = new Superellipsoid(); |
---|
| 11472 | + |
---|
| 11473 | + for (int i=0; i<8; i++) |
---|
| 11474 | + { |
---|
| 11475 | + debugpoints[i] = new Sphere(); |
---|
| 11476 | + } |
---|
| 11477 | + } |
---|
| 11478 | + } |
---|
| 11479 | + |
---|
11329 | 11480 | void DrawObject(GL gl, boolean draw) |
---|
11330 | 11481 | { |
---|
11331 | 11482 | //System.out.println("DRAW OBJECT " + mouseDown); |
---|
.. | .. |
---|
11406 | 11557 | |
---|
11407 | 11558 | if (DrawMode() == DEFAULT) |
---|
11408 | 11559 | { |
---|
11409 | | - if (DEBUG) |
---|
| 11560 | + if (Globals.DEBUG) |
---|
11410 | 11561 | { |
---|
| 11562 | + CreateSelectedPoint(); |
---|
11411 | 11563 | float radius = 0.05f; |
---|
11412 | 11564 | if (selectedpoint.radius != radius) |
---|
11413 | 11565 | { |
---|
.. | .. |
---|
11894 | 12046 | for (int i = tp.size(); --i >= 0;) |
---|
11895 | 12047 | { |
---|
11896 | 12048 | //for (int count = tp.get(i).GetTransformCount(); --count>=0;) |
---|
11897 | | - LA.xformPos(light, tp.get(i).GlobalTransformInv(), light); |
---|
| 12049 | + LA.xformPos(light, tp.get(i).GlobalTransform(), light); |
---|
11898 | 12050 | } |
---|
11899 | 12051 | |
---|
11900 | 12052 | |
---|
.. | .. |
---|
11912 | 12064 | } |
---|
11913 | 12065 | |
---|
11914 | 12066 | //for (int count = parentcam.GetTransformCount(); --count>=0;) |
---|
11915 | | - LA.xformPos(light, parentcam.GlobalTransformInv(), light); // may 2013 |
---|
| 12067 | + LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013 |
---|
11916 | 12068 | |
---|
11917 | 12069 | LA.xformPos(light, renderCamera.toScreen, light); |
---|
11918 | 12070 | |
---|
.. | .. |
---|
13164 | 13316 | /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias |
---|
13165 | 13317 | /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough |
---|
13166 | 13318 | /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power |
---|
13167 | | - Object3D.cVector2[] vector2buffer; |
---|
| 13319 | + |
---|
| 13320 | + //Object3D.cVector2[] vector2buffer; |
---|
13168 | 13321 | |
---|
13169 | 13322 | // IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea |
---|
13170 | 13323 | // OUT : diff, spec |
---|
.. | .. |
---|
13833 | 13986 | |
---|
13834 | 13987 | public void mouseDragged(MouseEvent e) |
---|
13835 | 13988 | { |
---|
| 13989 | + Globals.MOUSEDRAGGED = true; |
---|
| 13990 | + |
---|
13836 | 13991 | //System.out.println("mouseDragged: " + e); |
---|
13837 | 13992 | if (isRenderer) |
---|
13838 | 13993 | movingcamera = true; |
---|
.. | .. |
---|
14222 | 14377 | info.camera = renderCamera; |
---|
14223 | 14378 | info.x = x; |
---|
14224 | 14379 | info.y = y; |
---|
14225 | | - object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0); |
---|
| 14380 | + object.GetWindow().copy |
---|
| 14381 | + .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0); |
---|
14226 | 14382 | } else |
---|
14227 | 14383 | { |
---|
14228 | 14384 | if (x < startX) |
---|
.. | .. |
---|
14386 | 14542 | ci.camera = renderCamera; |
---|
14387 | 14543 | if (!isRenderer) |
---|
14388 | 14544 | { |
---|
14389 | | - if (object.editWindow.copy.doEditClick(ci, 0)) |
---|
| 14545 | + //ObjEditor editWindow = object.editWindow; |
---|
| 14546 | + //Object3D copy = editWindow.copy; |
---|
| 14547 | + if (object.doEditClick(ci, 0)) |
---|
14390 | 14548 | { |
---|
14391 | 14549 | setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); |
---|
14392 | 14550 | } else |
---|
.. | .. |
---|
14398 | 14556 | |
---|
14399 | 14557 | public void mouseReleased(MouseEvent e) |
---|
14400 | 14558 | { |
---|
| 14559 | + Globals.MOUSEDRAGGED = false; |
---|
| 14560 | + |
---|
14401 | 14561 | movingcamera = false; |
---|
14402 | 14562 | X = Y = 0; |
---|
14403 | 14563 | //System.out.println("mouseReleased: " + e); |
---|
.. | .. |
---|
14765 | 14925 | RevertCamera(); |
---|
14766 | 14926 | repaint(); |
---|
14767 | 14927 | break; |
---|
14768 | | - case 'L': |
---|
14769 | 14928 | case 'l': |
---|
| 14929 | + lightMode ^= true; |
---|
| 14930 | + Globals.lighttouched = true; |
---|
| 14931 | + manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera; |
---|
| 14932 | + targetLookAt.set(manipCamera.lookAt); |
---|
| 14933 | + repaint(); |
---|
| 14934 | + break; |
---|
| 14935 | + case 'L': |
---|
14770 | 14936 | if (lightMode) |
---|
14771 | 14937 | { |
---|
14772 | 14938 | lightMode = false; |
---|
.. | .. |
---|
14913 | 15079 | kompactbit = 6; |
---|
14914 | 15080 | break; |
---|
14915 | 15081 | case ' ': |
---|
14916 | | - lightMode ^= true; |
---|
14917 | | - Globals.lighttouched = true; |
---|
14918 | | - manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera; |
---|
14919 | | - targetLookAt.set(manipCamera.lookAt); |
---|
| 15082 | + ObjEditor.theFrame.ToggleFullScreen(); |
---|
14920 | 15083 | repaint(); |
---|
14921 | 15084 | break; |
---|
14922 | 15085 | //case '`' : |
---|
14923 | 15086 | case ESC: |
---|
14924 | 15087 | RENDERPROGRAM += 1; |
---|
14925 | 15088 | RENDERPROGRAM %= 3; |
---|
| 15089 | + |
---|
14926 | 15090 | repaint(); |
---|
14927 | 15091 | break; |
---|
14928 | 15092 | case 'Z': |
---|
.. | .. |
---|
15214 | 15378 | } |
---|
15215 | 15379 | */ |
---|
15216 | 15380 | |
---|
15217 | | - object.editWindow.EditSelection(); |
---|
| 15381 | + object.editWindow.EditSelection(false); |
---|
15218 | 15382 | } |
---|
15219 | 15383 | |
---|
15220 | 15384 | void SelectParent() |
---|
.. | .. |
---|
15513 | 15677 | { |
---|
15514 | 15678 | switch (object.selection.get(0).hitSomething) |
---|
15515 | 15679 | { |
---|
15516 | | - case Object3D.hitCenter: gr.setColor(Color.pink); break; |
---|
15517 | | - case Object3D.hitRotate: gr.setColor(Color.green); break; |
---|
15518 | | - case Object3D.hitScale: gr.setColor(Color.cyan); break; |
---|
| 15680 | + case Object3D.hitCenter: gr.setColor(Color.pink); |
---|
| 15681 | + gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2); |
---|
| 15682 | + break; |
---|
| 15683 | + case Object3D.hitRotate: gr.setColor(Color.yellow); |
---|
| 15684 | + gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2); |
---|
| 15685 | + break; |
---|
| 15686 | + case Object3D.hitScale: gr.setColor(Color.cyan); |
---|
| 15687 | + gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2); |
---|
| 15688 | + break; |
---|
15519 | 15689 | } |
---|
15520 | 15690 | |
---|
15521 | | - gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2); |
---|
15522 | 15691 | } |
---|
15523 | 15692 | } |
---|
15524 | 15693 | } |
---|
.. | .. |
---|
16221 | 16390 | cStatic.objectstack[materialdepth++] = checker; |
---|
16222 | 16391 | //System.out.println("material " + material); |
---|
16223 | 16392 | //Applet3D.tracein(this, selected); |
---|
16224 | | - vector2buffer = checker.projectedVertices; |
---|
| 16393 | + //vector2buffer = checker.projectedVertices; |
---|
16225 | 16394 | |
---|
16226 | 16395 | //checker.GetMaterial().Draw(this, false); // true); |
---|
16227 | | - DrawMaterial(checker.GetMaterial(), false); // true); |
---|
| 16396 | + DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true); |
---|
16228 | 16397 | |
---|
16229 | 16398 | materialdepth -= 1; |
---|
16230 | 16399 | if (materialdepth > 0) |
---|
16231 | 16400 | { |
---|
16232 | | - vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices; |
---|
16233 | | - DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]); |
---|
| 16401 | + //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices; |
---|
| 16402 | + DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices); |
---|
16234 | 16403 | } |
---|
16235 | 16404 | //checker.GetMaterial().opacity = 1f; |
---|
16236 | 16405 | ////checker.GetMaterial().ambient = 1f; |
---|
.. | .. |
---|
16453 | 16622 | // System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]); |
---|
16454 | 16623 | // System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]); |
---|
16455 | 16624 | // System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]); |
---|
| 16625 | + |
---|
| 16626 | + CreateSelectedPoint(); |
---|
16456 | 16627 | |
---|
16457 | 16628 | // Will fit the mesh !!! |
---|
16458 | 16629 | selectedpoint.toParent[0][0] = 0.0001; |
---|
.. | .. |
---|
17093 | 17264 | int AAbuffersize = 0; |
---|
17094 | 17265 | |
---|
17095 | 17266 | //double[] selectedpoint = new double[3]; |
---|
17096 | | - static Superellipsoid selectedpoint = new Superellipsoid(); |
---|
| 17267 | + static Superellipsoid selectedpoint; |
---|
17097 | 17268 | static Sphere previousselectedpoint = null; |
---|
17098 | | - static Sphere debugpointG = new Sphere(); |
---|
17099 | | - static Sphere debugpointP = new Sphere(); |
---|
17100 | | - static Sphere debugpointC = new Sphere(); |
---|
17101 | | - static Sphere debugpointR = new Sphere(); |
---|
| 17269 | + static Sphere debugpointG; |
---|
| 17270 | + static Sphere debugpointP; |
---|
| 17271 | + static Sphere debugpointC; |
---|
| 17272 | + static Sphere debugpointR; |
---|
17102 | 17273 | |
---|
17103 | 17274 | static Sphere debugpoints[] = new Sphere[8]; |
---|
17104 | 17275 | |
---|
17105 | | - static |
---|
17106 | | - { |
---|
17107 | | - for (int i=0; i<8; i++) |
---|
17108 | | - { |
---|
17109 | | - debugpoints[i] = new Sphere(); |
---|
17110 | | - } |
---|
17111 | | - } |
---|
17112 | | - |
---|
17113 | 17276 | static void InitPoints(float radius) |
---|
17114 | 17277 | { |
---|
17115 | 17278 | for (int i=0; i<8; i++) |
---|