blame | history | patch | commit | commitdiff
Normand Briere
2019-10-05 8768a855af9ccc482a9520ce708ef32e0e6e0e7d 
 ScriptNode.java
....@@ -268,7 +268,7 @@
268268         if (reader.line == null)
269269         {
270270 //            if (CameraPane.LIVE)
271
-//                CameraPane.theRenderer.ToggleLive();
271
+//                Globals.theRenderer.ToggleLive();
272272 //            Reset();
273273 //            
274274 //            try
....@@ -388,7 +388,7 @@
388388             {
389389                 System.err.println("LoadBVHFile = " + obj + "; name = " + iname + "; first frame = " + firstframe + "; last frame = " + lastframe);
390390         obj.blockloop = false; // to force crash right now                
391
-                GetRoot().editWindow.LoadBVHFile(iname, obj, false, force?firstframe:-1, lastframe);
391
+                GetRoot().GetWindow().LoadBVHFile(iname, obj, false, force?firstframe:-1, lastframe);
392392             }
393393             else
394394             {
....@@ -521,8 +521,8 @@
521521         
522522         if (command.equals("recompile"))
523523         {
524
-            assert (GetRoot() == CameraPane.theRenderer.object);
525
-            GetRoot().editWindow.Recompile();
524
+            // TODO assert (GetRoot() == Globals.theRenderer.object);
525
+            GetRoot().GetWindow().Recompile();
526526             return;
527527         }
528528         if (command.equals("resetframecount"))
....@@ -532,205 +532,205 @@
532532         }
533533         if (command.equals("deselect") || command.equals("unselect"))
534534         {
535
-            assert (GetRoot() == CameraPane.theRenderer.object);
536
-            GetRoot().editWindow.jTree.clearSelection();
535
+            // TODO assert (GetRoot() == Globals.theRenderer.object);
536
+            GetRoot().GetWindow().jTree.clearSelection();
537537             return;
538538         }
539539         if (command.equals("stoplive") || command.equals("liveoff"))
540540         {
541
-            if (CameraPane.isLIVE())
542
-                CameraPane.theRenderer.ToggleLive();
541
+            if (Globals.isLIVE())
542
+                Globals.theRenderer.ToggleLive();
543543             return;
544544         }
545545         if (command.equals("startlive") || command.equals("liveon"))
546546         {
547
-            if (!CameraPane.isLIVE())
548
-                CameraPane.theRenderer.ToggleLive();
547
+            if (!Globals.isLIVE())
548
+                Globals.theRenderer.ToggleLive();
549549             return;
550550         }
551551         if (command.equals("frustumon"))
552552         {
553553             if (!CameraPane.FRUSTUM)
554
-                CameraPane.theRenderer.ToggleFrustum();
554
+                Globals.theRenderer.ToggleFrustum();
555555             return;
556556         }
557557         if (command.equals("frustumoff"))
558558         {
559559             if (CameraPane.FRUSTUM)
560
-                CameraPane.theRenderer.ToggleFrustum();
560
+                Globals.theRenderer.ToggleFrustum();
561561             return;
562562         }
563563         if (command.equals("flipon"))
564564         {
565565             if (!CameraPane.IMAGEFLIP)
566
-                CameraPane.theRenderer.ToggleImageFlip();
566
+                Globals.theRenderer.ToggleImageFlip();
567567             return;
568568         }
569569         if (command.equals("flipoff"))
570570         {
571571             if (CameraPane.IMAGEFLIP)
572
-                CameraPane.theRenderer.ToggleImageFlip();
572
+                Globals.theRenderer.ToggleImageFlip();
573573             return;
574574         }
575575         if (command.equals("smoothon"))
576576         {
577577             if (!CameraPane.SMOOTHFOCUS)
578
-                CameraPane.theRenderer.ToggleSmoothFocus();
578
+                Globals.theRenderer.ToggleSmoothFocus();
579579             return;
580580         }
581581         if (command.equals("smoothoff"))
582582         {
583583             if (CameraPane.SMOOTHFOCUS)
584
-                CameraPane.theRenderer.ToggleSmoothFocus();
584
+                Globals.theRenderer.ToggleSmoothFocus();
585585             return;
586586         }
587587         if (command.equals("inertiaon"))
588588         {
589589             if (!CameraPane.INERTIA)
590
-                CameraPane.theRenderer.ToggleInertia();
590
+                Globals.theRenderer.ToggleInertia();
591591             return;
592592         }
593593         if (command.equals("inertiaoff"))
594594         {
595595             if (CameraPane.INERTIA)
596
-                CameraPane.theRenderer.ToggleInertia();
596
+                Globals.theRenderer.ToggleInertia();
597597             return;
598598         }
599599         if (command.equals("mocapon"))
600600         {
601601             if (!CameraPane.SPEAKERMOCAP)
602
-                CameraPane.theRenderer.ToggleSpeakerMocap();
602
+                Globals.theRenderer.ToggleSpeakerMocap();
603603             return;
604604         }
605605         if (command.equals("mocapoff"))
606606         {
607607             if (CameraPane.SPEAKERMOCAP)
608
-                CameraPane.theRenderer.ToggleSpeakerMocap();
608
+                Globals.theRenderer.ToggleSpeakerMocap();
609609             return;
610610         }
611611         if (command.equals("cameraon"))
612612         {
613613             if (!CameraPane.SPEAKERCAMERA)
614
-                CameraPane.theRenderer.ToggleSpeakerCamera();
614
+                Globals.theRenderer.ToggleSpeakerCamera();
615615             return;
616616         }
617617         if (command.equals("cameraoff"))
618618         {
619619             if (CameraPane.SPEAKERCAMERA)
620
-                CameraPane.theRenderer.ToggleSpeakerCamera();
620
+                Globals.theRenderer.ToggleSpeakerCamera();
621621             return;
622622         }
623623         if (command.equals("zoomon"))
624624         {
625625             if (!CameraPane.SPEAKERFOCUS)
626
-                CameraPane.theRenderer.ToggleSpeakerFocus();
626
+                Globals.theRenderer.ToggleSpeakerFocus();
627627             return;
628628         }
629629         if (command.equals("zoomoff"))
630630         {
631631             if (CameraPane.SPEAKERFOCUS)
632
-                CameraPane.theRenderer.ToggleSpeakerFocus();
632
+                Globals.theRenderer.ToggleSpeakerFocus();
633633             return;
634634         }
635635         if (command.equals("shadowon"))
636636         {
637637             if (!CameraPane.SHADOWTRACK)
638
-                CameraPane.theRenderer.ToggleShadowTrack();
638
+                Globals.theRenderer.ToggleShadowTrack();
639639             return;
640640         }
641641         if (command.equals("shadowoff"))
642642         {
643643             if (CameraPane.SHADOWTRACK)
644
-                CameraPane.theRenderer.ToggleShadowTrack();
644
+                Globals.theRenderer.ToggleShadowTrack();
645645             return;
646646         }
647647         if (command.equals("trackon"))
648648         {
649649             CameraPane.TRACK = false; // force selection to be used
650650             if (!CameraPane.TRACK)
651
-                CameraPane.theRenderer.ToggleTrack();
651
+                Globals.theRenderer.ToggleTrack();
652652             return;
653653         }
654654         if (command.equals("trackoff"))
655655         {
656656             if (CameraPane.TRACK)
657
-                CameraPane.theRenderer.ToggleTrack();
657
+                Globals.theRenderer.ToggleTrack();
658658             return;
659659         }
660660         if (command.equals("trackonceon"))
661661         {
662662             if (!CameraPane.TRACKONCE)
663
-                CameraPane.theRenderer.ToggleTrackOnce();
663
+                Globals.theRenderer.ToggleTrackOnce();
664664             return;
665665         }
666666         if (command.equals("trackonceoff"))
667667         {
668668             if (CameraPane.TRACKONCE)
669
-                CameraPane.theRenderer.ToggleTrackOnce();
669
+                Globals.theRenderer.ToggleTrackOnce();
670670             return;
671671         }
672672         if (command.equals("oeilon"))
673673         {
674674             if (!CameraPane.OEIL && !CameraPane.OEILONCE)
675
-                CameraPane.theRenderer.ToggleOeil();
675
+                Globals.theRenderer.ToggleOeil();
676676             return;
677677         }
678678         if (command.equals("oeiloff"))
679679         {
680680             if (CameraPane.OEIL && !CameraPane.OEILONCE)
681
-                CameraPane.theRenderer.ToggleOeil();
681
+                Globals.theRenderer.ToggleOeil();
682682             return;
683683         }
684684         
685685         if (command.equals("oeilonceon"))
686686         {
687687             if (!CameraPane.OEILONCE)
688
-                CameraPane.theRenderer.ToggleOeilOnce();
688
+                Globals.theRenderer.ToggleOeilOnce();
689689             return;
690690         }
691691         if (command.equals("oeilonceoff"))
692692         {
693693             if (CameraPane.OEILONCE)
694
-                CameraPane.theRenderer.ToggleOeilOnce();
694
+                Globals.theRenderer.ToggleOeilOnce();
695695             return;
696696         }
697697         
698698         if (command.equals("faston"))
699699         {
700700             if (!CameraPane.FAST)
701
-                CameraPane.theRenderer.ToggleFast();
701
+                Globals.theRenderer.ToggleFast();
702702             return;
703703         }
704704         if (command.equals("fastoff"))
705705         {
706706             if (CameraPane.FAST)
707
-                CameraPane.theRenderer.ToggleFast();
707
+                Globals.theRenderer.ToggleFast();
708708             return;
709709         }
710710         
711711         if (command.equals("slowposeon"))
712712         {
713713             if (!CameraPane.SLOWPOSE)
714
-                CameraPane.theRenderer.ToggleSlowPose();
714
+                Globals.theRenderer.ToggleSlowPose();
715715             return;
716716         }
717717         if (command.equals("slowposeoff"))
718718         {
719719             if (CameraPane.SLOWPOSE)
720
-                CameraPane.theRenderer.ToggleSlowPose();
720
+                Globals.theRenderer.ToggleSlowPose();
721721             return;
722722         }
723723         
724724         if (command.equals("supporton"))
725725         {
726726             if (!CameraPane.SUPPORT)
727
-                CameraPane.theRenderer.ToggleSupport();
727
+                Globals.theRenderer.ToggleSupport();
728728             return;
729729         }
730730         if (command.equals("supportoff"))
731731         {
732732             if (CameraPane.SUPPORT)
733
-                CameraPane.theRenderer.ToggleSupport();
733
+                Globals.theRenderer.ToggleSupport();
734734             return;
735735         }
736736         
....@@ -756,13 +756,13 @@
756756         if (command.equals("aborton"))
757757         {
758758             if (!CameraPane.ABORTMODE)
759
-                CameraPane.theRenderer.ToggleAbort();
759
+                Globals.theRenderer.ToggleAbort();
760760             return;
761761         }
762762         if (command.equals("abortoff"))
763763         {
764764             if (CameraPane.ABORTMODE)
765
-                CameraPane.theRenderer.ToggleAbort();
765
+                Globals.theRenderer.ToggleAbort();
766766             return;
767767         }
768768         
....@@ -770,8 +770,8 @@
770770         {
771771             if (!CameraPane.BOXMODE)
772772             {
773
-                CameraPane.theRenderer.ToggleBoxMode();
774
-                GetRoot().editWindow.Recompile();
773
+                Globals.theRenderer.ToggleBoxMode();
774
+                GetRoot().GetWindow().Recompile();
775775             }
776776             return;
777777         }
....@@ -779,8 +779,8 @@
779779         {
780780             if (CameraPane.BOXMODE)
781781             {
782
-                CameraPane.theRenderer.ToggleBoxMode();
783
-                GetRoot().editWindow.Recompile();
782
+                Globals.theRenderer.ToggleBoxMode();
783
+                GetRoot().GetWindow().Recompile();
784784             }
785785             return;
786786         }
....@@ -800,7 +800,7 @@
800800         {
801801             if (!CameraPane.textureon)
802802             {
803
-                CameraPane.theRenderer.ToggleTexture();
803
+                Globals.theRenderer.ToggleTexture();
804804             }
805805             return;
806806         }
....@@ -808,7 +808,7 @@
808808         {
809809             if (CameraPane.textureon)
810810             {
811
-                CameraPane.theRenderer.ToggleTexture();
811
+                Globals.theRenderer.ToggleTexture();
812812             }
813813             return;
814814         }
....@@ -972,37 +972,37 @@
972972         
973973         if (command.equals("targetx"))
974974         {
975
-            ((Mocap) object).targetx = Float.parseFloat(strs[index+2]);
975
+            ((Mocap) object).targetdirx = Float.parseFloat(strs[index+2]);
976976             return;
977977         }
978978         
979979         if (command.equals("targetz"))
980980         {
981
-            ((Mocap) object).targetz = Float.parseFloat(strs[index+2]);
981
+            ((Mocap) object).targetdirz = Float.parseFloat(strs[index+2]);
982982             return;
983983         }
984984         
985985         if (command.equals("goalx"))
986986         {
987
-            ((Mocap) object).goalx = Float.parseFloat(strs[index+2]);
987
+            ((Mocap) object).goalposx = Float.parseFloat(strs[index+2]);
988988             return;
989989         }
990990         
991991         if (command.equals("goalz"))
992992         {
993
-            ((Mocap) object).goalz = Float.parseFloat(strs[index+2]);
993
+            ((Mocap) object).goalposz = Float.parseFloat(strs[index+2]);
994994             return;
995995         }
996996         
997997         if (command.equals("fromto"))
998998         {
999999             cVector from = new cVector(Float.parseFloat(strs[index+2]),
1000
-                                        Float.parseFloat(strs[index+3]),
1001
-                                        Float.parseFloat(strs[index+4]));
1000
+                                        0, // Float.parseFloat(strs[index+3]),
1001
+                                        Float.parseFloat(strs[index+3]));
10021002             
1003
-            cVector to = new cVector(Float.parseFloat(strs[index+5]),
1004
-                                        Float.parseFloat(strs[index+6]),
1005
-                                        Float.parseFloat(strs[index+7]));
1003
+            cVector to = new cVector(Float.parseFloat(strs[index+4]),
1004
+                                        0, // Float.parseFloat(strs[index+6]),
1005
+                                        Float.parseFloat(strs[index+5]));
10061006 
10071007             ((Mocap) object).AddFromTo(from, to);
10081008             return;
....@@ -1155,7 +1155,7 @@
11551155                         boolean success = false;
11561156 
11571157                         if (cam instanceof Camera) // ?
1158
-                            success = CameraPane.theRenderer.SetCamera((Camera) cam);
1158
+                            success = Globals.theRenderer.SetCamera((Camera) cam, true);
11591159 
11601160                         if (success)
11611161                         {
....@@ -1172,7 +1172,7 @@
11721172                     Object3D root = GetObject(rootobject);
11731173 
11741174                     System.err.println("ZOOM: root = " + root + "; rootobject = " + rootobject);
1175
-                    GetRoot().editWindow.objEditor.ScreenFit(root, false);
1175
+                    GetRoot().GetWindow().objEditor.ScreenFit(root, false);
11761176                     CameraPane.trackedobject = root;
11771177                     CameraPane.ABORTED = true;
11781178 System.err.println("SET ABORTED (SPEAKERFOCUS) ");
....@@ -1182,14 +1182,14 @@
11821182                 if (CameraPane.SPEAKERMOCAP)
11831183                 {
11841184                     // switch to talk mocap
1185
-                    String talkmocap = //aliases.get(
1186
-                            speakername + "talk"//)
1185
+                    String talkmocap = aliases.get(
1186
+                            speakername + "talk")
11871187                             ;
11881188                 //    while (aliases.get(talkmocap) != null)
11891189                 //        talkmocap = aliases.get(talkmocap);
11901190 
1191
-                    String speakermocap = //aliases.get(
1192
-                            speakername + "mocap"//)
1191
+                    String speakermocap = aliases.get(
1192
+                            speakername + "mocap")
11931193                             ;
11941194                     
11951195                     String beginmocap = speakername + "talkbegin";
....@@ -1235,8 +1235,8 @@
12351235         }
12361236         if (command.equals("setsupport"))
12371237         {
1238
-            boolean random = CameraPane.RANDOM;
1239
-            CameraPane.RANDOM = false; // parse all random nodes
1238
+            boolean random = CameraPane.SWITCH;
1239
+            CameraPane.SWITCH = false; // parse all random nodes
12401240             if (object.support instanceof Merge)
12411241             {
12421242                 ((Merge)object.support).renderme();
....@@ -1245,7 +1245,7 @@
12451245             object.linkVerticesThis(null);
12461246             object.linkVerticesThis(GetObject(GetAlias(strs[index+2])));
12471247       //      object.setMasterThis(content); // should be identity
1248
-            CameraPane.RANDOM = random;
1248
+            CameraPane.SWITCH = random;
12491249             return;
12501250         }
12511251         if (command.equals("setchild"))
....@@ -1462,9 +1462,9 @@
14621462         }
14631463         if (command.equals("select"))
14641464         {
1465
-            assert (GetRoot() == CameraPane.theRenderer.object);
1465
+            // TODO assert (GetRoot() == Globals.theRenderer.object);
14661466             String path = GetAlias(strs[index+1]);
1467
-            GetRoot().editWindow.Select(GetRoot().GetTreePath(path.split("/"), 0), false, false);
1467
+            GetRoot().GetWindow().Select(GetRoot().GetTreePath(path.split("/"), 0), false, false);
14681468             return;
14691469         }
14701470         if (command.equals("mocap"))
....@@ -1558,7 +1558,7 @@
15581558             boolean success = false;
15591559             
15601560             if (object instanceof Camera) // ?
1561
-                success = CameraPane.theRenderer.SetCamera((Camera) object);
1561
+                success = Globals.theRenderer.SetCamera((Camera) object, true);
15621562             
15631563             if (success && CameraPane.ABORTMODE)
15641564             {
....@@ -1785,7 +1785,7 @@
17851785         return live;
17861786     }
17871787     
1788
-    void DrawNode(CameraPane display, Object3D /*Composite*/ root, boolean selected)
1788
+    void DrawNode(iCameraPane display, Object3D /*Composite*/ root, boolean selected)
17891789     {
17901790         if (CameraPane.ABORTED)
17911791         {
....@@ -1793,7 +1793,7 @@
17931793             return;
17941794         }
17951795         
1796
-        if (isLive() && display.isLIVE() && display.drawMode == display.SHADOW)
1796
+        if (isLive() && Globals.isLIVE() && display.DrawMode() == display.SHADOW)
17971797         {
17981798             if (reader == null)
17991799                 Init();
....@@ -1821,9 +1821,9 @@
18211821         return e;
18221822     }
18231823 
1824
-    protected void deepCopySelf(Object3D other)
1824
+    protected void deepCopyNode(Object3D other)
18251825     {
1826
-        super.deepCopySelf(other);
1826
+        super.deepCopyNode(other);
18271827 //        FrameSelector bp = (FrameSelector)other;
18281828 //        bp.frame = (int)(Math.random()*(getNumFrames() - mocap.offset));
18291829     }