Normand Briere
2019-06-23 8088590686a45e71278f9a52bb9cc37943dc0c37
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
....@@ -56,8 +55,6 @@
5655 static int CURRENTANTIALIAS = 0; // 1;
5756 /*static*/ boolean RENDERSHADOW = true;
5857 /*static*/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59
- static boolean ANIMATION = false;
60
- static String filename;
6158
6259 boolean DISPLAYTEXT = false;
6360 //boolean REDUCETEXTURE = true;
....@@ -86,7 +83,7 @@
8683 static boolean FULLSCREEN = false;
8784 static boolean SUPPORT = true;
8885 static boolean INERTIA = true;
89
-static boolean FAST = true; // false;
86
+static boolean FAST = false;
9087 static boolean SLOWPOSE = false;
9188 static boolean FOOTCONTACT = true;
9289
....@@ -108,7 +105,7 @@
108105 static boolean OEIL = true;
109106 static boolean OEILONCE = false; // do oeilon then oeiloff
110107 static boolean LOOKAT = true;
111
-static boolean RANDOM = true; // false;
108
+static boolean SWITCH = true; // false;
112109 static boolean HANDLES = false; // selection doesn't work!!
113110 static boolean PAINTMODE = false;
114111
....@@ -151,6 +148,8 @@
151148 defaultcaps.setAccumBlueBits(16);
152149 defaultcaps.setAccumAlphaBits(16);
153150 }
151
+
152
+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
154153
155154 void SetAsGLRenderer(boolean b)
156155 {
....@@ -464,10 +463,12 @@
464463 if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465464 {
466465 //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
+ ;
468469 if (!hasnorm)
469470 {
470
- // System.out.println("FUCK!!");
471
+ // System.out.println("Mesh normal");
471472 LA.vecSub(pv/*.pos*/, qv/*.pos*/, obj.v0);
472473 LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
473474 LA.vecCross(obj.v0, obj.v1, obj.v2);
....@@ -1192,10 +1193,12 @@
11921193 gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
11931194 }
11941195 }
1196
+
11951197 if (flipV)
11961198 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
11971199 else
11981200 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1201
+
11991202 //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
12001203 gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
12011204
....@@ -1215,10 +1218,12 @@
12151218 gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
12161219 }
12171220 }
1221
+
12181222 if (flipV)
12191223 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12201224 else
12211225 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1226
+
12221227 //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
12231228 gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
12241229
....@@ -1246,8 +1251,10 @@
12461251 gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
12471252 else
12481253 gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
1254
+
12491255 //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
12501256 gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1257
+
12511258 count2 += 2;
12521259 count3 += 3;
12531260 }
....@@ -1630,7 +1637,7 @@
16301637
16311638 cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
16321639
1633
- float[] colorV = GrafreeD.colorV;
1640
+ float[] colorV = Grafreed.colorV;
16341641
16351642 /**/
16361643 if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
....@@ -1890,7 +1897,7 @@
18901897 void PushMatrix(double[][] matrix)
18911898 {
18921899 // GrafreeD.tracein(matrix);
1893
- PushMatrix(matrix,1);
1900
+ PushMatrix(matrix, 1);
18941901 }
18951902
18961903 void PushMatrix()
....@@ -2142,7 +2149,7 @@
21422149 System.err.println("LIVE = " + Globals.isLIVE());
21432150
21442151 if (!Globals.isLIVE()) // save sound
2145
- GrafreeD.savesound = true; // wav.save();
2152
+ Grafreed.savesound = true; // wav.save();
21462153 // else
21472154 repaint(); // start loop // may 2013
21482155 }
....@@ -2259,7 +2266,7 @@
22592266
22602267 void ToggleDebug()
22612268 {
2262
- DEBUG ^= true;
2269
+ Globals.DEBUG ^= true;
22632270 }
22642271
22652272 void ToggleLookAt()
....@@ -2267,9 +2274,9 @@
22672274 LOOKAT ^= true;
22682275 }
22692276
2270
- void ToggleRandom()
2277
+ void ToggleSwitch()
22712278 {
2272
- RANDOM ^= true;
2279
+ SWITCH ^= true;
22732280 }
22742281
22752282 void ToggleHandles()
....@@ -2376,7 +2383,7 @@
23762383 {
23772384 return currentGL;
23782385 }
2379
-
2386
+
23802387 /**/
23812388 class CacheTexture
23822389 {
....@@ -4208,6 +4215,7 @@
42084215
42094216 com.sun.opengl.util.texture.Texture CompressTexture2(String name)
42104217 {
4218
+ new Exception().printStackTrace();
42114219 System.exit(0);
42124220 com.sun.opengl.util.texture.Texture texture = null;
42134221
....@@ -7920,6 +7928,64 @@
79207928 ReleaseTexture(pigment, false);
79217929 }
79227930
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
+
79237989 void ReleaseTexture(String tex, boolean bump)
79247990 {
79257991 if (// DrawMode() != 0 || /*tex == null ||*/
....@@ -8023,7 +8089,7 @@
80238089 }
80248090 }
80258091
8026
- /*boolean*/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
8092
+ /*boolean*/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
80278093 {
80288094 if (// DrawMode() != 0 || /*tex == null ||*/
80298095 ambientOcclusion ) // || !textureon)
....@@ -8068,7 +8134,94 @@
80688134 return; // true;
80698135 }
80708136
8071
- 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
80728225 {
80738226 CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
80748227
....@@ -8076,12 +8229,18 @@
80768229 {
80778230 String texname = tex;
80788231
8079
- String[] split = tex.split("Textures");
8080
- if (split.length > 1)
8081
- texname = "/Users/nbriere/Textures" + split[split.length-1];
8082
- else
8083
- if (!texname.startsWith("/"))
8084
- 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
+ }
80858244
80868245 if (CACHETEXTURE)
80878246 texture = textures.get(texname); // TEXTURE CACHE
....@@ -8150,7 +8309,7 @@
81508309 }
81518310
81528311 cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8153
- if (!new File(cachename).exists())
8312
+ if (!FileExists(cachename))
81548313 cachename = texname;
81558314 else
81568315 processbump = false; // don't process bump map again
....@@ -8172,7 +8331,7 @@
81728331 }
81738332
81748333 cachename = texname.substring(0, texname.length()-4)+ext+".png";
8175
- if (!new File(cachename).exists())
8334
+ if (!FileExists(cachename))
81768335 cachename = texname;
81778336 else
81788337 processbump = false; // don't process bump map again
....@@ -8181,7 +8340,9 @@
81818340 texturedata = GetFileTexture(cachename, processbump, resolution);
81828341
81838342
8184
- if (texturedata != null)
8343
+ if (texturedata == null)
8344
+ throw new Exception();
8345
+
81858346 texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
81868347 //texture = GetTexture(tex, bump);
81878348 }
....@@ -8303,7 +8464,7 @@
83038464 return texture;
83048465 }
83058466
8306
- 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
83078468 {
83088469 CacheTexture texture = GetCacheTexture(tex, bump, resolution);
83098470
....@@ -8321,14 +8482,14 @@
83218482 return texture!=null?texture.texture:null;
83228483 }
83238484
8324
- 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
83258486 {
83268487 CacheTexture texture = GetCacheTexture(tex, bump, resolution);
83278488
83288489 return texture!=null?texture.texturedata:null;
83298490 }
83308491
8331
- boolean BindTexture(String tex, boolean bump, int resolution)
8492
+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
83328493 {
83338494 if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
83348495 {
....@@ -9305,8 +9466,8 @@
93059466 assert (parentcam != renderCamera);
93069467
93079468 if (renderCamera != lightCamera)
9308
- for (int count = parentcam.GetTransformCount(); --count>=0;)
9309
- LA.matConcat(matrix, parentcam.toParent, matrix);
9469
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
9470
+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
93109471
93119472 // LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
93129473
....@@ -9321,8 +9482,8 @@
93219482 LA.matCopy(renderCamera.fromScreen, matrix);
93229483
93239484 if (renderCamera != lightCamera)
9324
- for (int count = parentcam.GetTransformCount(); --count>=0;)
9325
- LA.matConcat(parentcam.fromParent, matrix, matrix);
9485
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
9486
+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
93269487
93279488 // LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
93289489
....@@ -9394,7 +9555,7 @@
93949555 //gl.glFlush();
93959556 gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
93969557
9397
- if (ANIMATION && ABORTED)
9558
+ if (Globals.ANIMATION && ABORTED)
93989559 {
93999560 System.err.println(" ABORTED FRAME");
94009561 break;
....@@ -9424,7 +9585,7 @@
94249585 setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
94259586
94269587 // save image
9427
- if (ANIMATION && !ABORTED)
9588
+ if (Globals.ANIMATION && !ABORTED)
94289589 {
94299590 VPwidth = viewport[2];
94309591 VPheight = viewport[3];
....@@ -9535,11 +9696,11 @@
95359696
95369697 // imagecount++;
95379698
9538
- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9699
+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
95399700
95409701 if (!BOXMODE)
95419702 {
9542
- 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) + ")");
95439704 }
95449705
95459706 if (!BOXMODE)
....@@ -9577,7 +9738,7 @@
95779738 ABORTED = false;
95789739 }
95799740 else
9580
- GrafreeD.wav.cursor += 735 * ACSIZE;
9741
+ Grafreed.wav.cursor += 735 * ACSIZE;
95819742
95829743 if (false)
95839744 {
....@@ -10240,11 +10401,11 @@
1024010401
1024110402 public void display(GLAutoDrawable drawable)
1024210403 {
10243
- if (GrafreeD.savesound && GrafreeD.hassound)
10404
+ if (Grafreed.savesound && Grafreed.hassound)
1024410405 {
10245
- GrafreeD.wav.save();
10246
- GrafreeD.savesound = false;
10247
- GrafreeD.hassound = false;
10406
+ Grafreed.wav.save();
10407
+ Grafreed.savesound = false;
10408
+ Grafreed.hassound = false;
1024810409 }
1024910410 // if (DEBUG_SELECTION)
1025010411 // {
....@@ -10374,7 +10535,7 @@
1037410535 Object3D theobject = object;
1037510536 Object3D theparent = object.parent;
1037610537 object.parent = null;
10377
- object = (Object3D)GrafreeD.clone(object);
10538
+ object = (Object3D)Grafreed.clone(object);
1037810539 object.Stripify();
1037910540 if (theobject.selection == null || theobject.selection.Size() == 0)
1038010541 theobject.PreprocessOcclusion(this);
....@@ -10387,13 +10548,13 @@
1038710548 ambientOcclusion = false;
1038810549 }
1038910550
10390
- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
10551
+ if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
1039110552 {
1039210553 //if (RENDERSHADOW) // ?
1039310554 if (!IsFrozen())
1039410555 {
1039510556 // dec 2012
10396
- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
10557
+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
1039710558 {
1039810559 Globals.framecount++;
1039910560 shadowbuffer.display();
....@@ -10520,8 +10681,8 @@
1052010681
1052110682 // if (parentcam != renderCamera) // not a light
1052210683 if (cam != lightCamera)
10523
- for (int count = parentcam.GetTransformCount(); --count>=0;)
10524
- LA.matConcat(matrix, parentcam.toParent, matrix);
10684
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
10685
+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
1052510686
1052610687 for (int j = 0; j < 4; j++)
1052710688 {
....@@ -10535,8 +10696,8 @@
1053510696
1053610697 // if (parentcam != renderCamera) // not a light
1053710698 if (cam != lightCamera)
10538
- for (int count = parentcam.GetTransformCount(); --count>=0;)
10539
- LA.matConcat(parentcam.fromParent, matrix, matrix);
10699
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
10700
+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
1054010701
1054110702 //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1054210703
....@@ -10795,7 +10956,16 @@
1079510956 // Bump noise
1079610957 gl.glActiveTexture(GL.GL_TEXTURE6);
1079710958 //gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10798
- 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
+
1079910969
1080010970 gl.glActiveTexture(GL.GL_TEXTURE0);
1080110971 gl.glEnable(GL.GL_TEXTURE_2D);
....@@ -10920,8 +11090,8 @@
1092011090 System.err.println("parentcam != renderCamera");
1092111091
1092211092 // if (cam != lightCamera)
10923
- for (int count = parentcam.GetTransformCount(); --count>=0;)
10924
- 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
1092511095 }
1092611096
1092711097 LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -10942,8 +11112,8 @@
1094211112 if (true) // TODO
1094311113 {
1094411114 if (cam != lightCamera)
10945
- for (int count = parentcam.GetTransformCount(); --count>=0;)
10946
- 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
1094711117 }
1094811118
1094911119 LA.xformPos(light0, cam.toScreen, light0);
....@@ -11259,8 +11429,14 @@
1125911429 {
1126011430 renderpass++;
1126111431 // System.out.println("Draw object... ");
11432
+ STEP = 1;
1126211433 if (FAST) // in case there is no script
11263
- STEP = 16;
11434
+ STEP = 8;
11435
+
11436
+ if (CURRENTANTIALIAS == 0 || ACSIZE == 1)
11437
+ {
11438
+ STEP *= 4;
11439
+ }
1126411440
1126511441 //object.FullInvariants();
1126611442
....@@ -11274,13 +11450,31 @@
1127411450 e.printStackTrace();
1127511451 }
1127611452
11277
- if (GrafreeD.RENDERME > 0)
11278
- GrafreeD.RENDERME--; // mechante magouille
11453
+ if (Grafreed.RENDERME > 0)
11454
+ Grafreed.RENDERME--; // mechante magouille
1127911455
1128011456 Globals.ONESTEP = false;
1128111457 }
1128211458
1128311459 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
+ }
1128411478
1128511479 void DrawObject(GL gl, boolean draw)
1128611480 {
....@@ -11345,7 +11539,14 @@
1134511539
1134611540 usedtextures.clear();
1134711541
11348
- 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
+ }
1134911550 }
1135011551 //System.out.println("--> " + stackdepth);
1135111552 // GrafreeD.traceon();
....@@ -11355,8 +11556,9 @@
1135511556
1135611557 if (DrawMode() == DEFAULT)
1135711558 {
11358
- if (DEBUG)
11559
+ if (Globals.DEBUG)
1135911560 {
11561
+ CreateSelectedPoint();
1136011562 float radius = 0.05f;
1136111563 if (selectedpoint.radius != radius)
1136211564 {
....@@ -11436,7 +11638,14 @@
1143611638 if (checker != null && DrawMode() == DEFAULT)
1143711639 {
1143811640 //BindTexture(IMMORTAL_TEXTURE);
11439
- 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
+ }
1144011649 // NEAREST
1144111650 GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
1144211651 DrawChecker(gl);
....@@ -11518,7 +11727,7 @@
1151811727 return;
1151911728 }
1152011729
11521
- String string = obj.GetToolTip();
11730
+ String string = obj.toString(); //.GetToolTip();
1152211731
1152311732 GL gl = GetGL();
1152411733
....@@ -11835,8 +12044,8 @@
1183512044 //obj.TransformToWorld(light, light);
1183612045 for (int i = tp.size(); --i >= 0;)
1183712046 {
11838
- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11839
- 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);
1184012049 }
1184112050
1184212051
....@@ -11853,8 +12062,8 @@
1185312062 parentcam = cameras[0];
1185412063 }
1185512064
11856
- for (int count = parentcam.GetTransformCount(); --count>=0;)
11857
- 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
1185812067
1185912068 LA.xformPos(light, renderCamera.toScreen, light);
1186012069
....@@ -12468,8 +12677,8 @@
1246812677
1246912678 // display shadow only (bump == 0)
1247012679 "SUB temp.x, half.x, shadow.x;" +
12471
- "MOV temp.y, -params6.x;" +
12472
- "SLT temp.z, temp.y, zero.x;" +
12680
+ "MOV temp.y, -params5.z;" + // params6.x;" +
12681
+ "SLT temp.z, temp.y, -one2048th.x;" +
1247312682 "SUB temp.y, one.x, temp.z;" +
1247412683 "MUL temp.x, temp.x, temp.y;" +
1247512684 "KIL temp.x;" +
....@@ -12598,8 +12807,10 @@
1259812807 "MAX ndotl.x, ndotl.x, -ndotl.x;" +
1259912808
1260012809 "SUB temp.x, one.x, ndotl.x;" +
12601
- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12602
- "ADD temp.y, one.y, options2.y;" + // sursurface
12810
+ // Tuning for default skin
12811
+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
12812
+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
12813
+ "ADD temp.y, one.y, options2.y;" + // subsurface
1260312814 "MUL temp.x, temp.x, temp.y;" +
1260412815
1260512816 "MUL saturation, saturation, temp.xxxx;" +
....@@ -12747,7 +12958,7 @@
1274712958 "MUL final.y, fragment.texcoord[0].x, c256;" +
1274812959 "FLR final.x, final.y;" +
1274912960 "SUB final.y, final.y, final.x;" +
12750
- //"MUL final.x, final.x, c256i;" +
12961
+ "MUL final.x, final.x, c256i;" +
1275112962 "MOV final.z, zero.x;" +
1275212963 "MOV final.a, one.w;":""
1275312964 ) +
....@@ -12755,7 +12966,7 @@
1275512966 "MUL final.y, fragment.texcoord[0].y, c256;" +
1275612967 "FLR final.x, final.y;" +
1275712968 "SUB final.y, final.y, final.x;" +
12758
- //"MUL final.x, final.x, c256i;" +
12969
+ "MUL final.x, final.x, c256i;" +
1275912970 "MOV final.z, zero.x;" +
1276012971 "MOV final.a, one.w;":""
1276112972 ) +
....@@ -12798,7 +13009,7 @@
1279813009 //once = true;
1279913010 }
1280013011
12801
- System.out.print("Program #" + mode + "; length = " + program.length());
13012
+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
1280213013 System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
1280313014 loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1280413015
....@@ -12931,12 +13142,16 @@
1293113142
1293213143 "ADD " + depth + ".z, " + depth + ".z, temp.x;" +
1293313144 //"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
13145
+
13146
+ // Compare fragment depth in light space with shadowmap.
1293413147 "SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
1293513148 "SGE temp.y, temp.x, zero.x;" +
12936
- "SUB " + shadow + ".y, one.x, temp.y;" +
13149
+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
13150
+
13151
+ // Reverse comparison
1293713152 "SUB temp.x, one.x, temp.x;" +
1293813153 "MUL " + shadow + ".x, temp.x, temp.y;" +
12939
- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
13154
+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
1294013155 "POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
1294113156
1294213157 "SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
....@@ -12950,6 +13165,10 @@
1295013165 // No shadow for backface
1295113166 "DP3 temp.x, normal, lightd;" +
1295213167 "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;" +
1295313172 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1295413173 "";
1295513174 }
....@@ -13508,7 +13727,7 @@
1350813727 public void mousePressed(MouseEvent e)
1350913728 {
1351013729 //System.out.println("mousePressed: " + e);
13511
- clickStart(e.getX(), e.getY(), e.getModifiersEx());
13730
+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1351213731 }
1351313732
1351413733 static long prevtime = 0;
....@@ -13584,8 +13803,8 @@
1358413803 // mode |= META;
1358513804 //}
1358613805
13587
- SetMouseMode(WHEEL | e.getModifiersEx());
13588
- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
13806
+ SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
13807
+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
1358913808 anchorX = ax;
1359013809 anchorY = ay;
1359113810 prevX = px;
....@@ -13645,6 +13864,10 @@
1364513864 // wasliveok = true;
1364613865 // waslive = false;
1364713866
13867
+ // May 2019 Forget it:
13868
+ if (true)
13869
+ return;
13870
+
1364813871 // source == timer
1364913872 if (mouseDown)
1365013873 {
....@@ -13683,7 +13906,7 @@
1368313906
1368413907 javax.swing.Timer timer = new javax.swing.Timer(350, this);
1368513908
13686
- void clickStart(int x, int y, int modifiers)
13909
+ void clickStart(int x, int y, int modifiers, int modifiersex)
1368713910 {
1368813911 if (!wasliveok)
1368913912 return;
....@@ -13700,7 +13923,7 @@
1370013923 // touched = true; // main DL
1370113924 if (isRenderer)
1370213925 {
13703
- SetMouseMode(modifiers);
13926
+ SetMouseMode(modifiers, modifiersex);
1370413927 }
1370513928
1370613929 selectX = anchorX = x;
....@@ -13713,7 +13936,7 @@
1371313936 clicked = true;
1371413937 hold = false;
1371513938
13716
- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
13939
+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
1371713940 // june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
1371813941 {
1371913942 // System.out.println("RESTART II " + modifiers);
....@@ -13744,7 +13967,7 @@
1374413967 info.camera = renderCamera;
1374513968 info.x = x;
1374613969 info.y = y;
13747
- info.modifiers = modifiers;
13970
+ info.modifiers = modifiersex;
1374813971 editObj = object.doEditClick(info, 0);
1374913972 if (!editObj)
1375013973 {
....@@ -13761,9 +13984,12 @@
1376113984
1376213985 public void mouseDragged(MouseEvent e)
1376313986 {
13987
+ Globals.MOUSEDRAGGED = true;
13988
+
1376413989 //System.out.println("mouseDragged: " + e);
1376513990 if (isRenderer)
1376613991 movingcamera = true;
13992
+
1376713993 //if (drawing)
1376813994 //return;
1376913995 if ((e.getModifiersEx() & CTRL) != 0
....@@ -13773,7 +13999,7 @@
1377313999 clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1377414000 }
1377514001 else
13776
- drag(e.getX(), e.getY(), e.getModifiersEx());
14002
+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1377714003
1377814004 //try { Thread.sleep(1); } catch (Exception ex) {}
1377914005 }
....@@ -13946,6 +14172,7 @@
1394614172
1394714173 public void run()
1394814174 {
14175
+ new Exception().printStackTrace();
1394914176 System.exit(0);
1395014177 for (;;)
1395114178 {
....@@ -14009,7 +14236,7 @@
1400914236 {
1401014237 Globals.lighttouched = true;
1401114238 }
14012
- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
14239
+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
1401314240 }
1401414241 //else
1401514242 }
....@@ -14109,7 +14336,7 @@
1410914336 int X, Y;
1411014337 boolean SX, SY;
1411114338
14112
- void drag(int x, int y, int modifiers)
14339
+ void drag(int x, int y, int modifiers, int modifiersex)
1411314340 {
1411414341 if (IsFrozen())
1411514342 {
....@@ -14118,17 +14345,17 @@
1411814345
1411914346 drag = true; // NEW
1412014347
14121
- boolean continuous = (modifiers & COMMAND) == COMMAND;
14348
+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
1412214349
1412314350 X = x;
1412414351 Y = y;
1412514352 // floating state for animation
14126
- MODIFIERS = modifiers;
14127
- modifiers &= ~1024;
14353
+ MODIFIERS = modifiersex;
14354
+ modifiersex &= ~1024;
1412814355 if (false) // modifiers != 0)
1412914356 {
1413014357 //new Exception().printStackTrace();
14131
- System.out.println("mouseDragged: " + modifiers);
14358
+ System.out.println("mouseDragged: " + modifiersex);
1413214359 System.out.println("SHIFT = " + SHIFT);
1413314360 System.out.println("CONTROL = " + COMMAND);
1413414361 System.out.println("META = " + META);
....@@ -14148,7 +14375,7 @@
1414814375 info.camera = renderCamera;
1414914376 info.x = x;
1415014377 info.y = y;
14151
- object.editWindow.copy.doEditDrag(info);
14378
+ object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1415214379 } else
1415314380 {
1415414381 if (x < startX)
....@@ -14324,7 +14551,10 @@
1432414551
1432514552 public void mouseReleased(MouseEvent e)
1432614553 {
14554
+ Globals.MOUSEDRAGGED = false;
14555
+
1432714556 movingcamera = false;
14557
+ X = Y = 0;
1432814558 //System.out.println("mouseReleased: " + e);
1432914559 clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1433014560 }
....@@ -14347,9 +14577,9 @@
1434714577 boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
1434814578 boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
1434914579
14350
- if (control || command || IsFrozen())
14580
+// No delay if (control || command || IsFrozen())
1435114581 timeout = true;
14352
- else
14582
+// ?? May 2019 else
1435314583 // timer.setDelay((modifiers & 128) != 0?0:350);
1435414584 mouseDown = false;
1435514585 if (!control && !command) // june 2013
....@@ -14459,7 +14689,7 @@
1445914689 System.out.println("keyReleased: " + e);
1446014690 }
1446114691
14462
- void SetMouseMode(int modifiers)
14692
+ void SetMouseMode(int modifiers, int modifiersex)
1446314693 {
1446414694 //System.out.println("SetMouseMode = " + modifiers);
1446514695 //modifiers &= ~1024;
....@@ -14471,25 +14701,25 @@
1447114701 //if (modifiers == 0) // || (modifiers == (1024 | CONTROL)))
1447214702 // return;
1447314703 //System.out.println("SetMode = " + modifiers);
14474
- if ((modifiers & WHEEL) == WHEEL)
14704
+ if ((modifiersex & WHEEL) == WHEEL)
1447514705 {
1447614706 mouseMode |= ZOOM;
1447714707 }
1447814708
1447914709 boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14480
- if (capsLocked || (modifiers & META) == META)
14710
+ if (capsLocked) // || (modifiers & META) == META)
1448114711 {
1448214712 mouseMode |= VR; // BACKFORTH;
1448314713 }
14484
- if ((modifiers & CTRLCLICK) == CTRLCLICK)
14714
+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
1448514715 {
1448614716 mouseMode |= SELECT;
1448714717 }
14488
- if ((modifiers & COMMAND) == COMMAND)
14718
+ if ((modifiersex & COMMAND) == COMMAND)
1448914719 {
1449014720 mouseMode |= SELECT;
1449114721 }
14492
- if ((modifiers & SHIFT) == SHIFT || forcetranslate)
14722
+ if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1449314723 {
1449414724 mouseMode &= ~VR;
1449514725 mouseMode |= TRANSLATE;
....@@ -14518,7 +14748,7 @@
1451814748
1451914749 if (isRenderer) //
1452014750 {
14521
- SetMouseMode(modifiers);
14751
+ SetMouseMode(0, modifiers);
1452214752 }
1452314753
1452414754 Globals.theRenderer.keyPressed(key);
....@@ -14690,8 +14920,14 @@
1469014920 RevertCamera();
1469114921 repaint();
1469214922 break;
14693
- case 'L':
1469414923 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':
1469514931 if (lightMode)
1469614932 {
1469714933 lightMode = false;
....@@ -14838,23 +15074,21 @@
1483815074 kompactbit = 6;
1483915075 break;
1484015076 case ' ':
14841
- lightMode ^= true;
14842
- Globals.lighttouched = true;
14843
- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14844
- targetLookAt.set(manipCamera.lookAt);
15077
+ ObjEditor.theFrame.ToggleFullScreen();
1484515078 repaint();
1484615079 break;
1484715080 //case '`' :
1484815081 case ESC:
1484915082 RENDERPROGRAM += 1;
1485015083 RENDERPROGRAM %= 3;
15084
+
1485115085 repaint();
1485215086 break;
1485315087 case 'Z':
1485415088 //RESIZETEXTURE ^= true;
1485515089 //break;
1485615090 case 'z':
14857
- RENDERSHADOW ^= true;
15091
+ Globals.RENDERSHADOW ^= true;
1485815092 Globals.lighttouched = true;
1485915093 repaint();
1486015094 break;
....@@ -14978,7 +15212,7 @@
1497815212 //mode = ROTATE;
1497915213 if ((MODIFIERS & COMMAND) == 0) // VR??
1498015214 {
14981
- SetMouseMode(modifiers);
15215
+ SetMouseMode(0, modifiers);
1498215216 }
1498315217 }
1498415218
....@@ -15114,7 +15348,7 @@
1511415348 {
1511515349 //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
1511615350 //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15117
- 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)
1511815352 {
1511915353 mouseMoved(e);
1512015354 } else
....@@ -15144,6 +15378,7 @@
1514415378
1514515379 void SelectParent()
1514615380 {
15381
+ new Exception().printStackTrace();
1514715382 System.exit(0);
1514815383 Composite group = (Composite) object;
1514915384 java.util.Vector selectees = new java.util.Vector(group.selection);
....@@ -15167,6 +15402,7 @@
1516715402
1516815403 void SelectChildren()
1516915404 {
15405
+ new Exception().printStackTrace();
1517015406 System.exit(0);
1517115407 /*
1517215408 Composite group = (Composite) object;
....@@ -15331,7 +15567,9 @@
1533115567 info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1533215568 //Image img = CreateImage(width, height);
1533315569 //System.out.println("width = " + width + "; height = " + height + "\n");
15570
+
1533415571 Graphics gr = g; // img.getGraphics();
15572
+
1533515573 if (!hasMarquee)
1533615574 {
1533715575 if (Xmin < Xmax) // !locked)
....@@ -15429,14 +15667,33 @@
1542915667 if (!isRenderer)
1543015668 {
1543115669 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
+ }
1543215687 }
1543315688 }
15689
+
1543415690 if (isRenderer)
1543515691 {
1543615692 //gr.setColor(Color.black);
1543715693 //gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
1543815694 //gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
1543915695 }
15696
+
1544015697 if (hasMarquee)
1544115698 {
1544215699 gr.setXORMode(Color.white);
....@@ -15549,6 +15806,7 @@
1554915806 public boolean mouseDown(Event evt, int x, int y)
1555015807 {
1555115808 System.out.println("mouseDown: " + evt);
15809
+ System.exit(0);
1555215810 /*
1555315811 locked = true;
1555415812 drag = false;
....@@ -15592,7 +15850,7 @@
1559215850 {
1559315851 keyPressed(0, modifiers);
1559415852 }
15595
- clickStart(x, y, modifiers);
15853
+ // clickStart(x, y, modifiers);
1559615854 return true;
1559715855 }
1559815856
....@@ -15710,7 +15968,7 @@
1571015968 {
1571115969 keyReleased(0, 0);
1571215970 }
15713
- drag(x, y, modifiers);
15971
+ drag(x, y, 0, modifiers);
1571415972 return true;
1571515973 }
1571615974
....@@ -15842,7 +16100,7 @@
1584216100 Object3D object;
1584316101 static Object3D trackedobject;
1584416102 Camera renderCamera; // Light or Eye (or Occlusion)
15845
- /*static*/ Camera manipCamera; // Light or Eye
16103
+ /*static*/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
1584616104 /*static*/ Camera eyeCamera;
1584716105 /*static*/ Camera lightCamera;
1584816106 int cameracount;
....@@ -16280,6 +16538,7 @@
1628016538 {
1628116539 if (!selection)
1628216540 {
16541
+ new Exception().printStackTrace();
1628316542 System.exit(0);
1628416543 return;
1628516544 }
....@@ -16407,16 +16666,16 @@
1640716666 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]));
1640816667 }
1640916668
16410
- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
16669
+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
1641116670 }
1641216671 }
1641316672
1641416673 if (!movingcamera && !PAINTMODE)
1641516674 object.editWindow.ScreenFitPoint(); // fev 2014
1641616675
16417
- 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)
1641816677 {
16419
- 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);
1642016679
1642116680 Object3D group = new Object3D("inst" + paintcount++);
1642216681
....@@ -16572,7 +16831,7 @@
1657216831 gl.glDisable(gl.GL_CULL_FACE);
1657316832 }
1657416833
16575
- if (!RENDERSHADOW)
16834
+ if (!Globals.RENDERSHADOW)
1657616835 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1657716836
1657816837 // SB gl.glPolygonOffset(2.5f, 10);
....@@ -16582,7 +16841,7 @@
1658216841 //gl.glColorMask(false, false, false, false);
1658316842
1658416843 //render_scene_from_light_view(gl, drawable, 0, 0);
16585
- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
16844
+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera || !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
1658616845 {
1658716846 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1658816847
....@@ -16998,23 +17257,15 @@
1699817257 int AAbuffersize = 0;
1699917258
1700017259 //double[] selectedpoint = new double[3];
17001
- static Superellipsoid selectedpoint = new Superellipsoid();
17260
+ static Superellipsoid selectedpoint;
1700217261 static Sphere previousselectedpoint = null;
17003
- static Sphere debugpointG = new Sphere();
17004
- static Sphere debugpointP = new Sphere();
17005
- static Sphere debugpointC = new Sphere();
17006
- static Sphere debugpointR = new Sphere();
17262
+ static Sphere debugpointG;
17263
+ static Sphere debugpointP;
17264
+ static Sphere debugpointC;
17265
+ static Sphere debugpointR;
1700717266
1700817267 static Sphere debugpoints[] = new Sphere[8];
1700917268
17010
- static
17011
- {
17012
- for (int i=0; i<8; i++)
17013
- {
17014
- debugpoints[i] = new Sphere();
17015
- }
17016
- }
17017
-
1701817269 static void InitPoints(float radius)
1701917270 {
1702017271 for (int i=0; i<8; i++)