Normand Briere
2019-04-22 4a5b9e0b9ecc97203d4089ca0cd0d6df8c76bf1c
CameraPane.java
....@@ -149,12 +149,11 @@
149149 defaultcaps.setAccumBlueBits(16);
150150 defaultcaps.setAccumAlphaBits(16);
151151 }
152
- static CameraPane theRenderer;
153
-
152
+
154153 void SetAsGLRenderer(boolean b)
155154 {
156155 isRenderer = b;
157
- theRenderer = this;
156
+ Globals.theRenderer = this;
158157 }
159158
160159 CameraPane(Object3D o, Camera cam, boolean withcontext)
....@@ -191,6 +190,11 @@
191190 }
192191
193192 /// INTERFACE
193
+
194
+ public boolean IsBoxMode()
195
+ {
196
+ return BOXMODE;
197
+ }
194198
195199 public void ClearDepth()
196200 {
....@@ -231,9 +235,14 @@
231235 return this.ambientOcclusion;
232236 }
233237
238
+ public boolean IsDebugSelection()
239
+ {
240
+ return DEBUG_SELECTION;
241
+ }
242
+
234243 public boolean IsFrozen()
235244 {
236
- boolean selectmode = this.DrawMode() == SELECTION || CameraPane.DEBUG_SELECTION;
245
+ boolean selectmode = this.DrawMode() == SELECTION || this.IsDebugSelection();
237246
238247 return !selectmode && cameracount == 0; // != 0;
239248 }
....@@ -254,9 +263,19 @@
254263 return lightCamera;
255264 }
256265
266
+ public Camera ManipCamera()
267
+ {
268
+ return manipCamera;
269
+ }
270
+
257271 public Camera RenderCamera()
258272 {
259273 return renderCamera;
274
+ }
275
+
276
+ public Camera[] Cameras()
277
+ {
278
+ return cameras;
260279 }
261280
262281 public void PushMaterial(Object3D obj, boolean selected)
....@@ -403,7 +422,7 @@
403422
404423 javax.media.opengl.GL gl = display.GetGL();
405424
406
- boolean selectmode = display.DrawMode() == display.SELECTION || CameraPane.DEBUG_SELECTION;
425
+ boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
407426
408427 //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
409428 if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
....@@ -566,6 +585,480 @@
566585 }
567586 }
568587
588
+ /**
589
+ * <code>draw</code> renders a <code>TriMesh</code> object including
590
+ * it's normals, colors, textures and vertices.
591
+ *
592
+ * @see Renderer#draw(TriMesh)
593
+ * @param tris
594
+ * the mesh to render.
595
+ */
596
+ public void DrawParticles(TriMesh geo, Object3D shape, boolean selected, boolean rotate) // TriMesh tris)
597
+ {
598
+ CameraPane display = this;
599
+
600
+ float r = display.modelParams0[0];
601
+ float g = display.modelParams0[1];
602
+ float b = display.modelParams0[2];
603
+ float opacity = display.modelParams5[1];
604
+
605
+ //final GL gl = GLU.getCurrentGL();
606
+ GL gl = display.GetGL(); // getGL();
607
+
608
+ FloatBuffer vertBuf = geo.vertBuf;
609
+
610
+ int v = vertBuf.capacity();
611
+
612
+ int count = 0;
613
+
614
+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
615
+ gl.glEnable(gl.GL_CULL_FACE);
616
+ // gl.glScalef(1.0f/1024,1.0f/1024,1.0f/1024);
617
+ for (int i=0; i<v/3; i++)
618
+ {
619
+ int index3 = i*3;
620
+
621
+ if (geo.sizeBuf.get(index3+1) == 0)
622
+ continue;
623
+
624
+ count++;
625
+
626
+ int index4 = i*4;
627
+
628
+ float tx = vertBuf.get(index3);
629
+ float ty = vertBuf.get(index3+1);
630
+ float tz = vertBuf.get(index3+2);
631
+
632
+ // if (tx == 0 && ty == 0 && tz == 0)
633
+ // continue;
634
+
635
+ gl.glMatrixMode(gl.GL_TEXTURE);
636
+ gl.glPushMatrix();
637
+
638
+ float[] texmat = geo.texmat;
639
+ texmat[12] = texmat[13] = texmat[14] = i;
640
+
641
+ gl.glMultMatrixf(texmat, 0);
642
+
643
+ gl.glMatrixMode(gl.GL_MODELVIEW);
644
+ gl.glPushMatrix();
645
+
646
+ gl.glTranslatef(tx,ty,tz);
647
+
648
+ if (rotate)
649
+ gl.glRotatef(i, 0, 1, 0);
650
+
651
+ float size = geo.sizeBuf.get(index3) / 100;
652
+ gl.glScalef(size,size,size);
653
+
654
+ float cr = geo.colorBuf.get(index4);
655
+ float cg = geo.colorBuf.get(index4+1);
656
+ float cb = geo.colorBuf.get(index4+2);
657
+ float ca = geo.colorBuf.get(index4+3);
658
+
659
+ display.modelParams0[0] = r * cr;
660
+ display.modelParams0[1] = g * cg;
661
+ display.modelParams0[2] = b * cb;
662
+
663
+ display.modelParams5[1] = opacity * ca;
664
+
665
+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
666
+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
667
+
668
+ RandomNode.globalseed = (int)geo.sizeBuf.get(index3+2); // i;
669
+ RandomNode.globalseed2 = RandomNode.globalseed;
670
+
671
+// gl.glColor4f(cr,cg,cb,ca);
672
+ // gl.glScalef(1024/16,1024/16,1024/16);
673
+ shape.Draw/*Node*/(display,null,selected,false); // blocked
674
+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
675
+ //gl.glTranslatef(-tx,-ty,-tz);
676
+ gl.glPopMatrix();
677
+
678
+ gl.glMatrixMode(gl.GL_TEXTURE);
679
+ gl.glPopMatrix();
680
+ }
681
+ // gl.glScalef(1024,1024,1024);
682
+ if (!cf)
683
+ gl.glDisable(gl.GL_CULL_FACE);
684
+
685
+ display.modelParams0[0] = r;
686
+ display.modelParams0[1] = g;
687
+ display.modelParams0[2] = b;
688
+
689
+ display.modelParams5[1] = opacity;
690
+
691
+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
692
+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
693
+
694
+ gl.glMatrixMode(gl.GL_MODELVIEW);
695
+
696
+// System.err.println("total = " + v/3 + "; displayed = " + count);
697
+ if (true)
698
+ return;
699
+
700
+//// if (!tris.predraw(this))
701
+//// {
702
+//// return;
703
+//// }
704
+//// if (Debug.stats)
705
+//// {
706
+//// StatCollector.addStat(StatType.STAT_TRIANGLE_COUNT, tris.getTriangleCount());
707
+//// StatCollector.addStat(StatType.STAT_VERTEX_COUNT, tris.getVertexCount());
708
+//// StatCollector.addStat(StatType.STAT_GEOM_COUNT, 1);
709
+//// }
710
+////
711
+//// if (tris.getDisplayListID() != -1)
712
+//// {
713
+//// renderDisplayList(tris);
714
+//// return;
715
+//// }
716
+////
717
+//// if (!generatingDisplayList)
718
+//// {
719
+//// applyStates(tris.states, tris);
720
+//// }
721
+//// if (Debug.stats)
722
+//// {
723
+//// StatCollector.startStat(StatType.STAT_RENDER_TIMER);
724
+//// }
725
+//// boolean transformed = doTransforms(tris);
726
+//
727
+// int glMode = GL.GL_TRIANGLES;
728
+// switch (getMode())
729
+// {
730
+// case Triangles:
731
+// glMode = GL.GL_TRIANGLES;
732
+// break;
733
+// case Strip:
734
+// glMode = GL.GL_TRIANGLE_STRIP;
735
+// break;
736
+// case Fan:
737
+// glMode = GL.GL_TRIANGLE_FAN;
738
+// break;
739
+// }
740
+//
741
+// if (!predrawGeometry(gl))
742
+// {
743
+// // make sure only the necessary indices are sent through on old
744
+// // cards.
745
+// IntBuffer indices = this.getIndexBuffer();
746
+// if (indices == null)
747
+// {
748
+// logger.severe("missing indices on geometry object: " + this.toString());
749
+// } else
750
+// {
751
+// indices.rewind();
752
+// indices.limit(this.getMaxIndex());
753
+//
754
+// gl.glDrawElements(glMode, indices.limit(), GL.GL_UNSIGNED_INT, indices); // TODO Check <count> and assumed <type> of GL_UNSIGNED_INT
755
+//
756
+// indices.clear();
757
+// }
758
+// } else
759
+// {
760
+// gl.glDrawElements(glMode, this.getIndexBuffer().limit(),
761
+// GL.GL_UNSIGNED_INT, 0);
762
+// }
763
+//
764
+//// postdrawGeometry(tris);
765
+//// if (transformed)
766
+//// {
767
+//// undoTransforms(tris);
768
+//// }
769
+////
770
+//// if (Debug.stats)
771
+//// {
772
+//// StatCollector.endStat(StatType.STAT_RENDER_TIMER);
773
+//// }
774
+//// tris.postdraw(this);
775
+ }
776
+
777
+ static Camera localcamera = new Camera();
778
+ static cVector from = new cVector();
779
+ static cVector to = new cVector();
780
+
781
+ public void PrepOcclusion(BoundaryRep br, double[][] transform)
782
+ {
783
+ CameraPane cp = this;
784
+
785
+ Camera keep = cp.RenderCamera();
786
+ cp.renderCamera = localcamera;
787
+
788
+ if (br.trimmed)
789
+ {
790
+ float[] colors = new float[br.positions.length / 3];
791
+
792
+ int i3 = 0;
793
+ for (int i = 0; i < br.positions.length / 3; i++, i3 += 3)
794
+ {
795
+ if (br.normals[i3] == 0 && br.normals[i3+1] == 0 && br.normals[i3+2] == 0)
796
+ continue;
797
+
798
+ from.set(br.positions[i3], br.positions[i3 + 1], br.positions[i3 + 2]);
799
+ to.set(br.positions[i3] + br.normals[i3],
800
+ br.positions[i3 + 1] + br.normals[i3 + 1],
801
+ br.positions[i3 + 2] + br.normals[i3 + 2]);
802
+ LA.xformPos(from, transform, from);
803
+ LA.xformPos(to, transform, to); // RIGID ONLY
804
+ localcamera.setAim(from, to);
805
+
806
+ CameraPane.occlusionbuffer.display();
807
+
808
+ if (CameraPane.DEBUG_OCCLUSION)
809
+ cp.display(); // debug
810
+
811
+ colors[i] = cp.vertexOcclusion.r;
812
+ //colors[i3 + 1] = cp.vertexOcclusion.g;
813
+ //colors[i3 + 2] = cp.vertexOcclusion.b;
814
+
815
+ if ((i % 100) == 0 && i != 0)
816
+ {
817
+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
818
+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
819
+ System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
820
+ }
821
+ }
822
+
823
+ br.colors = colors;
824
+ }
825
+ else
826
+ {
827
+ for (int i = 0; i < br.VertexCount(); i++)
828
+ {
829
+ Vertex v = br.GetVertex(i);
830
+
831
+ if (v.norm == null || v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
832
+ continue;
833
+
834
+ from.set(v.x, v.y, v.z);
835
+ to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
836
+ LA.xformPos(from, transform, from);
837
+ LA.xformPos(to, transform, to); // RIGID ONLY
838
+ localcamera.setAim(from, to);
839
+
840
+ CameraPane.occlusionbuffer.display();
841
+
842
+ if (CameraPane.DEBUG_OCCLUSION)
843
+ cp.display(); // debug
844
+
845
+ v.AO = cp.vertexOcclusion.r;
846
+
847
+ if ((i % 100) == 0 && i != 0)
848
+ {
849
+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
850
+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
851
+ System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
852
+ }
853
+ }
854
+ }
855
+
856
+ //System.out.println("done.");
857
+
858
+ cp.renderCamera = keep;
859
+ }
860
+
861
+ void DrawPointFLow(PointFlow pointFlow, Object3D /*Composite*/ root, boolean selected, boolean blocked)
862
+ {
863
+ CameraPane display = this;
864
+ pointFlow.CreateHT();
865
+
866
+ float r = display.modelParams0[0];
867
+ float g = display.modelParams0[1];
868
+ float b = display.modelParams0[2];
869
+ float opacity = display.modelParams5[1];
870
+
871
+ //final GL gl = GLU.getCurrentGL();
872
+ GL gl = display.GetGL(); // getGL();
873
+
874
+ int s = pointFlow.points.size();
875
+
876
+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
877
+ gl.glEnable(gl.GL_CULL_FACE);
878
+
879
+ for (int i=s; --i>=0;)
880
+ //for (int i=0; i<s; i++)
881
+ {
882
+ cVector v = pointFlow.points.get(i);
883
+
884
+ double mindist = Double.MAX_VALUE;
885
+
886
+ double size = pointFlow.minimumSize;
887
+
888
+ double distancenext = 0;
889
+
890
+ if (i > 0)
891
+ {
892
+ cVector w = pointFlow.points.get(i-1);
893
+
894
+ double dist = w.distance(v);
895
+
896
+ distancenext = dist;
897
+
898
+ if (mindist > dist)
899
+ {
900
+ mindist = dist;
901
+ size = mindist*pointFlow.resizefactor;
902
+ }
903
+ }
904
+
905
+ if (i < s-1)
906
+ {
907
+ cVector w = pointFlow.points.get(i+1);
908
+
909
+ double dist = w.distance(v);
910
+
911
+ if (mindist > dist)
912
+ {
913
+ mindist = dist;
914
+ size = mindist*pointFlow.resizefactor;
915
+ }
916
+ }
917
+
918
+ if (size < pointFlow.minimumSize)
919
+ size = pointFlow.minimumSize;
920
+ if (size > pointFlow.maximumSize)
921
+ size = pointFlow.maximumSize;
922
+
923
+ double tx = v.x;
924
+ double ty = v.y;
925
+ double tz = v.z;
926
+
927
+ // if (tx == 0 && ty == 0 && tz == 0)
928
+ // continue;
929
+
930
+ gl.glMatrixMode(gl.GL_TEXTURE);
931
+ gl.glPushMatrix();
932
+ pointFlow.texmat[12] = pointFlow.texmat[13] = pointFlow.texmat[14] = i;
933
+
934
+ gl.glMultMatrixf(pointFlow.texmat, 0);
935
+
936
+ gl.glMatrixMode(gl.GL_MODELVIEW);
937
+ gl.glPushMatrix();
938
+
939
+ gl.glTranslated(tx,ty,tz);
940
+
941
+ gl.glScaled(size,size,size);
942
+
943
+// float cr = colorBuf.get(index4);
944
+// float cg = colorBuf.get(index4+1);
945
+// float cb = colorBuf.get(index4+2);
946
+// float ca = colorBuf.get(index4+3);
947
+//
948
+// display.modelParams0[0] = r * cr;
949
+// display.modelParams0[1] = g * cg;
950
+// display.modelParams0[2] = b * cb;
951
+//
952
+// display.modelParams5[1] = opacity * ca;
953
+//
954
+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
955
+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
956
+//
957
+// RandomNode.globalseed = (int)sizeBuf.get(index3+2); // i;
958
+// RandomNode.globalseed2 = RandomNode.globalseed;
959
+//
960
+//// gl.glColor4f(cr,cg,cb,ca);
961
+// // gl.glScalef(1024/16,1024/16,1024/16);
962
+ pointFlow.geo.Draw/*Node*/(display,null,selected, blocked);
963
+
964
+ gl.glPopMatrix();
965
+
966
+ double step = size/4; //
967
+
968
+ if (i == 0 || size == 0 || distancenext > 8*size || distancenext < step)
969
+ continue;
970
+
971
+ int nbsteps = (int)(distancenext/step);
972
+
973
+ step = distancenext/nbsteps;
974
+
975
+ cVector next = pointFlow.points.get(i-1);
976
+
977
+ tmp.set(next);
978
+ tmp.sub(v);
979
+ tmp.normalize();
980
+ tmp.mul(step);
981
+
982
+ // calculate next size
983
+ mindist = Double.MAX_VALUE;
984
+
985
+ double nextsize = pointFlow.minimumSize;
986
+
987
+ if (i > 1)
988
+ {
989
+ cVector w = pointFlow.points.get(i-2);
990
+
991
+ double dist = w.distance(next);
992
+
993
+ if (mindist > dist)
994
+ {
995
+ mindist = dist;
996
+ nextsize = mindist*pointFlow.resizefactor;
997
+ }
998
+ }
999
+
1000
+ double dist = v.distance(next);
1001
+
1002
+ if (mindist > dist)
1003
+ {
1004
+ mindist = dist;
1005
+ nextsize = mindist*pointFlow.resizefactor;
1006
+ }
1007
+
1008
+ if (nextsize < pointFlow.minimumSize)
1009
+ nextsize = pointFlow.minimumSize;
1010
+ if (nextsize > pointFlow.maximumSize)
1011
+ nextsize = pointFlow.maximumSize;
1012
+ //
1013
+
1014
+ double count = 0;
1015
+
1016
+ while (distancenext > 0.000000001) // step
1017
+ {
1018
+ gl.glPushMatrix();
1019
+
1020
+ gl.glTranslated(tx + tmp.x*count, ty + tmp.y*count, tz + tmp.z*count);
1021
+
1022
+ double K = count/nbsteps;
1023
+
1024
+ double intersize = K*nextsize + (1-K)*size;
1025
+
1026
+ gl.glScaled(intersize,intersize,intersize);
1027
+
1028
+ pointFlow.geo.Draw/*Node*/(display,null,selected,blocked);
1029
+
1030
+ count++;
1031
+
1032
+ distancenext -= step;
1033
+
1034
+ gl.glPopMatrix();
1035
+ }
1036
+
1037
+ if (count != nbsteps)
1038
+ assert(count == nbsteps);
1039
+
1040
+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
1041
+ //gl.glTranslatef(-tx,-ty,-tz);
1042
+
1043
+ gl.glMatrixMode(gl.GL_TEXTURE);
1044
+ gl.glPopMatrix();
1045
+ }
1046
+
1047
+ if (!cf)
1048
+ gl.glDisable(gl.GL_CULL_FACE);
1049
+
1050
+// display.modelParams0[0] = r;
1051
+// display.modelParams0[1] = g;
1052
+// display.modelParams0[2] = b;
1053
+//
1054
+// display.modelParams5[1] = opacity;
1055
+//
1056
+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
1057
+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
1058
+
1059
+ gl.glMatrixMode(gl.GL_MODELVIEW);
1060
+ }
1061
+
5691062 /// INTERFACE
5701063
5711064 void SetColor(Object3D obj, Vertex p0)
....@@ -1129,7 +1622,7 @@
11291622
11301623 static int camerachangeframe;
11311624
1132
- boolean SetCamera(Camera cam)
1625
+ public boolean SetCamera(Camera cam)
11331626 {
11341627 // may 2014 if (cam == cameras[0] || cam == cameras[1])
11351628 // return false;
....@@ -1257,12 +1750,27 @@
12571750 mainDL ^= true;
12581751 }
12591752
1260
- void ToggleTexture()
1753
+ void ToggleFullScreen()
1754
+ {
1755
+ FULLSCREEN ^= true;
1756
+ }
1757
+
1758
+ void ToggleCrowd()
1759
+ {
1760
+ Globals.CROWD ^= true;
1761
+ }
1762
+
1763
+ void ToggleLocal()
1764
+ {
1765
+ LOCALTRANSFORM ^= true;
1766
+ }
1767
+
1768
+ public void ToggleTexture()
12611769 {
12621770 textureon ^= true;
12631771 }
12641772
1265
- void ToggleLive()
1773
+ public void ToggleLive()
12661774 {
12671775 Globals.setLIVE(Globals.isLIVE() ^ true);
12681776
....@@ -1274,92 +1782,67 @@
12741782 repaint(); // start loop // may 2013
12751783 }
12761784
1277
- void ToggleSupport()
1785
+ public void ToggleSupport()
12781786 {
12791787 SUPPORT ^= true;
12801788 }
12811789
1282
- void ToggleAbort()
1790
+ public void ToggleAbort()
12831791 {
12841792 ABORTMODE ^= true;
12851793 }
12861794
1287
- void ToggleFullScreen()
1288
- {
1289
- FULLSCREEN ^= true;
1290
- }
1291
-
1292
- void ToggleCrowd()
1293
- {
1294
- Globals.CROWD ^= true;
1295
- }
1296
-
1297
- void ToggleInertia()
1795
+ public void ToggleInertia()
12981796 {
12991797 INERTIA ^= true;
13001798 }
13011799
1302
- void ToggleLocal()
1303
- {
1304
- LOCALTRANSFORM ^= true;
1305
- }
1306
-
1307
- void ToggleFast()
1800
+ public void ToggleFast()
13081801 {
13091802 FAST ^= true;
13101803 }
13111804
1312
- void ToggleSlowPose()
1805
+ public void ToggleSlowPose()
13131806 {
13141807 SLOWPOSE ^= true;
13151808 }
13161809
1317
- void ToggleFootContact()
1318
- {
1319
- FOOTCONTACT ^= true;
1320
- }
1321
-
1322
- void ToggleBoxMode()
1810
+ public void ToggleBoxMode()
13231811 {
13241812 BOXMODE ^= true;
13251813 }
13261814
1327
- void ToggleSmoothFocus()
1815
+ public void ToggleSmoothFocus()
13281816 {
13291817 SMOOTHFOCUS ^= true;
13301818 }
13311819
1332
- void ToggleImageFlip()
1820
+ public void ToggleImageFlip()
13331821 {
13341822 IMAGEFLIP ^= true;
13351823 }
13361824
1337
- void ToggleSpeakerMocap()
1825
+ public void ToggleSpeakerMocap()
13381826 {
13391827 SPEAKERMOCAP ^= true;
13401828 }
13411829
1342
- void ToggleSpeakerCamera()
1830
+ public void ToggleSpeakerCamera()
13431831 {
13441832 SPEAKERCAMERA ^= true;
13451833 }
13461834
1347
- void ToggleSpeakerFocus()
1835
+ public void ToggleSpeakerFocus()
13481836 {
13491837 SPEAKERFOCUS ^= true;
13501838 }
13511839
1352
- void ToggleDebug()
1353
- {
1354
- DEBUG ^= true;
1355
- }
1356
-
1357
- void ToggleFrustum()
1840
+ public void ToggleFrustum()
13581841 {
13591842 FRUSTUM ^= true;
13601843 }
13611844
1362
- void ToggleTrack()
1845
+ public void ToggleTrack()
13631846 {
13641847 TRACK ^= true;
13651848 if (TRACK)
....@@ -1378,25 +1861,35 @@
13781861 repaint();
13791862 }
13801863
1381
- void ToggleTrackOnce()
1864
+ public void ToggleTrackOnce()
13821865 {
13831866 TRACKONCE ^= true;
13841867 }
13851868
1386
- void ToggleShadowTrack()
1869
+ public void ToggleShadowTrack()
13871870 {
13881871 SHADOWTRACK ^= true;
13891872 repaint();
13901873 }
13911874
1392
- void ToggleOeil()
1875
+ public void ToggleOeil()
13931876 {
13941877 OEIL ^= true;
13951878 }
13961879
1397
- void ToggleOeilOnce()
1880
+ public void ToggleOeilOnce()
13981881 {
13991882 OEILONCE ^= true;
1883
+ }
1884
+
1885
+ void ToggleFootContact()
1886
+ {
1887
+ FOOTCONTACT ^= true;
1888
+ }
1889
+
1890
+ void ToggleDebug()
1891
+ {
1892
+ DEBUG ^= true;
14001893 }
14011894
14021895 void ToggleLookAt()
....@@ -7458,7 +7951,7 @@
74587951 return texture!=null?texture.texture:null;
74597952 }
74607953
7461
- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
7954
+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
74627955 {
74637956 CacheTexture texture = GetCacheTexture(tex, bump, resolution);
74647957
....@@ -10146,7 +10639,7 @@
1014610639 fragmentMode |= (lightslot - 64) << 2; // 1; // first bit is available for aniso
1014710640 //System.out.println("fragmentMode = " + fragmentMode);
1014810641
10149
- if (DrawMode() == DEFAULT || DrawMode() == SELECTION || DEBUG_SELECTION)
10642
+ if (DrawMode() == DEFAULT || DrawMode() == SELECTION || IsDebugSelection())
1015010643 {
1015110644 /*
1015210645 if (CULLFACE || (ambientOcclusion && OCCLUSION_CULLING))
....@@ -10447,7 +10940,7 @@
1044710940 callist = gl.glGenLists(1);
1044810941 }
1044910942
10450
- boolean selectmode = DrawMode() == SELECTION || CameraPane.DEBUG_SELECTION;
10943
+ boolean selectmode = DrawMode() == SELECTION || IsDebugSelection();
1045110944
1045210945 boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
1045310946
....@@ -12922,6 +13415,11 @@
1292213415 cVector tmp2 = new cVector();
1292313416 boolean isMoving;
1292413417
13418
+ public cVector TargetLookAt()
13419
+ {
13420
+ return targetLookAt;
13421
+ }
13422
+
1292513423 class PingThread extends Thread
1292613424 {
1292713425 boolean jump;
....@@ -13653,7 +14151,7 @@
1365314151 SetMouseMode(modifiers);
1365414152 }
1365514153
13656
- theRenderer.keyPressed(key);
14154
+ Globals.theRenderer.keyPressed(key);
1365714155 }
1365814156
1365914157 int kompactbit = 4; // power bit
....@@ -13665,7 +14163,7 @@
1366514163 float SATPOW = 1; // 2; // 0.5f;
1366614164 float BRIPOW = 1; // 0.5f; // 0.5f;
1366714165
13668
- void keyPressed(int key)
14166
+ public void keyPressed(int key)
1366914167 {
1367014168 if (key >= '0' && key <= '5')
1367114169 clampbit = (key-'0');
....@@ -14102,6 +14600,7 @@
1410214600 }
1410314601 //System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
1410414602 }
14603
+
1410514604 static double OCCLUSIONBOOST = 1; // 0.5;
1410614605
1410714606 void keyReleased(int key, int modifiers)
....@@ -14113,7 +14612,7 @@
1411314612 }
1411414613 }
1411514614
14116
- protected void processKeyEvent(KeyEvent e)
14615
+ public void processKeyEvent(KeyEvent e)
1411714616 {
1411814617 switch (e.getID())
1411914618 {
....@@ -15772,7 +16271,6 @@
1577216271
1577316272 class AntialiasBuffer implements GLEventListener
1577416273 {
15775
-
1577616274 CameraPane parent = null;
1577716275
1577816276 AntialiasBuffer(CameraPane p)
....@@ -16165,7 +16663,7 @@
1616516663 }
1616616664 }
1616716665
16168
- static void DrawPoints(CameraPane cpane)
16666
+ static void DrawPoints(iCameraPane cpane)
1616916667 {
1617016668 for (int i=0; i<8; i++) // first and last are red
1617116669 {