Normand Briere
2019-05-13 f924d3e00db476c06f55f3d5aaef307e17575340
CameraPane.java
....@@ -1628,7 +1628,7 @@
16281628
16291629 cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
16301630
1631
- float[] colorV = GrafreeD.colorV;
1631
+ float[] colorV = Grafreed.colorV;
16321632
16331633 /**/
16341634 if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
....@@ -2140,7 +2140,7 @@
21402140 System.err.println("LIVE = " + Globals.isLIVE());
21412141
21422142 if (!Globals.isLIVE()) // save sound
2143
- GrafreeD.savesound = true; // wav.save();
2143
+ Grafreed.savesound = true; // wav.save();
21442144 // else
21452145 repaint(); // start loop // may 2013
21462146 }
....@@ -9542,7 +9542,7 @@
95429542
95439543 if (!BOXMODE)
95449544 {
9545
- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
9545
+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
95469546 }
95479547
95489548 if (!BOXMODE)
....@@ -9580,7 +9580,7 @@
95809580 ABORTED = false;
95819581 }
95829582 else
9583
- GrafreeD.wav.cursor += 735 * ACSIZE;
9583
+ Grafreed.wav.cursor += 735 * ACSIZE;
95849584
95859585 if (false)
95869586 {
....@@ -10243,11 +10243,11 @@
1024310243
1024410244 public void display(GLAutoDrawable drawable)
1024510245 {
10246
- if (GrafreeD.savesound && GrafreeD.hassound)
10246
+ if (Grafreed.savesound && Grafreed.hassound)
1024710247 {
10248
- GrafreeD.wav.save();
10249
- GrafreeD.savesound = false;
10250
- GrafreeD.hassound = false;
10248
+ Grafreed.wav.save();
10249
+ Grafreed.savesound = false;
10250
+ Grafreed.hassound = false;
1025110251 }
1025210252 // if (DEBUG_SELECTION)
1025310253 // {
....@@ -10377,7 +10377,7 @@
1037710377 Object3D theobject = object;
1037810378 Object3D theparent = object.parent;
1037910379 object.parent = null;
10380
- object = (Object3D)GrafreeD.clone(object);
10380
+ object = (Object3D)Grafreed.clone(object);
1038110381 object.Stripify();
1038210382 if (theobject.selection == null || theobject.selection.Size() == 0)
1038310383 theobject.PreprocessOcclusion(this);
....@@ -11283,8 +11283,8 @@
1128311283 e.printStackTrace();
1128411284 }
1128511285
11286
- if (GrafreeD.RENDERME > 0)
11287
- GrafreeD.RENDERME--; // mechante magouille
11286
+ if (Grafreed.RENDERME > 0)
11287
+ Grafreed.RENDERME--; // mechante magouille
1128811288
1128911289 Globals.ONESTEP = false;
1129011290 }
....@@ -14870,7 +14870,7 @@
1487014870 //RESIZETEXTURE ^= true;
1487114871 //break;
1487214872 case 'z':
14873
- RENDERSHADOW ^= true;
14873
+ Globals.RENDERSHADOW ^= true;
1487414874 Globals.lighttouched = true;
1487514875 repaint();
1487614876 break;
....@@ -16427,16 +16427,16 @@
1642716427 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]));
1642816428 }
1642916429
16430
- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
16430
+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
1643116431 }
1643216432 }
1643316433
1643416434 if (!movingcamera && !PAINTMODE)
1643516435 object.editWindow.ScreenFitPoint(); // fev 2014
1643616436
16437
- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16437
+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1643816438 {
16439
- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16439
+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
1644016440
1644116441 Object3D group = new Object3D("inst" + paintcount++);
1644216442
....@@ -16592,7 +16592,7 @@
1659216592 gl.glDisable(gl.GL_CULL_FACE);
1659316593 }
1659416594
16595
- if (!RENDERSHADOW)
16595
+ if (!Globals.RENDERSHADOW)
1659616596 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1659716597
1659816598 // SB gl.glPolygonOffset(2.5f, 10);
....@@ -16602,7 +16602,7 @@
1660216602 //gl.glColorMask(false, false, false, false);
1660316603
1660416604 //render_scene_from_light_view(gl, drawable, 0, 0);
16605
- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
16605
+ if (Globals.RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
1660616606 {
1660716607 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1660816608