Normand Briere
2019-06-23 f1382bc839a74ef1d1534c61ea94e53cf54716df
CameraPane.java
....@@ -37,7 +37,6 @@
3737 static boolean[] selectedstack = new boolean[65536];
3838 static int materialdepth = 0;
3939
40
- static boolean DEBUG = false;
4140 static boolean FRUSTUM = false; // still bogus true; // frustum culling
4241
4342 // camera change fix
....@@ -106,7 +105,7 @@
106105 static boolean OEIL = true;
107106 static boolean OEILONCE = false; // do oeilon then oeiloff
108107 static boolean LOOKAT = true;
109
-static boolean RANDOM = true; // false;
108
+static boolean SWITCH = true; // false;
110109 static boolean HANDLES = false; // selection doesn't work!!
111110 static boolean PAINTMODE = false;
112111
....@@ -149,6 +148,8 @@
149148 defaultcaps.setAccumBlueBits(16);
150149 defaultcaps.setAccumAlphaBits(16);
151150 }
151
+
152
+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
152153
153154 void SetAsGLRenderer(boolean b)
154155 {
....@@ -462,10 +463,12 @@
462463 if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
463464 {
464465 //gl.glBegin(gl.GL_TRIANGLES);
465
- 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
+ ;
466469 if (!hasnorm)
467470 {
468
- // System.out.println("FUCK!!");
471
+ // System.out.println("Mesh normal");
469472 LA.vecSub(pv/*.pos*/, qv/*.pos*/, obj.v0);
470473 LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
471474 LA.vecCross(obj.v0, obj.v1, obj.v2);
....@@ -1190,10 +1193,12 @@
11901193 gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
11911194 }
11921195 }
1196
+
11931197 if (flipV)
11941198 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
11951199 else
11961200 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1201
+
11971202 //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
11981203 gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
11991204
....@@ -1213,10 +1218,12 @@
12131218 gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
12141219 }
12151220 }
1221
+
12161222 if (flipV)
12171223 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12181224 else
12191225 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1226
+
12201227 //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
12211228 gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
12221229
....@@ -1244,8 +1251,10 @@
12441251 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12451252 else
12461253 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1254
+
12471255 //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
12481256 gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1257
+
12491258 count2 += 2;
12501259 count3 += 3;
12511260 }
....@@ -1628,7 +1637,7 @@
16281637
16291638 cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
16301639
1631
- float[] colorV = GrafreeD.colorV;
1640
+ float[] colorV = Grafreed.colorV;
16321641
16331642 /**/
16341643 if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
....@@ -1888,7 +1897,7 @@
18881897 void PushMatrix(double[][] matrix)
18891898 {
18901899 // GrafreeD.tracein(matrix);
1891
- PushMatrix(matrix,1);
1900
+ PushMatrix(matrix, 1);
18921901 }
18931902
18941903 void PushMatrix()
....@@ -2140,7 +2149,7 @@
21402149 System.err.println("LIVE = " + Globals.isLIVE());
21412150
21422151 if (!Globals.isLIVE()) // save sound
2143
- GrafreeD.savesound = true; // wav.save();
2152
+ Grafreed.savesound = true; // wav.save();
21442153 // else
21452154 repaint(); // start loop // may 2013
21462155 }
....@@ -2257,7 +2266,7 @@
22572266
22582267 void ToggleDebug()
22592268 {
2260
- DEBUG ^= true;
2269
+ Globals.DEBUG ^= true;
22612270 }
22622271
22632272 void ToggleLookAt()
....@@ -2265,9 +2274,9 @@
22652274 LOOKAT ^= true;
22662275 }
22672276
2268
- void ToggleRandom()
2277
+ void ToggleSwitch()
22692278 {
2270
- RANDOM ^= true;
2279
+ SWITCH ^= true;
22712280 }
22722281
22732282 void ToggleHandles()
....@@ -2374,7 +2383,7 @@
23742383 {
23752384 return currentGL;
23762385 }
2377
-
2386
+
23782387 /**/
23792388 class CacheTexture
23802389 {
....@@ -7919,6 +7928,64 @@
79197928 ReleaseTexture(pigment, false);
79207929 }
79217930
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
+
79227989 void ReleaseTexture(String tex, boolean bump)
79237990 {
79247991 if (// DrawMode() != 0 || /*tex == null ||*/
....@@ -8022,7 +8089,7 @@
80228089 }
80238090 }
80248091
8025
- /*boolean*/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
8092
+ /*boolean*/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
80268093 {
80278094 if (// DrawMode() != 0 || /*tex == null ||*/
80288095 ambientOcclusion ) // || !textureon)
....@@ -8067,7 +8134,94 @@
80678134 return; // true;
80688135 }
80698136
8070
- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
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);
8202
+ }
8203
+
8204
+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
8205
+
8206
+ private boolean FileExists(String tex)
8207
+ {
8208
+ if (missingTextures.contains(tex))
8209
+ {
8210
+ return false;
8211
+ }
8212
+
8213
+ boolean fileExists = new File(tex).exists();
8214
+
8215
+ if (!fileExists)
8216
+ {
8217
+ // If file exists, the "new File()" is not executed sgain
8218
+ missingTextures.add(tex);
8219
+ }
8220
+
8221
+ return fileExists;
8222
+ }
8223
+
8224
+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
80718225 {
80728226 CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
80738227
....@@ -8075,12 +8229,18 @@
80758229 {
80768230 String texname = tex;
80778231
8078
- String[] split = tex.split("Textures");
8079
- if (split.length > 1)
8080
- texname = "/Users/nbriere/Textures" + split[split.length-1];
8081
- else
8082
- if (!texname.startsWith("/"))
8083
- texname = "/Users/nbriere/Textures/" + texname;
8232
+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8233
+
8234
+// String[] split = tex.split("Textures");
8235
+// if (split.length > 1)
8236
+// texname = "/Users/nbriere/Textures" + split[split.length-1];
8237
+// else
8238
+// if (!texname.startsWith("/"))
8239
+// texname = "/Users/nbriere/Textures/" + texname;
8240
+ if (!FileExists(tex))
8241
+ {
8242
+ texname = fallbackTextureName;
8243
+ }
80848244
80858245 if (CACHETEXTURE)
80868246 texture = textures.get(texname); // TEXTURE CACHE
....@@ -8149,7 +8309,7 @@
81498309 }
81508310
81518311 cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8152
- if (!new File(cachename).exists())
8312
+ if (!FileExists(cachename))
81538313 cachename = texname;
81548314 else
81558315 processbump = false; // don't process bump map again
....@@ -8171,7 +8331,7 @@
81718331 }
81728332
81738333 cachename = texname.substring(0, texname.length()-4)+ext+".png";
8174
- if (!new File(cachename).exists())
8334
+ if (!FileExists(cachename))
81758335 cachename = texname;
81768336 else
81778337 processbump = false; // don't process bump map again
....@@ -8180,7 +8340,9 @@
81808340 texturedata = GetFileTexture(cachename, processbump, resolution);
81818341
81828342
8183
- if (texturedata != null)
8343
+ if (texturedata == null)
8344
+ throw new Exception();
8345
+
81848346 texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
81858347 //texture = GetTexture(tex, bump);
81868348 }
....@@ -8302,7 +8464,7 @@
83028464 return texture;
83038465 }
83048466
8305
- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
8467
+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
83068468 {
83078469 CacheTexture texture = GetCacheTexture(tex, bump, resolution);
83088470
....@@ -8320,14 +8482,14 @@
83208482 return texture!=null?texture.texture:null;
83218483 }
83228484
8323
- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
8485
+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
83248486 {
83258487 CacheTexture texture = GetCacheTexture(tex, bump, resolution);
83268488
83278489 return texture!=null?texture.texturedata:null;
83288490 }
83298491
8330
- boolean BindTexture(String tex, boolean bump, int resolution)
8492
+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
83318493 {
83328494 if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
83338495 {
....@@ -9304,8 +9466,8 @@
93049466 assert (parentcam != renderCamera);
93059467
93069468 if (renderCamera != lightCamera)
9307
- for (int count = parentcam.GetTransformCount(); --count>=0;)
9308
- LA.matConcat(matrix, parentcam.toParent, matrix);
9469
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
9470
+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
93099471
93109472 // LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
93119473
....@@ -9320,8 +9482,8 @@
93209482 LA.matCopy(renderCamera.fromScreen, matrix);
93219483
93229484 if (renderCamera != lightCamera)
9323
- for (int count = parentcam.GetTransformCount(); --count>=0;)
9324
- LA.matConcat(parentcam.fromParent, matrix, matrix);
9485
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
9486
+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
93259487
93269488 // LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
93279489
....@@ -9538,7 +9700,7 @@
95389700
95399701 if (!BOXMODE)
95409702 {
9541
- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
9703
+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
95429704 }
95439705
95449706 if (!BOXMODE)
....@@ -9576,7 +9738,7 @@
95769738 ABORTED = false;
95779739 }
95789740 else
9579
- GrafreeD.wav.cursor += 735 * ACSIZE;
9741
+ Grafreed.wav.cursor += 735 * ACSIZE;
95809742
95819743 if (false)
95829744 {
....@@ -10239,11 +10401,11 @@
1023910401
1024010402 public void display(GLAutoDrawable drawable)
1024110403 {
10242
- if (GrafreeD.savesound && GrafreeD.hassound)
10404
+ if (Grafreed.savesound && Grafreed.hassound)
1024310405 {
10244
- GrafreeD.wav.save();
10245
- GrafreeD.savesound = false;
10246
- GrafreeD.hassound = false;
10406
+ Grafreed.wav.save();
10407
+ Grafreed.savesound = false;
10408
+ Grafreed.hassound = false;
1024710409 }
1024810410 // if (DEBUG_SELECTION)
1024910411 // {
....@@ -10373,7 +10535,7 @@
1037310535 Object3D theobject = object;
1037410536 Object3D theparent = object.parent;
1037510537 object.parent = null;
10376
- object = (Object3D)GrafreeD.clone(object);
10538
+ object = (Object3D)Grafreed.clone(object);
1037710539 object.Stripify();
1037810540 if (theobject.selection == null || theobject.selection.Size() == 0)
1037910541 theobject.PreprocessOcclusion(this);
....@@ -10386,13 +10548,13 @@
1038610548 ambientOcclusion = false;
1038710549 }
1038810550
10389
- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
10551
+ if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
1039010552 {
1039110553 //if (RENDERSHADOW) // ?
1039210554 if (!IsFrozen())
1039310555 {
1039410556 // dec 2012
10395
- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
10557
+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
1039610558 {
1039710559 Globals.framecount++;
1039810560 shadowbuffer.display();
....@@ -10519,8 +10681,8 @@
1051910681
1052010682 // if (parentcam != renderCamera) // not a light
1052110683 if (cam != lightCamera)
10522
- for (int count = parentcam.GetTransformCount(); --count>=0;)
10523
- LA.matConcat(matrix, parentcam.toParent, matrix);
10684
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
10685
+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
1052410686
1052510687 for (int j = 0; j < 4; j++)
1052610688 {
....@@ -10534,8 +10696,8 @@
1053410696
1053510697 // if (parentcam != renderCamera) // not a light
1053610698 if (cam != lightCamera)
10537
- for (int count = parentcam.GetTransformCount(); --count>=0;)
10538
- LA.matConcat(parentcam.fromParent, matrix, matrix);
10699
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
10700
+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
1053910701
1054010702 //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1054110703
....@@ -10794,7 +10956,16 @@
1079410956 // Bump noise
1079510957 gl.glActiveTexture(GL.GL_TEXTURE6);
1079610958 //gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10797
- BindTexture(NOISE_TEXTURE, false, 2);
10959
+
10960
+ try
10961
+ {
10962
+ BindTexture(NOISE_TEXTURE, false, 2);
10963
+ }
10964
+ catch (Exception e)
10965
+ {
10966
+ System.err.println("FAILED: " + NOISE_TEXTURE);
10967
+ }
10968
+
1079810969
1079910970 gl.glActiveTexture(GL.GL_TEXTURE0);
1080010971 gl.glEnable(GL.GL_TEXTURE_2D);
....@@ -10919,8 +11090,8 @@
1091911090 System.err.println("parentcam != renderCamera");
1092011091
1092111092 // if (cam != lightCamera)
10922
- for (int count = parentcam.GetTransformCount(); --count>=0;)
10923
- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
11093
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
11094
+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
1092411095 }
1092511096
1092611097 LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -10941,8 +11112,8 @@
1094111112 if (true) // TODO
1094211113 {
1094311114 if (cam != lightCamera)
10944
- for (int count = parentcam.GetTransformCount(); --count>=0;)
10945
- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
11115
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
11116
+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
1094611117 }
1094711118
1094811119 LA.xformPos(light0, cam.toScreen, light0);
....@@ -11279,13 +11450,31 @@
1127911450 e.printStackTrace();
1128011451 }
1128111452
11282
- if (GrafreeD.RENDERME > 0)
11283
- GrafreeD.RENDERME--; // mechante magouille
11453
+ if (Grafreed.RENDERME > 0)
11454
+ Grafreed.RENDERME--; // mechante magouille
1128411455
1128511456 Globals.ONESTEP = false;
1128611457 }
1128711458
1128811459 static boolean zoomonce = false;
11460
+
11461
+ void CreateSelectedPoint()
11462
+ {
11463
+ if (selectedpoint == null)
11464
+ {
11465
+ debugpointG = new Sphere();
11466
+ debugpointP = new Sphere();
11467
+ debugpointC = new Sphere();
11468
+ debugpointR = new Sphere();
11469
+
11470
+ selectedpoint = new Superellipsoid();
11471
+
11472
+ for (int i=0; i<8; i++)
11473
+ {
11474
+ debugpoints[i] = new Sphere();
11475
+ }
11476
+ }
11477
+ }
1128911478
1129011479 void DrawObject(GL gl, boolean draw)
1129111480 {
....@@ -11350,7 +11539,14 @@
1135011539
1135111540 usedtextures.clear();
1135211541
11353
- BindTextures(DEFAULT_TEXTURES, 2);
11542
+ try
11543
+ {
11544
+ BindTextures(DEFAULT_TEXTURES, 2);
11545
+ }
11546
+ catch (Exception e)
11547
+ {
11548
+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
11549
+ }
1135411550 }
1135511551 //System.out.println("--> " + stackdepth);
1135611552 // GrafreeD.traceon();
....@@ -11360,8 +11556,9 @@
1136011556
1136111557 if (DrawMode() == DEFAULT)
1136211558 {
11363
- if (DEBUG)
11559
+ if (Globals.DEBUG)
1136411560 {
11561
+ CreateSelectedPoint();
1136511562 float radius = 0.05f;
1136611563 if (selectedpoint.radius != radius)
1136711564 {
....@@ -11441,7 +11638,14 @@
1144111638 if (checker != null && DrawMode() == DEFAULT)
1144211639 {
1144311640 //BindTexture(IMMORTAL_TEXTURE);
11444
- BindTextures(checker.GetTextures(), checker.texres);
11641
+ try
11642
+ {
11643
+ BindTextures(checker.GetTextures(), checker.texres);
11644
+ }
11645
+ catch (Exception e)
11646
+ {
11647
+ System.err.println("FAILED: " + checker.GetTextures());
11648
+ }
1144511649 // NEAREST
1144611650 GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
1144711651 DrawChecker(gl);
....@@ -11523,7 +11727,7 @@
1152311727 return;
1152411728 }
1152511729
11526
- String string = obj.GetToolTip();
11730
+ String string = obj.toString(); //.GetToolTip();
1152711731
1152811732 GL gl = GetGL();
1152911733
....@@ -11840,8 +12044,8 @@
1184012044 //obj.TransformToWorld(light, light);
1184112045 for (int i = tp.size(); --i >= 0;)
1184212046 {
11843
- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11844
- LA.xformPos(light, tp.get(i).toParent, light);
12047
+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12048
+ LA.xformPos(light, tp.get(i).GlobalTransform(), light);
1184512049 }
1184612050
1184712051
....@@ -11858,8 +12062,8 @@
1185812062 parentcam = cameras[0];
1185912063 }
1186012064
11861
- for (int count = parentcam.GetTransformCount(); --count>=0;)
11862
- LA.xformPos(light, parentcam.toParent, light); // may 2013
12065
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
12066
+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
1186312067
1186412068 LA.xformPos(light, renderCamera.toScreen, light);
1186512069
....@@ -12473,8 +12677,8 @@
1247312677
1247412678 // display shadow only (bump == 0)
1247512679 "SUB temp.x, half.x, shadow.x;" +
12476
- "MOV temp.y, -params6.x;" +
12477
- "SLT temp.z, temp.y, zero.x;" +
12680
+ "MOV temp.y, -params5.z;" + // params6.x;" +
12681
+ "SLT temp.z, temp.y, -one2048th.x;" +
1247812682 "SUB temp.y, one.x, temp.z;" +
1247912683 "MUL temp.x, temp.x, temp.y;" +
1248012684 "KIL temp.x;" +
....@@ -12754,7 +12958,7 @@
1275412958 "MUL final.y, fragment.texcoord[0].x, c256;" +
1275512959 "FLR final.x, final.y;" +
1275612960 "SUB final.y, final.y, final.x;" +
12757
- //"MUL final.x, final.x, c256i;" +
12961
+ "MUL final.x, final.x, c256i;" +
1275812962 "MOV final.z, zero.x;" +
1275912963 "MOV final.a, one.w;":""
1276012964 ) +
....@@ -12762,7 +12966,7 @@
1276212966 "MUL final.y, fragment.texcoord[0].y, c256;" +
1276312967 "FLR final.x, final.y;" +
1276412968 "SUB final.y, final.y, final.x;" +
12765
- //"MUL final.x, final.x, c256i;" +
12969
+ "MUL final.x, final.x, c256i;" +
1276612970 "MOV final.z, zero.x;" +
1276712971 "MOV final.a, one.w;":""
1276812972 ) +
....@@ -12805,7 +13009,7 @@
1280513009 //once = true;
1280613010 }
1280713011
12808
- System.out.print("Program #" + mode + "; length = " + program.length());
13012
+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
1280913013 System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
1281013014 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1281113015
....@@ -12938,12 +13142,16 @@
1293813142
1293913143 "ADD " + depth + ".z, " + depth + ".z, temp.x;" +
1294013144 //"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
13145
+
13146
+ // Compare fragment depth in light space with shadowmap.
1294113147 "SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
1294213148 "SGE temp.y, temp.x, zero.x;" +
12943
- "SUB " + shadow + ".y, one.x, temp.y;" +
13149
+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
13150
+
13151
+ // Reverse comparison
1294413152 "SUB temp.x, one.x, temp.x;" +
1294513153 "MUL " + shadow + ".x, temp.x, temp.y;" +
12946
- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
13154
+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
1294713155 "POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
1294813156
1294913157 "SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
....@@ -12957,6 +13165,10 @@
1295713165 // No shadow for backface
1295813166 "DP3 temp.x, normal, lightd;" +
1295913167 "SLT temp.x, temp.x, zero.x;" + // shadoweps
13168
+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13169
+
13170
+ // No shadow when out of frustrum
13171
+ "SGE temp.x, " + depth + ".z, one.z;" +
1296013172 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1296113173 "";
1296213174 }
....@@ -13515,7 +13727,7 @@
1351513727 public void mousePressed(MouseEvent e)
1351613728 {
1351713729 //System.out.println("mousePressed: " + e);
13518
- clickStart(e.getX(), e.getY(), e.getModifiersEx());
13730
+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1351913731 }
1352013732
1352113733 static long prevtime = 0;
....@@ -13591,8 +13803,8 @@
1359113803 // mode |= META;
1359213804 //}
1359313805
13594
- SetMouseMode(WHEEL | e.getModifiersEx());
13595
- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
13806
+ SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
13807
+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
1359613808 anchorX = ax;
1359713809 anchorY = ay;
1359813810 prevX = px;
....@@ -13652,6 +13864,10 @@
1365213864 // wasliveok = true;
1365313865 // waslive = false;
1365413866
13867
+ // May 2019 Forget it:
13868
+ if (true)
13869
+ return;
13870
+
1365513871 // source == timer
1365613872 if (mouseDown)
1365713873 {
....@@ -13690,7 +13906,7 @@
1369013906
1369113907 javax.swing.Timer timer = new javax.swing.Timer(350, this);
1369213908
13693
- void clickStart(int x, int y, int modifiers)
13909
+ void clickStart(int x, int y, int modifiers, int modifiersex)
1369413910 {
1369513911 if (!wasliveok)
1369613912 return;
....@@ -13707,7 +13923,7 @@
1370713923 // touched = true; // main DL
1370813924 if (isRenderer)
1370913925 {
13710
- SetMouseMode(modifiers);
13926
+ SetMouseMode(modifiers, modifiersex);
1371113927 }
1371213928
1371313929 selectX = anchorX = x;
....@@ -13720,7 +13936,7 @@
1372013936 clicked = true;
1372113937 hold = false;
1372213938
13723
- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
13939
+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
1372413940 // june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
1372513941 {
1372613942 // System.out.println("RESTART II " + modifiers);
....@@ -13751,7 +13967,7 @@
1375113967 info.camera = renderCamera;
1375213968 info.x = x;
1375313969 info.y = y;
13754
- info.modifiers = modifiers;
13970
+ info.modifiers = modifiersex;
1375513971 editObj = object.doEditClick(info, 0);
1375613972 if (!editObj)
1375713973 {
....@@ -13768,9 +13984,12 @@
1376813984
1376913985 public void mouseDragged(MouseEvent e)
1377013986 {
13987
+ Globals.MOUSEDRAGGED = true;
13988
+
1377113989 //System.out.println("mouseDragged: " + e);
1377213990 if (isRenderer)
1377313991 movingcamera = true;
13992
+
1377413993 //if (drawing)
1377513994 //return;
1377613995 if ((e.getModifiersEx() & CTRL) != 0
....@@ -13780,7 +13999,7 @@
1378013999 clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1378114000 }
1378214001 else
13783
- drag(e.getX(), e.getY(), e.getModifiersEx());
14002
+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1378414003
1378514004 //try { Thread.sleep(1); } catch (Exception ex) {}
1378614005 }
....@@ -14017,7 +14236,7 @@
1401714236 {
1401814237 Globals.lighttouched = true;
1401914238 }
14020
- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
14239
+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
1402114240 }
1402214241 //else
1402314242 }
....@@ -14117,7 +14336,7 @@
1411714336 int X, Y;
1411814337 boolean SX, SY;
1411914338
14120
- void drag(int x, int y, int modifiers)
14339
+ void drag(int x, int y, int modifiers, int modifiersex)
1412114340 {
1412214341 if (IsFrozen())
1412314342 {
....@@ -14126,17 +14345,17 @@
1412614345
1412714346 drag = true; // NEW
1412814347
14129
- boolean continuous = (modifiers & COMMAND) == COMMAND;
14348
+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
1413014349
1413114350 X = x;
1413214351 Y = y;
1413314352 // floating state for animation
14134
- MODIFIERS = modifiers;
14135
- modifiers &= ~1024;
14353
+ MODIFIERS = modifiersex;
14354
+ modifiersex &= ~1024;
1413614355 if (false) // modifiers != 0)
1413714356 {
1413814357 //new Exception().printStackTrace();
14139
- System.out.println("mouseDragged: " + modifiers);
14358
+ System.out.println("mouseDragged: " + modifiersex);
1414014359 System.out.println("SHIFT = " + SHIFT);
1414114360 System.out.println("CONTROL = " + COMMAND);
1414214361 System.out.println("META = " + META);
....@@ -14156,7 +14375,7 @@
1415614375 info.camera = renderCamera;
1415714376 info.x = x;
1415814377 info.y = y;
14159
- object.editWindow.copy.doEditDrag(info);
14378
+ object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1416014379 } else
1416114380 {
1416214381 if (x < startX)
....@@ -14332,7 +14551,10 @@
1433214551
1433314552 public void mouseReleased(MouseEvent e)
1433414553 {
14554
+ Globals.MOUSEDRAGGED = false;
14555
+
1433514556 movingcamera = false;
14557
+ X = Y = 0;
1433614558 //System.out.println("mouseReleased: " + e);
1433714559 clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1433814560 }
....@@ -14355,9 +14577,9 @@
1435514577 boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
1435614578 boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
1435714579
14358
- if (control || command || IsFrozen())
14580
+// No delay if (control || command || IsFrozen())
1435914581 timeout = true;
14360
- else
14582
+// ?? May 2019 else
1436114583 // timer.setDelay((modifiers & 128) != 0?0:350);
1436214584 mouseDown = false;
1436314585 if (!control && !command) // june 2013
....@@ -14467,7 +14689,7 @@
1446714689 System.out.println("keyReleased: " + e);
1446814690 }
1446914691
14470
- void SetMouseMode(int modifiers)
14692
+ void SetMouseMode(int modifiers, int modifiersex)
1447114693 {
1447214694 //System.out.println("SetMouseMode = " + modifiers);
1447314695 //modifiers &= ~1024;
....@@ -14479,25 +14701,25 @@
1447914701 //if (modifiers == 0) // || (modifiers == (1024 | CONTROL)))
1448014702 // return;
1448114703 //System.out.println("SetMode = " + modifiers);
14482
- if ((modifiers & WHEEL) == WHEEL)
14704
+ if ((modifiersex & WHEEL) == WHEEL)
1448314705 {
1448414706 mouseMode |= ZOOM;
1448514707 }
1448614708
1448714709 boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14488
- if (capsLocked || (modifiers & META) == META)
14710
+ if (capsLocked) // || (modifiers & META) == META)
1448914711 {
1449014712 mouseMode |= VR; // BACKFORTH;
1449114713 }
14492
- if ((modifiers & CTRLCLICK) == CTRLCLICK)
14714
+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
1449314715 {
1449414716 mouseMode |= SELECT;
1449514717 }
14496
- if ((modifiers & COMMAND) == COMMAND)
14718
+ if ((modifiersex & COMMAND) == COMMAND)
1449714719 {
1449814720 mouseMode |= SELECT;
1449914721 }
14500
- if ((modifiers & SHIFT) == SHIFT || forcetranslate)
14722
+ if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1450114723 {
1450214724 mouseMode &= ~VR;
1450314725 mouseMode |= TRANSLATE;
....@@ -14526,7 +14748,7 @@
1452614748
1452714749 if (isRenderer) //
1452814750 {
14529
- SetMouseMode(modifiers);
14751
+ SetMouseMode(0, modifiers);
1453014752 }
1453114753
1453214754 Globals.theRenderer.keyPressed(key);
....@@ -14698,8 +14920,14 @@
1469814920 RevertCamera();
1469914921 repaint();
1470014922 break;
14701
- case 'L':
1470214923 case 'l':
14924
+ lightMode ^= true;
14925
+ Globals.lighttouched = true;
14926
+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14927
+ targetLookAt.set(manipCamera.lookAt);
14928
+ repaint();
14929
+ break;
14930
+ case 'L':
1470314931 if (lightMode)
1470414932 {
1470514933 lightMode = false;
....@@ -14846,23 +15074,21 @@
1484615074 kompactbit = 6;
1484715075 break;
1484815076 case ' ':
14849
- lightMode ^= true;
14850
- Globals.lighttouched = true;
14851
- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14852
- targetLookAt.set(manipCamera.lookAt);
15077
+ ObjEditor.theFrame.ToggleFullScreen();
1485315078 repaint();
1485415079 break;
1485515080 //case '`' :
1485615081 case ESC:
1485715082 RENDERPROGRAM += 1;
1485815083 RENDERPROGRAM %= 3;
15084
+
1485915085 repaint();
1486015086 break;
1486115087 case 'Z':
1486215088 //RESIZETEXTURE ^= true;
1486315089 //break;
1486415090 case 'z':
14865
- RENDERSHADOW ^= true;
15091
+ Globals.RENDERSHADOW ^= true;
1486615092 Globals.lighttouched = true;
1486715093 repaint();
1486815094 break;
....@@ -14986,7 +15212,7 @@
1498615212 //mode = ROTATE;
1498715213 if ((MODIFIERS & COMMAND) == 0) // VR??
1498815214 {
14989
- SetMouseMode(modifiers);
15215
+ SetMouseMode(0, modifiers);
1499015216 }
1499115217 }
1499215218
....@@ -15122,7 +15348,7 @@
1512215348 {
1512315349 //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
1512415350 //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15125
- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
15351
+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
1512615352 {
1512715353 mouseMoved(e);
1512815354 } else
....@@ -15341,7 +15567,9 @@
1534115567 info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1534215568 //Image img = CreateImage(width, height);
1534315569 //System.out.println("width = " + width + "; height = " + height + "\n");
15570
+
1534415571 Graphics gr = g; // img.getGraphics();
15572
+
1534515573 if (!hasMarquee)
1534615574 {
1534715575 if (Xmin < Xmax) // !locked)
....@@ -15439,14 +15667,33 @@
1543915667 if (!isRenderer)
1544015668 {
1544115669 object.drawEditHandles(info, 0);
15670
+
15671
+ if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
15672
+ {
15673
+ switch (object.selection.get(0).hitSomething)
15674
+ {
15675
+ case Object3D.hitCenter: gr.setColor(Color.pink);
15676
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15677
+ break;
15678
+ case Object3D.hitRotate: gr.setColor(Color.yellow);
15679
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15680
+ break;
15681
+ case Object3D.hitScale: gr.setColor(Color.cyan);
15682
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15683
+ break;
15684
+ }
15685
+
15686
+ }
1544215687 }
1544315688 }
15689
+
1544415690 if (isRenderer)
1544515691 {
1544615692 //gr.setColor(Color.black);
1544715693 //gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
1544815694 //gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
1544915695 }
15696
+
1545015697 if (hasMarquee)
1545115698 {
1545215699 gr.setXORMode(Color.white);
....@@ -15559,6 +15806,7 @@
1555915806 public boolean mouseDown(Event evt, int x, int y)
1556015807 {
1556115808 System.out.println("mouseDown: " + evt);
15809
+ System.exit(0);
1556215810 /*
1556315811 locked = true;
1556415812 drag = false;
....@@ -15602,7 +15850,7 @@
1560215850 {
1560315851 keyPressed(0, modifiers);
1560415852 }
15605
- clickStart(x, y, modifiers);
15853
+ // clickStart(x, y, modifiers);
1560615854 return true;
1560715855 }
1560815856
....@@ -15720,7 +15968,7 @@
1572015968 {
1572115969 keyReleased(0, 0);
1572215970 }
15723
- drag(x, y, modifiers);
15971
+ drag(x, y, 0, modifiers);
1572415972 return true;
1572515973 }
1572615974
....@@ -15852,7 +16100,7 @@
1585216100 Object3D object;
1585316101 static Object3D trackedobject;
1585416102 Camera renderCamera; // Light or Eye (or Occlusion)
15855
- /*static*/ Camera manipCamera; // Light or Eye
16103
+ /*static*/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
1585616104 /*static*/ Camera eyeCamera;
1585716105 /*static*/ Camera lightCamera;
1585816106 int cameracount;
....@@ -16418,16 +16666,16 @@
1641816666 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]));
1641916667 }
1642016668
16421
- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
16669
+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
1642216670 }
1642316671 }
1642416672
1642516673 if (!movingcamera && !PAINTMODE)
1642616674 object.editWindow.ScreenFitPoint(); // fev 2014
1642716675
16428
- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16676
+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1642916677 {
16430
- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16678
+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
1643116679
1643216680 Object3D group = new Object3D("inst" + paintcount++);
1643316681
....@@ -16583,7 +16831,7 @@
1658316831 gl.glDisable(gl.GL_CULL_FACE);
1658416832 }
1658516833
16586
- if (!RENDERSHADOW)
16834
+ if (!Globals.RENDERSHADOW)
1658716835 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1658816836
1658916837 // SB gl.glPolygonOffset(2.5f, 10);
....@@ -16593,7 +16841,7 @@
1659316841 //gl.glColorMask(false, false, false, false);
1659416842
1659516843 //render_scene_from_light_view(gl, drawable, 0, 0);
16596
- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
16844
+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera || !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
1659716845 {
1659816846 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1659916847
....@@ -17009,23 +17257,15 @@
1700917257 int AAbuffersize = 0;
1701017258
1701117259 //double[] selectedpoint = new double[3];
17012
- static Superellipsoid selectedpoint = new Superellipsoid();
17260
+ static Superellipsoid selectedpoint;
1701317261 static Sphere previousselectedpoint = null;
17014
- static Sphere debugpointG = new Sphere();
17015
- static Sphere debugpointP = new Sphere();
17016
- static Sphere debugpointC = new Sphere();
17017
- static Sphere debugpointR = new Sphere();
17262
+ static Sphere debugpointG;
17263
+ static Sphere debugpointP;
17264
+ static Sphere debugpointC;
17265
+ static Sphere debugpointR;
1701817266
1701917267 static Sphere debugpoints[] = new Sphere[8];
1702017268
17021
- static
17022
- {
17023
- for (int i=0; i<8; i++)
17024
- {
17025
- debugpoints[i] = new Sphere();
17026
- }
17027
- }
17028
-
1702917269 static void InitPoints(float radius)
1703017270 {
1703117271 for (int i=0; i<8; i++)