Normand Briere
2019-04-22 3c4c16e0a4ca3949a7a37a24607df7f89abfe7ea
Object3D.java
....@@ -21,6 +21,19 @@
2121
2222 ScriptNode scriptnode;
2323
24
+ void InitOthers()
25
+ {
26
+ if (projectedVertices == null || projectedVertices.length <= 2)
27
+ {
28
+ projectedVertices = new Object3D.cVector2[3];
29
+ }
30
+ for (int i = 0; i < 3; i++)
31
+ {
32
+ projectedVertices[i] = new cVector2(); // Others
33
+ }
34
+ projectedVertices[0].x = 100; // bump
35
+ }
36
+
2437 void MinMax(cVector minima, cVector maxima)
2538 {
2639 for (int xyz = 0; xyz < 3; xyz++)
....@@ -296,6 +309,8 @@
296309 boolean speedup = false;
297310 boolean rewind = false;
298311
312
+ float NORMALPUSH = 0;
313
+
299314 Object3D support;
300315
301316 Object3D GetObject()
....@@ -355,7 +370,7 @@
355370
356371 int MemorySize()
357372 {
358
- if (memorysize == 0)
373
+ if (true) // memorysize == 0)
359374 {
360375 try
361376 {
....@@ -415,16 +430,16 @@
415430 {
416431 Object3D copy = this;
417432
418
- Camera parentcam = CameraPane.theRenderer.manipCamera;
433
+ Camera parentcam = CameraPane.theRenderer.ManipCamera();
419434
420
- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
435
+ if (CameraPane.theRenderer.ManipCamera() == CameraPane.theRenderer.Cameras()[0])
421436 {
422
- parentcam = CameraPane.theRenderer.cameras[1];
437
+ parentcam = CameraPane.theRenderer.Cameras()[1];
423438 }
424439
425
- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
440
+ if (CameraPane.theRenderer.ManipCamera() == CameraPane.theRenderer.Cameras()[1])
426441 {
427
- parentcam = CameraPane.theRenderer.cameras[0];
442
+ parentcam = CameraPane.theRenderer.Cameras()[0];
428443 }
429444
430445 if (this == parentcam)
....@@ -432,7 +447,7 @@
432447 //assert(this instanceof Camera);
433448
434449 for (int count = parentcam.GetTransformCount(); --count>=0;)
435
- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
450
+ LA.xformPos(CameraPane.theRenderer.TargetLookAt(), parentcam.toParent, CameraPane.theRenderer.TargetLookAt());
436451 }
437452
438453 copy.marked ^= true;
....@@ -452,7 +467,7 @@
452467 //assert(this instanceof Camera);
453468
454469 for (int count = parentcam.GetTransformCount(); --count>=0;)
455
- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
470
+ LA.xformPos(CameraPane.theRenderer.TargetLookAt(), parentcam.fromParent, CameraPane.theRenderer.TargetLookAt());
456471 }
457472
458473 copy.Touch(); // display list issue
....@@ -587,7 +602,7 @@
587602 return;
588603 }
589604
590
- if (CameraPane.fromscript)
605
+ if (Globals.fromscript)
591606 {
592607 transformcount = 0;
593608 return;
....@@ -745,7 +760,7 @@
745760
746761 int GetTransformCount()
747762 {
748
- // marde pour serialization de Texture
763
+ // patch pour serialization de Texture
749764 resetmaxcount();
750765 resettransformcount();
751766 resetstep();
....@@ -779,9 +794,12 @@
779794 // factor = CameraPane.STEP;
780795 // }
781796
782
- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
797
+ if (marked && Globals.isLIVE() && live &&
798
+ //TEMP21aug2018
799
+ Globals.DrawMode() == iCameraPane.SHADOW &&
800
+ currentframe != Globals.framecount)
783801 {
784
- currentframe = CameraPane.framecount;
802
+ currentframe = Globals.framecount;
785803
786804 // System.err.println("transformcount = " + transformcount);
787805 // System.err.println("factor = " + factor);
....@@ -935,7 +953,7 @@
935953
936954 public Object clone()
937955 {
938
- return GraphreeD.clone(this);
956
+ return GrafreeD.clone(this);
939957 }
940958
941959 Object3D copyExpand()
....@@ -1446,7 +1464,16 @@
14461464 // if (other == null)
14471465 // return;
14481466
1449
- System.out.println("Link support this = " + this + "; other = " + other);
1467
+ if (other != null)
1468
+ {
1469
+ BoundaryRep.SEUIL = other.material.cameralight;
1470
+
1471
+ // Set default to 0.1
1472
+ BoundaryRep.SEUIL /= 2;
1473
+ System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1474
+ }
1475
+
1476
+ System.out.println("Link this = " + this + "; support = " + other);
14501477
14511478 //if (bRep != null)
14521479 // bRep.linkVerticesThis(other.bRep);
....@@ -1701,7 +1728,7 @@
17011728 Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
17021729 o.bRep = transientrep;
17031730 if (clone)
1704
- o.bRep = (BoundaryRep) GraphreeD.clone(transientrep);
1731
+ o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
17051732 o.CreateMaterial();
17061733 o.SetAttributes(this, -1);
17071734 //parent
....@@ -1714,7 +1741,7 @@
17141741 Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
17151742 o.bRep = bRep;
17161743 if (clone)
1717
- o.bRep = (BoundaryRep) GraphreeD.clone(bRep);
1744
+ o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
17181745 o.CreateMaterial();
17191746 //o.overwriteThis(this, -1);
17201747 o.SetAttributes(this, -1);
....@@ -1756,7 +1783,7 @@
17561783 // {
17571784 // assert(bRep == null);
17581785 // Object3D o = new Object3D("Geometry:" + this.name);
1759
-// o.bRep = (BoundaryRep) GraphreeD.clone(transientrep);
1786
+// o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
17601787 // o.CreateMaterial();
17611788 // parent.addChild(o);
17621789 // }
....@@ -1765,7 +1792,7 @@
17651792 // {
17661793 // assert(transientrep == null);
17671794 // Object3D o = new Object3D("Geometry:" + this.name);
1768
-// o.bRep = (BoundaryRep) GraphreeD.clone(bRep);
1795
+// o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
17691796 // o.CreateMaterial();
17701797 // parent.addChild(o);
17711798 // }
....@@ -1816,8 +1843,9 @@
18161843 if (obj.name == null)
18171844 continue; // can't be a null one
18181845
1819
- //if (n.contains(obj.name)) // dec 2013 name.split(":")[0])) // Poser generates a count
1820
- if (n.startsWith(obj.name))
1846
+ String name = obj.name.split(":")[0]; // Poser generates a count
1847
+ //if (n.startsWith(obj.name))
1848
+ if (n.contains(name))
18211849 {
18221850 theobj = obj;
18231851 count++;
....@@ -2120,15 +2148,8 @@
21202148 if (/*parent != null &&*/ material == null)
21212149 {
21222150 material = new cMaterial(GetMaterial());
2123
- if (projectedVertices == null || projectedVertices.length <= 2)
2124
- {
2125
- projectedVertices = new Object3D.cVector2[3];
2126
- }
2127
- for (int i = 0; i < 3; i++)
2128
- {
2129
- projectedVertices[i] = new cVector2(); // Others
2130
- }
2131
- projectedVertices[0].x = 100; // bump
2151
+
2152
+ InitOthers();
21322153
21332154 if (this instanceof Camera)
21342155 {
....@@ -2732,6 +2753,24 @@
27322753 blockloop = false;
27332754 }
27342755
2756
+ void GenNormalsMINE()
2757
+ {
2758
+ if (blockloop)
2759
+ return;
2760
+
2761
+ blockloop = true;
2762
+ GenNormalsMINE0();
2763
+ for (int i = 0; i < Children().Size(); i++)
2764
+ {
2765
+ Object3D child = (Object3D) Children().get(i); // reserve(i);
2766
+ if (child == null)
2767
+ continue;
2768
+ child.GenNormalsMINE();
2769
+// Children().release(i);
2770
+ }
2771
+ blockloop = false;
2772
+ }
2773
+
27352774 void ClearColors()
27362775 {
27372776 if (blockloop)
....@@ -2876,6 +2915,15 @@
28762915 if (bRep != null)
28772916 {
28782917 bRep.GenerateNormals(crease);
2918
+ Touch();
2919
+ }
2920
+ }
2921
+
2922
+ void GenNormalsMINE0()
2923
+ {
2924
+ if (bRep != null)
2925
+ {
2926
+ bRep.GenerateNormalsMINE();
28792927 Touch();
28802928 }
28812929 }
....@@ -3153,7 +3201,7 @@
31533201
31543202 BoundaryRep sup = bRep.support;
31553203 bRep.support = null;
3156
- BoundaryRep temprep = (BoundaryRep) GraphreeD.clone(bRep);
3204
+ BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
31573205 // bRep.SplitInTwo(onlyone); // thread...
31583206 temprep.SplitInTwo(reduction34, onlyone);
31593207 bRep = temprep;
....@@ -3677,7 +3725,7 @@
36773725 if (child == null)
36783726 continue;
36793727
3680
- if (GraphreeD.RENDERME > 0)
3728
+ if (GrafreeD.RENDERME > 0)
36813729 {
36823730 if (child instanceof Merge)
36833731 ((Merge)child).renderme();
....@@ -3828,7 +3876,7 @@
38283876 if (child == null)
38293877 continue;
38303878
3831
- if (GraphreeD.RENDERME > 0)
3879
+ if (GrafreeD.RENDERME > 0)
38323880 {
38333881 if (child instanceof Merge)
38343882 ((Merge)child).renderme();
....@@ -4023,7 +4071,7 @@
40234071 if (child == null)
40244072 continue;
40254073
4026
- if (GraphreeD.RENDERME > 0)
4074
+ if (GrafreeD.RENDERME > 0)
40274075 {
40284076 if (child instanceof Merge)
40294077 ((Merge)child).renderme();
....@@ -4111,7 +4159,7 @@
41114159 if (blockloop)
41124160 return;
41134161
4114
- for (int i=0; i<size(); i++)
4162
+ for (int i=0; i<Size(); i++)
41154163 {
41164164 if (get(i).parent != this)
41174165 {
....@@ -4120,6 +4168,22 @@
41204168 }
41214169 blockloop = true;
41224170 get(i).RepairParent();
4171
+ blockloop = false;
4172
+ }
4173
+ }
4174
+
4175
+ void RepairShadow()
4176
+ {
4177
+ if (blockloop)
4178
+ return;
4179
+
4180
+ if (this.material != null)
4181
+ this.InitOthers();
4182
+
4183
+ for (int i=0; i<Size(); i++)
4184
+ {
4185
+ blockloop = true;
4186
+ get(i).RepairShadow();
41234187 blockloop = false;
41244188 }
41254189 }
....@@ -4790,7 +4854,7 @@
47904854 return globalTransform;
47914855 }
47924856
4793
- void PreprocessOcclusion(CameraPane cp)
4857
+ void PreprocessOcclusion(iCameraPane cp)
47944858 {
47954859 /*
47964860 if (AOdone)
....@@ -4937,7 +5001,8 @@
49375001 } else //
49385002 if (editWindow != null)
49395003 {
4940
- editWindow.cameraView.lighttouched = true;
5004
+ //editWindow.cameraView.lighttouched = true;
5005
+ Globals.lighttouched = true;
49415006 }
49425007 }
49435008
....@@ -5249,25 +5314,22 @@
52495314 }
52505315 }
52515316
5252
- void draw(CameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
5317
+ void draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
52535318 {
52545319 Draw(display, root, selected, blocked);
52555320 }
52565321
5257
- static cMaterial[] materialstack = new cMaterial[65536];
5258
- static boolean[] selectedstack = new boolean[65536];
5259
- static int materialdepth = 0;
5260
-
52615322 boolean NeedSupport()
52625323 {
52635324 return
52645325 CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /*live &&*/ support != null
52655326 // PROBLEM with CROWD!!
5266
- && (CameraPane.drawMode == CameraPane.SHADOW || CameraPane.CROWD);
5327
+ && (Globals.DrawMode() == iCameraPane.SHADOW || Globals.CROWD);
52675328 }
52685329
5330
+ static boolean DEBUG_SELECTION = false;
52695331
5270
- void Draw(CameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
5332
+ void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
52715333 {
52725334 Invariants(); // june 2013
52735335
....@@ -5276,7 +5338,7 @@
52765338 // System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
52775339 }
52785340
5279
- if (display.drawMode == CameraPane.SELECTION &&
5341
+ if (display.DrawMode() == iCameraPane.SELECTION &&
52805342 hide)
52815343 return;
52825344
....@@ -5295,7 +5357,7 @@
52955357 if (this instanceof Checker)
52965358 return;
52975359
5298
- if (display.drawMode == display.SHADOW && PASSTEST)
5360
+ if (display.DrawMode() == display.SHADOW && PASSTEST)
52995361 return;
53005362
53015363 if (count <= 0)
....@@ -5303,8 +5365,8 @@
53035365 return;
53045366 }
53055367
5306
- if ((//display.drawMode == CameraPane.SHADOW ||
5307
- display.drawMode == CameraPane.SELECTION || CameraPane.DEBUG_SELECTION) && HasTransparency())
5368
+ if ((//display.DrawMode() == CameraPane.SHADOW ||
5369
+ display.DrawMode() == iCameraPane.SELECTION || display.IsDebugSelection()) && HasTransparency())
53085370 {
53095371 return;
53105372 }
....@@ -5345,15 +5407,15 @@
53455407
53465408 boolean compiled = false;
53475409
5348
- boolean selectmode = display.drawMode == display.SELECTION || CameraPane.DEBUG_SELECTION;
5410
+ boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
53495411
5350
- if (!selectmode && //display.drawMode != display.SELECTION &&
5412
+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
53515413 (touched || (bRep != null && bRep.displaylist <= 0)))
53525414 {
5353
- display.lighttouched = true;
5415
+ Globals.lighttouched = true;
53545416 } // all panes...
5355
- //if (usecalllists && display.drawMode != display.SELECTION && display.drawMode != display.SHADOW &&
5356
- if (bRep != null && usecalllists && !selectmode && // june 2013 display.drawMode != display.SHADOW &&
5417
+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5418
+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
53575419 (touched || (bRep != null && bRep.displaylist <= 0)))
53585420 {
53595421 if (!(this instanceof Composite))
....@@ -5384,7 +5446,7 @@
53845446 }
53855447 //gl.glDrawBuffer(gl.GL_BACK);
53865448 // XXX touched = false;
5387
- display.lighttouched = true; // all panes...
5449
+ Globals.lighttouched = true; // all panes...
53885450 }
53895451
53905452 touched = GetBRep() == null; // this instanceof Composite || this instanceof FileObject; // false;
....@@ -5423,12 +5485,12 @@
54235485
54245486 // frustum culling
54255487 if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5426
- && display.drawMode != CameraPane.SELECTION)
5488
+ && display.DrawMode() != iCameraPane.SELECTION)
54275489 {
5428
- if (display.drawMode == CameraPane.SHADOW)
5490
+ if (display.DrawMode() == iCameraPane.SHADOW)
54295491 {
54305492 if (!link2master // tricky to cull in shadow mode.
5431
- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
5493
+ && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
54325494 {
54335495 //System.out.print("CULLED");
54345496 culled = true;
....@@ -5436,7 +5498,7 @@
54365498 }
54375499 else
54385500 //GetBRep().getBounds(v0, v1, this);
5439
- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
5501
+ if (GetBRep().FrustumCull(this, gl, display.RenderCamera(), false))
54405502 culled = true;
54415503
54425504 // LA.xformPos(v0, display.renderCamera.toScreen, v0);
....@@ -5472,7 +5534,7 @@
54725534
54735535
54745536 if (!culled)
5475
- if (display.drawMode == display.SELECTION || CameraPane.DEBUG_SELECTION)
5537
+ if (display.DrawMode() == display.SELECTION || display.IsDebugSelection())
54765538 {
54775539 if (GetBRep() != null)
54785540 {
....@@ -5498,53 +5560,7 @@
54985560 color[2] /= 2;
54995561 gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
55005562 */
5501
- if (material != null)
5502
- {
5503
- materialstack[materialdepth] = material;
5504
- selectedstack[materialdepth] = selected;
5505
- cStatic.objectstack[materialdepth++] = this;
5506
- //System.out.println("material " + material);
5507
- //Applet3D.tracein(this, selected);
5508
- display.vector2buffer = projectedVertices;
5509
- if (this instanceof Camera)
5510
- {
5511
- display.options1[0] = material.shift;
5512
- //System.out.println("shift " + material.shift);
5513
- display.options1[1] = material.lightarea;
5514
- display.options1[2] = material.shadowbias;
5515
- display.options1[3] = material.aniso;
5516
- display.options1[4] = material.anisoV;
5517
- display.options2[0] = material.opacity;
5518
- display.options2[1] = material.diffuse;
5519
- display.options2[2] = material.factor;
5520
-
5521
- cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5522
- display.options3[3] = material.cameralight/0.2f;
5523
-
5524
- // if (display.CURRENTANTIALIAS > 0)
5525
- // display.options3[3] /= 4;
5526
-
5527
- /*
5528
- System.out.println("Focus = " + display.options1[0]);
5529
- System.out.println("Aperture = " + display.options1[1]);
5530
- System.out.println("ShadowBlur = " + display.options1[2]);
5531
- System.out.println("Antialiasing = " + display.options1[3]);
5532
- System.out.println("Fog = " + display.options2[0]);
5533
- System.out.println("Intensity = " + display.options2[1]);
5534
- System.out.println("Elevation = " + display.options2[2]);
5535
- /**/
5536
- } else
5537
- {
5538
- material.Draw(display, selected);
5539
- }
5540
- } else
5541
- {
5542
- if (selected && CameraPane.flash)
5543
- {
5544
- display.modelParams4[1] = 100;
5545
- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5546
- }
5547
- }
5563
+ display.PushMaterial(this, selected);
55485564
55495565 //System.out.println("call list " + list);
55505566 //System.out.println();
....@@ -5586,23 +5602,8 @@
55865602 }
55875603
55885604 display.ReleaseTextures(tex);
5589
-
5590
- //if (parent != null && parent.GetMaterial() != null)
5591
- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5592
- if (material != null)
5593
- {
5594
- materialdepth -= 1;
5595
- if (materialdepth > 0)
5596
- {
5597
- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5598
- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5599
- }
5600
- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5601
- } else if (selected && CameraPane.flash && GetMaterial() != null)
5602
- {
5603
- display.modelParams4[1] = GetMaterial().cameralight;
5604
- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5605
- }
5605
+
5606
+ display.PopMaterial(this, selected);
56065607 }
56075608
56085609 if (this instanceof Texture || this instanceof TextureNode)
....@@ -5644,7 +5645,7 @@
56445645 // resetMasterNode();
56455646 }
56465647
5647
- void CallList(CameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
5648
+ void CallList(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
56485649 {
56495650 if (GetBRep() == null)
56505651 {
....@@ -5727,7 +5728,7 @@
57275728 boolean flipV = false; // true;
57285729 int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
57295730
5730
- void drawSelf(CameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
5731
+ void drawSelf(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
57315732 {
57325733 if (hide)
57335734 return;
....@@ -5786,16 +5787,7 @@
57865787 // // ??????????????????????????? Touch();
57875788 // }
57885789
5789
- if (material != null)
5790
- {
5791
- materialstack[materialdepth] = material;
5792
- selectedstack[materialdepth] = selected;
5793
- cStatic.objectstack[materialdepth++] = this;
5794
- //System.out.println("material " + material);
5795
- //Applet3D.tracein("selected ", selected);
5796
- display.vector2buffer = projectedVertices;
5797
- material.Draw(display, selected);
5798
- }
5790
+display.PushMaterial2(this, selected);
57995791
58005792 Object3D child;
58015793 boolean sel;
....@@ -5819,12 +5811,12 @@
58195811 if (!child.HasTransparency())
58205812 {
58215813 sel = root != null && root.selection != null && root.selection.indexOf(child) != -1;
5822
- // GraphreeD.tracein("draw ", child);
5814
+ // GrafreeD.tracein("draw ", child);
58235815 boolean wasblocked = blockdraw;
58245816 blockdraw = true;
58255817 child.draw(display, root, selected || sel, wasblocked || blocked); // || child.IsSelected());
58265818 blockdraw = false;
5827
- // GraphreeD.traceout("draw ", child);
5819
+ // GrafreeD.traceout("draw ", child);
58285820 }
58295821
58305822 release(i);
....@@ -5847,19 +5839,7 @@
58475839 */
58485840 //depth += 1;
58495841
5850
- if (material != null)
5851
- {
5852
- materialdepth -= 1;
5853
- if (materialdepth > 0)
5854
- {
5855
- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5856
- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5857
- }
5858
- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5859
- //else
5860
- //material.Draw(display, false);
5861
- }
5862
-
5842
+display.PopMaterial2(this);
58635843 /*
58645844 display.ReleaseTextures(tex);
58655845 */
....@@ -5870,9 +5850,9 @@
58705850
58715851 //static cVector min,max;
58725852
5873
- void DrawNode(CameraPane display, Object3D /*Composite*/ root, boolean selected)
5853
+ void DrawNode(iCameraPane display, Object3D /*Composite*/ root, boolean selected)
58745854 {
5875
- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5855
+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
58765856 return; // no shadow for transparent objects
58775857
58785858 if (hide)
....@@ -5919,7 +5899,7 @@
59195899
59205900 javax.media.opengl.GL gl = display.GetGL();
59215901
5922
- if (CameraPane.BOXMODE) // || CameraPane.movingcamera)
5902
+ if (CameraPane.BOXMODE && !selected) // || CameraPane.movingcamera)
59235903 {
59245904 int fc = bRep.FaceCount();
59255905 int vc = bRep.VertexCount();
....@@ -5994,7 +5974,7 @@
59945974 {
59955975 //throw new Error();
59965976
5997
- boolean selectmode = display.drawMode == display.SELECTION || CameraPane.DEBUG_SELECTION;
5977
+ boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
59985978
59995979 int[] strips = bRep.getRawIndices();
60005980
....@@ -6238,7 +6218,7 @@
62386218 // // r.norm.dot(v3) > -0.5)
62396219 // // continue;
62406220
6241
- drawFace(p, q, r, display, face);
6221
+ display.DrawFace(this, p, q, r, face);
62426222 }
62436223 gl.glEnd();
62446224 }
....@@ -6282,7 +6262,7 @@
62826262 Vertex q = bRep.GetVertex(face.q);
62836263 Vertex r = bRep.GetVertex(face.r);
62846264
6285
- drawFace(p, q, r, display, face);
6265
+ display.DrawFace(this, p, q, r, face);
62866266 }
62876267 gl.glEnd();
62886268 }
....@@ -6422,180 +6402,6 @@
64226402
64236403 transient FaceCompare[] facescompare = null;
64246404
6425
- void SetColor(CameraPane display, Vertex p0)
6426
- {
6427
- if (display.RENDERPROGRAM == 0)
6428
- {
6429
- float r = 0;
6430
- if (bRep != null)
6431
- {
6432
- if (bRep.stripified)
6433
- {
6434
- r = 1;
6435
- }
6436
- }
6437
- float g = 0;
6438
- if (bRep != null)
6439
- {
6440
- if (bRep.trimmed)
6441
- {
6442
- g = 1;
6443
- }
6444
- }
6445
- float b = 0;
6446
- if (support != null && link2master)
6447
- {
6448
- b = 1;
6449
- }
6450
- display.GetGL().glColor3f(r*p0.AO, g*p0.AO, b*p0.AO);
6451
- return;
6452
- }
6453
-
6454
- if (display.drawMode != CameraPane.SHADOW)
6455
- return;
6456
-
6457
- javax.media.opengl.GL gl = display.GetGL();
6458
-// if (true) return;
6459
-// float ao = p.AO;
6460
-//
6461
-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6462
-// // ao = 1;
6463
-//
6464
-// gl.glColor4f(ao, ao, ao, 1);
6465
-
6466
-// CameraPane.selectedpoint.
6467
-// getAverage(cStatic.point1, true);
6468
- if (CameraPane.pointflow == null) // !random) // live)
6469
- {
6470
- return;
6471
- }
6472
-
6473
- cStatic.point1.set(0,0,0);
6474
- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6475
-
6476
- cStatic.point1.sub(p0);
6477
-
6478
-
6479
-// if (marked && (p0.vertexlinks == null || support == null || support.bRep == null)) // no position delta?
6480
-// {
6481
-// return;
6482
-// }
6483
-
6484
- //if (true)
6485
- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6486
- {
6487
- return;
6488
- }
6489
-
6490
- float[] colorV = new float[3];
6491
-
6492
- if (false) // marked)
6493
- {
6494
- // debug rigging weights
6495
- for (int object = 0; object < p0.vertexlinks.length; object++)
6496
- {
6497
- float weight = p0.weights[object] / p0.totalweight;
6498
-
6499
- // if (weight < 0.1)
6500
- // {
6501
- // assert(weight == 0);
6502
- // continue;
6503
- // }
6504
-
6505
- if (p0.vertexlinks[object] == -1)
6506
- continue;
6507
-
6508
- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6509
-
6510
- int color = //1 << object; //
6511
- //p.vertexlinks.length;
6512
- support.bRep.supports[p0.closestsupport].links[object];
6513
- colorV[2] += (color & 1) * weight;
6514
- colorV[1] += ((color & 2) >> 1) * weight;
6515
- colorV[0] += ((color & 4) >> 2) * weight;
6516
- }
6517
- }
6518
- else
6519
- {
6520
- if (drawingstarted)
6521
- {
6522
- // find next point
6523
- if (bRep.GetVertex(0).faceindices == null)
6524
- {
6525
- bRep.InitFaceIndices();
6526
- }
6527
-
6528
- double ymin = p0.y;
6529
-
6530
- Vertex newp = p0;
6531
-
6532
- for (int fii = 0; fii < p0.faceindices.length; fii++)
6533
- {
6534
- int fi = p0.faceindices[fii];
6535
-
6536
- if (fi == -1)
6537
- break;
6538
-
6539
- Face f = bRep.GetFace(fi);
6540
-
6541
- Vertex p = bRep.GetVertex(f.p);
6542
- Vertex q = bRep.GetVertex(f.q);
6543
- Vertex r = bRep.GetVertex(f.r);
6544
-
6545
- int swap = (int)(Math.random()*3);
6546
-
6547
-// for (int s=swap; --s>=0;)
6548
-// {
6549
-// Vertex t = p;
6550
-// p = q;
6551
-// q = r;
6552
-// r = t;
6553
-// }
6554
- if (ymin > p.y)
6555
- {
6556
- ymin = p.y;
6557
- newp = p;
6558
-// break;
6559
- }
6560
- if (ymin > q.y)
6561
- {
6562
- ymin = q.y;
6563
- newp = q;
6564
-// break;
6565
- }
6566
- if (ymin > r.y)
6567
- {
6568
- ymin = r.y;
6569
- newp = r;
6570
-// break;
6571
- }
6572
- }
6573
-
6574
- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6575
- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6576
- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6577
-
6578
- drawingstarted = false;
6579
-
6580
- // return;
6581
- }
6582
-
6583
- if (false) // CameraPane.DRAW
6584
- {
6585
- p0.AO = colorV[0] = 2;
6586
- colorV[1] = 2;
6587
- colorV[2] = 2;
6588
- }
6589
-
6590
- CameraPane.pointflow.add(p0);
6591
- CameraPane.pointflow.Touch();
6592
- }
6593
-
6594
-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6595
-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6596
-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6597
- }
6598
-
65996405 void Print(Vertex v)
66006406 {
66016407 //System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
....@@ -6617,152 +6423,6 @@
66176423 gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
66186424 }
66196425
6620
- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6621
- CameraPane display, Face face)
6622
- {
6623
- if (pv.y == -10000 ||
6624
- qv.y == -10000 ||
6625
- rv.y == -10000)
6626
- return;
6627
-
6628
-// float b = f.nbiterations & 1;
6629
-// float g = (f.nbiterations>>1) & 1;
6630
-// float r = (f.nbiterations>>2) & 1;
6631
-//
6632
-// //if (f.weight == 10000)
6633
-// //{
6634
-// // r = 1; g = b = 0;
6635
-// //}
6636
-// //else
6637
-// //{
6638
-// // assert(f.weight < 10000);
6639
-// r = g = b = (float)bRep.FaceWeight(f)*100;
6640
-// if (r<0)
6641
-// assert(r>=0);
6642
-// //}
6643
-
6644
- javax.media.opengl.GL gl = display.GetGL();
6645
-
6646
- boolean selectmode = display.drawMode == display.SELECTION || CameraPane.DEBUG_SELECTION;
6647
-
6648
- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6649
- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6650
- {
6651
- //gl.glBegin(gl.GL_TRIANGLES);
6652
- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0);
6653
- if (!hasnorm)
6654
- {
6655
- // System.out.println("FUCK!!");
6656
- LA.vecSub(pv/*.pos*/, qv/*.pos*/, v0);
6657
- LA.vecSub(pv/*.pos*/, rv/*.pos*/, v1);
6658
- LA.vecCross(v0, v1, v2);
6659
- LA.vecNormalize(v2);
6660
- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6661
- }
6662
-
6663
- if (hasnorm)
6664
- {
6665
-// if (!pv.norm.normalized())
6666
-// assert(pv.norm.normalized());
6667
-
6668
- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6669
- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6670
- }
6671
- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6672
- SetColor(display, pv);
6673
- //gl.glColor4f(r, g, b, 1);
6674
- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6675
- if (flipV)
6676
- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6677
- else
6678
- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6679
- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6680
- gl.glVertex3f((float) pv./*pos.*/x, (float) pv./*pos.*/y, (float) pv./*pos.*/z);
6681
-// Print(pv);
6682
- if (hasnorm)
6683
- {
6684
-// assert(qv.norm.normalized());
6685
- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6686
- gl.glNormal3f((float) qv.norm.x, (float) qv.norm.y, (float) qv.norm.z);
6687
- }
6688
- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6689
- // boolean locked = false;
6690
- // float eps = 0.1f;
6691
- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6692
-
6693
- // int dot = 0; //*/ (int)f.dot;
6694
-
6695
- // if ((dot&1) == 0)
6696
- // dot |= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6697
-
6698
- // if (wrap || (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6699
- if (flipV)
6700
- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6701
- else
6702
- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6703
- // else
6704
- // {
6705
- // locked = true;
6706
- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6707
- // }
6708
- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6709
- SetColor(display, qv);
6710
- //gl.glColor4f(r, g, b, 1);
6711
- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6712
- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6713
- gl.glVertex3f((float) qv./*pos.*/x, (float) qv./*pos.*/y, (float) qv./*pos.*/z);
6714
-// Print(qv);
6715
- if (hasnorm)
6716
- {
6717
-// assert(rv.norm.normalized());
6718
- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6719
- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6720
- }
6721
-
6722
- // if ((dot&4) == 0)
6723
- // dot |= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6724
-
6725
- // if (wrap || !locked && (dot&8) != 0)
6726
- if (flipV)
6727
- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6728
- else
6729
- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6730
- // else
6731
- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6732
-
6733
- // f.dot = dot;
6734
-
6735
- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6736
- SetColor(display, rv);
6737
- //gl.glColor4f(r, g, b, 1);
6738
- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6739
- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6740
- gl.glVertex3f((float) rv./*pos.*/x, (float) rv./*pos.*/y, (float) rv./*pos.*/z);
6741
-// Print(rv);
6742
- //gl.glEnd();
6743
- }
6744
- else
6745
- {
6746
- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6747
- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6748
- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6749
-
6750
- }
6751
-
6752
- if (false) // (attributes & WIREFRAME) != 0)
6753
- {
6754
- gl.glDisable(gl.GL_LIGHTING);
6755
-
6756
- gl.glBegin(gl.GL_LINE_LOOP);
6757
- gl.glVertex3d(pv./*pos.*/x, pv./*pos.*/y, pv./*pos.*/z);
6758
- gl.glVertex3d(qv./*pos.*/x, qv./*pos.*/y, qv./*pos.*/z);
6759
- gl.glVertex3d(rv./*pos.*/x, rv./*pos.*/y, rv./*pos.*/z);
6760
- gl.glEnd();
6761
-
6762
- gl.glEnable(gl.GL_LIGHTING);
6763
- }
6764
- }
6765
-
67666426 void drawSelf(ClickInfo info, int level, boolean select)
67676427 {
67686428 if (bRep == null)
....@@ -7334,83 +6994,83 @@
73346994 int spotw = spot.x + spot.width;
73356995 int spoth = spot.y + spot.height;
73366996 info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7337
- if (CameraPane.Xmin > spot.x)
7338
- {
7339
- CameraPane.Xmin = spot.x;
7340
- }
7341
- if (CameraPane.Xmax < spotw)
7342
- {
7343
- CameraPane.Xmax = spotw;
7344
- }
7345
- if (CameraPane.Ymin > spot.y)
7346
- {
7347
- CameraPane.Ymin = spot.y;
7348
- }
7349
- if (CameraPane.Ymax < spoth)
7350
- {
7351
- CameraPane.Ymax = spoth;
7352
- }
6997
+// if (CameraPane.Xmin > spot.x)
6998
+// {
6999
+// CameraPane.Xmin = spot.x;
7000
+// }
7001
+// if (CameraPane.Xmax < spotw)
7002
+// {
7003
+// CameraPane.Xmax = spotw;
7004
+// }
7005
+// if (CameraPane.Ymin > spot.y)
7006
+// {
7007
+// CameraPane.Ymin = spot.y;
7008
+// }
7009
+// if (CameraPane.Ymax < spoth)
7010
+// {
7011
+// CameraPane.Ymax = spoth;
7012
+// }
73537013 spot.translate(32, 32);
73547014 spotw = spot.x + spot.width;
73557015 spoth = spot.y + spot.height;
73567016 info.g.setColor(Color.blue);
73577017 info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7358
- if (CameraPane.Xmin > spot.x)
7359
- {
7360
- CameraPane.Xmin = spot.x;
7361
- }
7362
- if (CameraPane.Xmax < spotw)
7363
- {
7364
- CameraPane.Xmax = spotw;
7365
- }
7366
- if (CameraPane.Ymin > spot.y)
7367
- {
7368
- CameraPane.Ymin = spot.y;
7369
- }
7370
- if (CameraPane.Ymax < spoth)
7371
- {
7372
- CameraPane.Ymax = spoth;
7373
- }
7018
+// if (CameraPane.Xmin > spot.x)
7019
+// {
7020
+// CameraPane.Xmin = spot.x;
7021
+// }
7022
+// if (CameraPane.Xmax < spotw)
7023
+// {
7024
+// CameraPane.Xmax = spotw;
7025
+// }
7026
+// if (CameraPane.Ymin > spot.y)
7027
+// {
7028
+// CameraPane.Ymin = spot.y;
7029
+// }
7030
+// if (CameraPane.Ymax < spoth)
7031
+// {
7032
+// CameraPane.Ymax = spoth;
7033
+// }
73747034 info.g.drawLine(spotw, spoth, spotw, spoth - 15);
73757035 info.g.drawLine(spotw, spoth, spotw - 15, spoth);
73767036 spot.translate(0, -32);
73777037 info.g.setColor(Color.green);
73787038 info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7379
- if (CameraPane.Xmin > spot.x)
7380
- {
7381
- CameraPane.Xmin = spot.x;
7382
- }
7383
- if (CameraPane.Xmax < spotw)
7384
- {
7385
- CameraPane.Xmax = spotw;
7386
- }
7387
- if (CameraPane.Ymin > spot.y)
7388
- {
7389
- CameraPane.Ymin = spot.y;
7390
- }
7391
- if (CameraPane.Ymax < spoth)
7392
- {
7393
- CameraPane.Ymax = spoth;
7394
- }
7039
+// if (CameraPane.Xmin > spot.x)
7040
+// {
7041
+// CameraPane.Xmin = spot.x;
7042
+// }
7043
+// if (CameraPane.Xmax < spotw)
7044
+// {
7045
+// CameraPane.Xmax = spotw;
7046
+// }
7047
+// if (CameraPane.Ymin > spot.y)
7048
+// {
7049
+// CameraPane.Ymin = spot.y;
7050
+// }
7051
+// if (CameraPane.Ymax < spoth)
7052
+// {
7053
+// CameraPane.Ymax = spoth;
7054
+// }
73957055 info.g.drawArc(boundary.x, boundary.y,
73967056 boundary.width, boundary.height, 0, 360);
73977057 //info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7398
- if (CameraPane.Xmin > boundary.x)
7399
- {
7400
- CameraPane.Xmin = boundary.x;
7401
- }
7402
- if (CameraPane.Xmax < boundary.x + boundary.width)
7403
- {
7404
- CameraPane.Xmax = boundary.x + boundary.width;
7405
- }
7406
- if (CameraPane.Ymin > boundary.y)
7407
- {
7408
- CameraPane.Ymin = boundary.y;
7409
- }
7410
- if (CameraPane.Ymax < boundary.y + boundary.height)
7411
- {
7412
- CameraPane.Ymax = boundary.y + boundary.height;
7413
- }
7058
+// if (CameraPane.Xmin > boundary.x)
7059
+// {
7060
+// CameraPane.Xmin = boundary.x;
7061
+// }
7062
+// if (CameraPane.Xmax < boundary.x + boundary.width)
7063
+// {
7064
+// CameraPane.Xmax = boundary.x + boundary.width;
7065
+// }
7066
+// if (CameraPane.Ymin > boundary.y)
7067
+// {
7068
+// CameraPane.Ymin = boundary.y;
7069
+// }
7070
+// if (CameraPane.Ymax < boundary.y + boundary.height)
7071
+// {
7072
+// CameraPane.Ymax = boundary.y + boundary.height;
7073
+// }
74147074 return;
74157075 }
74167076 }
....@@ -7731,7 +7391,7 @@
77317391 if (parent == null)
77327392 {
77337393 System.out.println("NULL PARENT");
7734
- new Exception().printStackTrace();
7394
+ //new Exception().printStackTrace();
77357395 } else
77367396 {
77377397 if (parent instanceof BezierPatch)
....@@ -8041,7 +7701,7 @@
80417701 {
80427702 assert(bRep != null);
80437703 if (!(support instanceof GenericJoint)) // support.bRep != null)
8044
- GraphreeD.Assert(support.bRep == bRep.support);
7704
+ GrafreeD.Assert(support.bRep == bRep.support);
80457705 }
80467706 else
80477707 {
....@@ -8124,6 +7784,8 @@
81247784 {
81257785 Object3D targ = this;
81267786
7787
+ targ.NORMALPUSH = obj.NORMALPUSH;
7788
+
81277789 if (obj.material != null)
81287790 {
81297791 if ((mask&MATERIAL)!=0) // ==(COLOR|MATERIAL))