blame | history | patch | commit | commitdiff
Normand Briere
2019-06-23 f1382bc839a74ef1d1534c61ea94e53cf54716df 
 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;
....@@ -809,6 +838,8 @@
809838         
810839         void SetupViews(ObjEditor oe)
811840         {
841
+                    theFrame = this;
842
+                    
812843             oe.SetupViews();
813844             
814845 		System.out.println("SetupViews");
....@@ -871,6 +902,7 @@
871902             } else if(e.getSource() == liveCB)
872903             {
873904                 cameraView.ToggleLive();
905
+                refreshContents(false);
874906             }
875907             else if(e.getSource() == supportCB)
876908             {
....@@ -1278,7 +1310,7 @@
12781310 		memoryItem.addActionListener(this);
12791311 		menu.add(analyzeItem = new MenuItem("Analyze"));
12801312 		analyzeItem.addActionListener(this);
1281
-		menu.add(dumpItem = new MenuItem("Dump"));
1313
+		menu.add(dumpItem = new MenuItem("Print"));
12821314 		dumpItem.addActionListener(this);
12831315 //		menu.add(pathItem = new MenuItem("From-to path"));
12841316 //		pathItem.addActionListener(this);
....@@ -1419,6 +1451,7 @@
14191451             shadow.material = new cMaterial(obj.material);
14201452             shadow.material.diffuse = 0.0001f;
14211453             shadow.material.specular = 0.0001f;
1454
+            //shadow.projectedVertices[1].x = 300;
14221455             
14231456             makeSomething(shadow);
14241457         }
....@@ -1968,6 +2001,18 @@
19682001 		if (source == dumpItem)
19692002 		{
19702003                     DumpObject();
2004
+		} else
2005
+		if (source == minButton)
2006
+		{
2007
+			Minimize();
2008
+		} else
2009
+		if (source == maxButton)
2010
+		{
2011
+			Maximize();
2012
+		} else
2013
+		if (source == fullButton)
2014
+		{
2015
+			ToggleFullScreen();
19712016 		} else
19722017 		if (source == undoButton)
19732018 		{
....@@ -2542,7 +2587,7 @@
25422587 		} else
25432588 		if (source == genNormalsMESHItem)
25442589                 {
2545
-			GenNormals(true); // TODO
2590
+			GenNormalsMESH();
25462591 		} else
25472592 		if (source == genNormalsORGANItem)
25482593                 {
....@@ -2607,6 +2652,22 @@
26072652 		if (source == unmarkleavesItem)
26082653                 {
26092654 			MarkLeaves(false);
2655
+		} else
2656
+		if (source == rewindleavesItem)
2657
+                {
2658
+			RewindLeaves(true);
2659
+		} else
2660
+		if (source == unrewindleavesItem)
2661
+                {
2662
+			RewindLeaves(false);
2663
+		} else
2664
+		if (source == randomleavesItem)
2665
+                {
2666
+			RandomLeaves(true);
2667
+		} else
2668
+		if (source == unrandomleavesItem)
2669
+                {
2670
+			RandomLeaves(false);
26102671 		} else
26112672 		if (source == flipVItem)
26122673                 {
....@@ -2874,6 +2935,24 @@
28742935                     bigThree.ClearUI();
28752936                     bigThree.add(centralPanel);
28762937                     bigThree.FlushUI();
2938
+                    
2939
+                    cameraView.requestFocusInWindow();
2940
+                    
2941
+//                    refreshContents(true);
2942
+//                    
2943
+//                    try
2944
+//                    {
2945
+//                        java.awt.Robot bot = new java.awt.Robot();
2946
+//                        int mask = InputEvent.BUTTON1_MASK;
2947
+//                        bot.mouseMove(100, 100);           
2948
+//                        bot.mousePress(mask);     
2949
+//                        bot.mouseRelease(mask);                    
2950
+//                    }
2951
+//                    catch (Exception e)
2952
+//                    {
2953
+//                        
2954
+//                    }
2955
+                    
28772956                 } else
28782957 		if (source == threeButton)
28792958 		{
....@@ -2910,6 +2989,8 @@
29102989                     bigThree.add(centralPanel);
29112990                     bigThree.add(XYZPanel);
29122991                     bigThree.FlushUI();
2992
+                    
2993
+                    cameraView.requestFocusInWindow();
29132994                 } else
29142995 		if (source == fourButton)
29152996 		{
....@@ -2945,6 +3026,8 @@
29453026                     bigThree.ClearUI();
29463027                     bigThree.add(scenePanel);
29473028                     bigThree.FlushUI();
3029
+                    
3030
+                    cameraView.requestFocusInWindow();
29483031                 } else
29493032 		if (source == sixButton)
29503033 		{
....@@ -2981,6 +3064,8 @@
29813064                     bigThree.add(scenePanel);
29823065                     bigThree.add(centralPanel);
29833066                     bigThree.FlushUI();
3067
+                    
3068
+                    cameraView.requestFocusInWindow();
29843069                 } else
29853070 		if (source == sevenButton)
29863071 		{
....@@ -3018,6 +3103,8 @@
30183103                     bigThree.add(centralPanel);
30193104                     bigThree.add(XYZPanel);
30203105                     bigThree.FlushUI();
3106
+                    
3107
+                    cameraView.requestFocusInWindow();
30213108                 } else
30223109 		if (source == rootButton)
30233110 		{
....@@ -3029,6 +3116,7 @@
30293116                                 EditObject(obj);
30303117                     }
30313118 
3119
+                    cameraView.requestFocusInWindow();
30323120                     refreshContents(true);
30333121 		} else
30343122 		if (source == closeButton)
....@@ -3050,6 +3138,8 @@
30503138                                 break;
30513139                             }
30523140                     }
3141
+                    
3142
+                    cameraView.requestFocusInWindow();
30533143                     refreshContents(true);
30543144 		} else
30553145 		if (source == editItem || source == editButton)
....@@ -3154,7 +3244,7 @@
31543244                     }
31553245                     
31563246 // fix "+" issue
3157
-                    group.editWindow = this;
3247
+                    //group.editWindow = this;
31583248                     
31593249                     /*
31603250                     currentLayout = radio.layout;
....@@ -3167,6 +3257,8 @@
31673257                     //group.parent = null; // ROOT
31683258                     //group.attributes = -1;
31693259                     ResetModel();
3260
+                    
3261
+                    cameraView.requestFocusInWindow();
31703262                     refreshContents(true);
31713263                 } else if (event.getSource() == editCameraItem)
31723264                 {
....@@ -3190,7 +3282,6 @@
31903282 	}
31913283         
31923284         boolean useclient = false;
3193
-        cRadio radio;
31943285         
31953286         void ToggleRoot()
31963287         {
....@@ -3511,6 +3602,13 @@
35113602 	void GenNormals(boolean crease)
35123603 	{
35133604 		group.GenNormalsS(crease);
3605
+		
3606
+		refreshContents();
3607
+	}
3608
+	
3609
+	void GenNormalsMESH()
3610
+	{
3611
+		group.GenNormalsMeshS();
35143612 		
35153613 		refreshContents();
35163614 	}
....@@ -4138,6 +4236,18 @@
41384236 		refreshContents();
41394237 	}
41404238 	
4239
+	void RewindLeaves(boolean hide)
4240
+	{
4241
+		group.selection.RewindLeaves(hide);
4242
+		refreshContents();
4243
+	}
4244
+	
4245
+	void RandomLeaves(boolean hide)
4246
+	{
4247
+		group.selection.RandomLeaves(hide);
4248
+		refreshContents();
4249
+	}
4250
+	
41414251 	void SetTexRes(int tr)
41424252 	{
41434253 		group.selection.SetTexRes(tr);
....@@ -4313,7 +4423,6 @@
43134423 			//case 702: // Event.LIST_DESELECT
43144424 			group.deselectAll();
43154425 			TreePath tps[] = objEditor.jTree.getSelectionPaths();
4316
-			objEditor.ClearInfo(); // .GetMaterial());
43174426 			if (tps != null)
43184427 			{
43194428 				for (int i=0; i < tps.length; i++)
....@@ -4322,10 +4431,8 @@
43224431 					
43234432 					//if (child.parent != null)
43244433 						//child.parent.addSelectee(child);
4434
+                    objEditor.SetMaterial(child);
43254435 					group.addSelectee(child);
4326
-					objEditor.SetMaterial(child); // .GetMaterial());
4327
-					objEditor.AddInfo(child, this, true); // .GetMaterial());
4328
-            System.err.println("info : " + child.GetPath());
43294436 				}
43304437 			}
43314438 //			else
....@@ -4335,8 +4442,6 @@
43354442 //            System.err.println("info : " + group.GetPath());
43364443 //                        }
43374444 			
4338
-                        objEditor.SetText(); // jan 2014
4339
-                        
43404445 			if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
43414446 				CameraPane.flash = true;
43424447                         
....@@ -4360,6 +4465,26 @@
43604465 		
43614466 		freezemodel = false;
43624467 	}
4468
+        
4469
+        void refreshContents(boolean cp)
4470
+        {
4471
+            if (!Globals.MOUSEDRAGGED)
4472
+            {
4473
+                objEditor.ClearInfo(); // .GetMaterial());
4474
+
4475
+                for (int i=0; i < group.selection.Size(); i++)
4476
+                {
4477
+                    Object3D child = (Object3D) group.selection.get(i);
4478
+
4479
+                    objEditor.AddInfo(child, this, true);
4480
+    System.err.println("info : " + child.GetPath());
4481
+                }
4482
+
4483
+                objEditor.SetText(); // jan 2014
4484
+            }
4485
+                        
4486
+            super.refreshContents(cp);
4487
+        }
43634488 	
43644489 	void linkSomething(Object3D thing)
43654490 	{
....@@ -5160,9 +5285,12 @@
51605285 	cButton clearpanelButton;
51615286 	cButton unselectButton;
51625287 	
5163
-	cButton saveButton;
5288
+	cButton minButton;
5289
+	cButton maxButton;
5290
+	cButton fullButton;
51645291 	cButton undoButton;
51655292 	cButton redoButton;
5293
+	cButton saveButton;
51665294 	cButton oneStepButton;
51675295         
51685296 	cButton screenfitButton;
....@@ -5175,14 +5303,6 @@
51755303 	cButton closeButton;
51765304 
51775305 	cButton setsupportButton;
5178
-        
5179
-	cButton twoButton;
5180
-	cButton sixButton;
5181
-	cButton threeButton;
5182
-	cButton sevenButton;
5183
-	cButton fourButton; // full panel
5184
-	cButton oneButton; // full XYZ
5185
-        //cButton currentLayout;
51865306         
51875307 	//
51885308         //Composite
....@@ -5260,6 +5380,10 @@
52605380 	private MenuItem showleavesItem;
52615381 	private MenuItem markleavesItem;
52625382 	private MenuItem unmarkleavesItem;
5383
+	private MenuItem rewindleavesItem;
5384
+	private MenuItem unrewindleavesItem;
5385
+	private MenuItem randomleavesItem;
5386
+	private MenuItem unrandomleavesItem;
52635387         
52645388 	private MenuItem flipVItem;
52655389 	private MenuItem unflipVItem;