blame | history | patch | commit | commitdiff
Normand Briere
2019-06-24 c67da2e5d8655704601d6d06e8bc60aabe212253 
 GroupEditor.java
....@@ -176,7 +176,6 @@
176176 		copyItem.addActionListener(this);
177177 		pasteItem = menu.add(new MenuItem("Paste"));
178178 		pasteItem.addActionListener(this);
179
-		menu.add("-");
180179                 
181180 		menu.add("-");
182181 		pasteIntoItem = menu.add(new MenuItem("Paste into"));
....@@ -246,7 +245,7 @@
246245 
247246                 cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248247                 toggleDebugItem.addItemListener(this);
249
-                toggleDebugItem.setState(CameraPane.DEBUG);
248
+                toggleDebugItem.setState(Globals.DEBUG);
250249 
251250                 cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252251                 toggleFrustumItem.addItemListener(this);
....@@ -369,11 +368,11 @@
369368 		billboardItem.addActionListener(this);
370369 		csgItem = menu.add(new MenuItem("CSG"));
371370 		csgItem.addActionListener(this);
372
-                shadowXItem = menu.add(new MenuItem("Shadow X"));
371
+                shadowXItem = menu.add(new MenuItem("Shadow Red"));
373372 		shadowXItem.addActionListener(this);
374
-                shadowYItem = menu.add(new MenuItem("Shadow Y"));
373
+                shadowYItem = menu.add(new MenuItem("Shadow Green"));
375374 		shadowYItem.addActionListener(this);
376
-                shadowZItem = menu.add(new MenuItem("Shadow Z"));
375
+                shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377376 		shadowZItem.addActionListener(this);
378377         if (Globals.ADVANCED)
379378         {
....@@ -470,6 +469,14 @@
470469 		markleavesItem.addActionListener(this);
471470 		unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
472471 		unmarkleavesItem.addActionListener(this);
472
+		rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
473
+		rewindleavesItem.addActionListener(this);
474
+		unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
475
+		unrewindleavesItem.addActionListener(this);
476
+		randomleavesItem = menu.add(new MenuItem("Random Leaves"));
477
+		randomleavesItem.addActionListener(this);
478
+		unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
479
+		unrandomleavesItem.addActionListener(this);
473480 		menu.add("-");
474481 		flipVItem = menu.add(new MenuItem("Flip V"));
475482 		flipVItem.addActionListener(this);
....@@ -527,6 +534,18 @@
527534 	
528535 	void SetupUI2(ObjEditor oe)
529536 	{
537
+            // June 2019
538
+            if (oe == null)
539
+            {
540
+                //super.SetupUI2(this);
541
+                //return;
542
+            }
543
+            
544
+            if (copy != group)
545
+            {
546
+                //super.SetupUI2(this);
547
+            }
548
+            
530549             //new Exception().printStackTrace();
531550                 
532551         oe.radioPanel = new JPanel(new GridBagLayout());
....@@ -557,15 +576,27 @@
557576          */
558577                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
559578                 
560
-		oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
579
+		//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580
+                //minButton.setToolTipText("Minimize window");
581
+		//minButton.addActionListener(this);
582
+                
583
+		oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
584
+                maxButton.setToolTipText("Maximize window");
585
+		maxButton.addActionListener(this);
586
+                
587
+		oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588
+                fullButton.setToolTipText("Full-screen window");
589
+		fullButton.addActionListener(this);
590
+                
591
+		oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561592                 undoButton.setToolTipText("Undo changes");
562593 		undoButton.addActionListener(this);
563594                 
564
-		oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
595
+		oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565596                 redoButton.setToolTipText("Redo changes");
566597 		redoButton.addActionListener(this);
567598                 
568
-		oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
599
+		oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569600                 saveButton.setToolTipText("Save changes");
570601 		saveButton.addActionListener(this);
571602                 
....@@ -573,7 +604,7 @@
573604                 liveCB.setToolTipText("Enable animation");
574605                                 liveCB.addItemListener(this);
575606 
576
-		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
607
+		oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577608                 oneStepButton.setToolTipText("Animate one step forward");
578609 		oneStepButton.addActionListener(this);
579610                 
....@@ -581,7 +612,7 @@
581612                 fastCB.setToolTipText("Fast mode");
582613                                 fastCB.addItemListener(this);
583614                                 
584
-                oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
615
+                oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
585616                 trackCB.setToolTipText("Enable tracking");
586617                                 trackCB.addItemListener(this);
587618 
....@@ -605,19 +636,19 @@
605636                 
606637 		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
607638                 
608
-		oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
639
+		oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609640                 twoButton.setToolTipText("Show center view only");
610641 		twoButton.addActionListener(this);
611
-		oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642
+		oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612643 		fourButton.addActionListener(this);
613644                 fourButton.setToolTipText("Show left panel only");
614
-		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
645
+		oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
615646                 sixButton.setToolTipText("2-column layout left");
616647 		sixButton.addActionListener(this);
617
-		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
648
+		oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
618649                 threeButton.setToolTipText("2-column layout right");
619650 		threeButton.addActionListener(this);
620
-		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
651
+		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621652                 sevenButton.setToolTipText("3-column layout");
622653 		sevenButton.addActionListener(this);
623654                 //
....@@ -632,32 +663,30 @@
632663 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
633664 		//clearButton.addActionListener(this);
634665                         
635
-                cGridBag commandsPanel = new cGridBag();
636
-                
637
-		commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
666
+		editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638667                 editButton.setToolTipText("Edit selection");
639668 		editButton.addActionListener(this);
640669 
641
-		commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670
+		editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642671                 uneditButton.setToolTipText("Unedit selection");
643672 		uneditButton.addActionListener(this);
644673 
645
-		commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
674
+		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
646675                 allParamsButton.setToolTipText("Edit all params");
647676 		allParamsButton.addActionListener(this);
648677 
649
-		commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
678
+		editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650679                 clearPanelButton.setToolTipText("Clear edit panel");
651680 		clearPanelButton.addActionListener(this);
652681 
653
-		commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682
+		editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654683                 unselectButton.setToolTipText("Unselect");
655684 		unselectButton.addActionListener(this);
656685 
657
-                commandsPanel.preferredHeight = 1;
686
+                editCommandsPanel.preferredHeight = 1;
658687                 
659
-                oe.treePanel.add(commandsPanel);
660
-                oe.treePanel.Return();
688
+//                oe.treePanel.add(commandsPanel);
689
+//                oe.treePanel.Return();
661690                 
662691 //		oe.aConstraints.gridx += 1;
663692 //		oe.aConstraints.weighty = 0;
....@@ -779,11 +808,19 @@
779808 //                debugCB.addItemListener(this);
780809 
781810                 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
811
+                oeilCB.setToolTipText("Move camera when tracking target");
782812                                 oeilCB.addItemListener(this);
783813 
814
+                panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
815
+                shadowCB.setToolTipText("Compute shadows when live");
816
+                                shadowCB.addItemListener(this);
817
+
818
+            if (Globals.ADVANCED)
819
+            {
784820                 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
785821                 lookAtCB.setToolTipText("Look-at target");
786822                                 lookAtCB.addItemListener(this);
823
+            }
787824                 
788825         }
789826                                 
....@@ -798,6 +835,14 @@
798835         void EditObject(Object3D obj)
799836         {
800837             cRadio radioButton = new cRadio(obj.name);
838
+            
839
+            // Patch to avoid bug with transparency.
840
+            radioButton.hadMaterial = obj.material != null;
841
+            if (!radioButton.hadMaterial)
842
+            {
843
+                obj.material = new cMaterial();
844
+            }
845
+            
801846             radioButton.SetObject(obj);
802847             radioButton.layout = sevenButton;
803848             radioButton.SetCamera(cameraView.renderCamera, false);
....@@ -809,6 +854,8 @@
809854         
810855         void SetupViews(ObjEditor oe)
811856         {
857
+                    theFrame = this;
858
+                    
812859             oe.SetupViews();
813860             
814861 		System.out.println("SetupViews");
....@@ -832,7 +879,9 @@
832879         JCheckBox speakerCameraCB;
833880         JCheckBox speakerFocusCB;
834881         JCheckBox debugCB;
882
+        
835883         JCheckBox oeilCB;
884
+        JCheckBox shadowCB;
836885         JCheckBox lookAtCB;
837886         
838887 //        static int COLOR = 1;
....@@ -935,6 +984,10 @@
935984             else if(e.getSource() == oeilCB)
936985             {
937986                 cameraView.ToggleOeil();
987
+            }
988
+            else if(e.getSource() == shadowCB)
989
+            {
990
+                Globals.COMPUTESHADOWWHENLIVE ^= true;
938991             }
939992             else if(e.getSource() == lookAtCB)
940993             {
....@@ -1420,6 +1473,7 @@
14201473             shadow.material = new cMaterial(obj.material);
14211474             shadow.material.diffuse = 0.0001f;
14221475             shadow.material.specular = 0.0001f;
1476
+            //shadow.projectedVertices[1].x = 300;
14231477             
14241478             makeSomething(shadow);
14251479         }
....@@ -1969,6 +2023,18 @@
19692023 		if (source == dumpItem)
19702024 		{
19712025                     DumpObject();
2026
+		} else
2027
+		if (source == minButton)
2028
+		{
2029
+			Minimize();
2030
+		} else
2031
+		if (source == maxButton)
2032
+		{
2033
+			Maximize();
2034
+		} else
2035
+		if (source == fullButton)
2036
+		{
2037
+			ToggleFullScreen();
19722038 		} else
19732039 		if (source == undoButton)
19742040 		{
....@@ -2609,6 +2675,22 @@
26092675                 {
26102676 			MarkLeaves(false);
26112677 		} else
2678
+		if (source == rewindleavesItem)
2679
+                {
2680
+			RewindLeaves(true);
2681
+		} else
2682
+		if (source == unrewindleavesItem)
2683
+                {
2684
+			RewindLeaves(false);
2685
+		} else
2686
+		if (source == randomleavesItem)
2687
+                {
2688
+			RandomLeaves(true);
2689
+		} else
2690
+		if (source == unrandomleavesItem)
2691
+                {
2692
+			RandomLeaves(false);
2693
+		} else
26122694 		if (source == flipVItem)
26132695                 {
26142696 			FlipV(true);
....@@ -2875,6 +2957,24 @@
28752957                     bigThree.ClearUI();
28762958                     bigThree.add(centralPanel);
28772959                     bigThree.FlushUI();
2960
+                    
2961
+                    cameraView.requestFocusInWindow();
2962
+                    
2963
+//                    refreshContents(true);
2964
+//                    
2965
+//                    try
2966
+//                    {
2967
+//                        java.awt.Robot bot = new java.awt.Robot();
2968
+//                        int mask = InputEvent.BUTTON1_MASK;
2969
+//                        bot.mouseMove(100, 100);           
2970
+//                        bot.mousePress(mask);     
2971
+//                        bot.mouseRelease(mask);                    
2972
+//                    }
2973
+//                    catch (Exception e)
2974
+//                    {
2975
+//                        
2976
+//                    }
2977
+                    
28782978                 } else
28792979 		if (source == threeButton)
28802980 		{
....@@ -2911,6 +3011,8 @@
29113011                     bigThree.add(centralPanel);
29123012                     bigThree.add(XYZPanel);
29133013                     bigThree.FlushUI();
3014
+                    
3015
+                    cameraView.requestFocusInWindow();
29143016                 } else
29153017 		if (source == fourButton)
29163018 		{
....@@ -2946,6 +3048,8 @@
29463048                     bigThree.ClearUI();
29473049                     bigThree.add(scenePanel);
29483050                     bigThree.FlushUI();
3051
+                    
3052
+                    cameraView.requestFocusInWindow();
29493053                 } else
29503054 		if (source == sixButton)
29513055 		{
....@@ -2982,6 +3086,8 @@
29823086                     bigThree.add(scenePanel);
29833087                     bigThree.add(centralPanel);
29843088                     bigThree.FlushUI();
3089
+                    
3090
+                    cameraView.requestFocusInWindow();
29853091                 } else
29863092 		if (source == sevenButton)
29873093 		{
....@@ -3019,6 +3125,8 @@
30193125                     bigThree.add(centralPanel);
30203126                     bigThree.add(XYZPanel);
30213127                     bigThree.FlushUI();
3128
+                    
3129
+                    cameraView.requestFocusInWindow();
30223130                 } else
30233131 		if (source == rootButton)
30243132 		{
....@@ -3030,6 +3138,7 @@
30303138                                 EditObject(obj);
30313139                     }
30323140 
3141
+                    cameraView.requestFocusInWindow();
30333142                     refreshContents(true);
30343143 		} else
30353144 		if (source == closeButton)
....@@ -3039,8 +3148,14 @@
30393148                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
30403149                     {
30413150                             ab = (cRadio)e.nextElement();
3042
-                            if(ab.getModel().isSelected() && ab.GetObject() != client)
3151
+                            if (ab.getModel().isSelected() && ab.GetObject() != client)
30433152                             {
3153
+                                // Patch to avoid bug with transparency.
3154
+                                if (!ab.hadMaterial)
3155
+                                {
3156
+                                    ab.object.material = null;
3157
+                                }
3158
+                                
30443159                                 buttonGroup.remove(ab);
30453160                                 radioPanel.remove(ab);
30463161                                 
....@@ -3051,6 +3166,8 @@
30513166                                 break;
30523167                             }
30533168                     }
3169
+                    
3170
+                    cameraView.requestFocusInWindow();
30543171                     refreshContents(true);
30553172 		} else
30563173 		if (source == editItem || source == editButton)
....@@ -3155,7 +3272,7 @@
31553272                     }
31563273                     
31573274 // fix "+" issue
3158
-                    group.editWindow = this;
3275
+                    //group.editWindow = this;
31593276                     
31603277                     /*
31613278                     currentLayout = radio.layout;
....@@ -3168,6 +3285,8 @@
31683285                     //group.parent = null; // ROOT
31693286                     //group.attributes = -1;
31703287                     ResetModel();
3288
+                    
3289
+                    cameraView.requestFocusInWindow();
31713290                     refreshContents(true);
31723291                 } else if (event.getSource() == editCameraItem)
31733292                 {
....@@ -3191,7 +3310,6 @@
31913310 	}
31923311         
31933312         boolean useclient = false;
3194
-        cRadio radio;
31953313         
31963314         void ToggleRoot()
31973315         {
....@@ -4143,6 +4261,18 @@
41434261 	void MarkLeaves(boolean hide)
41444262 	{
41454263 		group.selection.MarkLeaves(hide);
4264
+		refreshContents();
4265
+	}
4266
+	
4267
+	void RewindLeaves(boolean hide)
4268
+	{
4269
+		group.selection.RewindLeaves(hide);
4270
+		refreshContents();
4271
+	}
4272
+	
4273
+	void RandomLeaves(boolean hide)
4274
+	{
4275
+		group.selection.RandomLeaves(hide);
41464276 		refreshContents();
41474277 	}
41484278 	
....@@ -5183,9 +5313,12 @@
51835313 	cButton clearpanelButton;
51845314 	cButton unselectButton;
51855315 	
5186
-	cButton saveButton;
5316
+	cButton minButton;
5317
+	cButton maxButton;
5318
+	cButton fullButton;
51875319 	cButton undoButton;
51885320 	cButton redoButton;
5321
+	cButton saveButton;
51895322 	cButton oneStepButton;
51905323         
51915324 	cButton screenfitButton;
....@@ -5198,14 +5331,6 @@
51985331 	cButton closeButton;
51995332 
52005333 	cButton setsupportButton;
5201
-        
5202
-	cButton twoButton;
5203
-	cButton sixButton;
5204
-	cButton threeButton;
5205
-	cButton sevenButton;
5206
-	cButton fourButton; // full panel
5207
-	cButton oneButton; // full XYZ
5208
-        //cButton currentLayout;
52095334         
52105335 	//
52115336         //Composite
....@@ -5283,6 +5408,10 @@
52835408 	private MenuItem showleavesItem;
52845409 	private MenuItem markleavesItem;
52855410 	private MenuItem unmarkleavesItem;
5411
+	private MenuItem rewindleavesItem;
5412
+	private MenuItem unrewindleavesItem;
5413
+	private MenuItem randomleavesItem;
5414
+	private MenuItem unrandomleavesItem;
52865415         
52875416 	private MenuItem flipVItem;
52885417 	private MenuItem unflipVItem;