Skyboxes

Normand Briere

2019-07-28 a434119e65146fe53d612c28e1ee7af532d1b70a

 GroupEditor.java
..
..
@@ -23,6 +23,31 @@
23
23
         DragGestureListener, DragSourceListener, DropTargetListener,
24
24
         ItemListener // ListSelectionListener
25
25
 {
26
+
27
+    public void AddSkyboxButton(String f, String s, cGridBag row3)
28
+    {
29
+        cButton skyboxButton;
30
+        final String path = "cubemaps/" + f + "-skyboxes/" + s;
31
+        row3.add(skyboxButton = GetButton(path + "/" + s + ".jpg", !Grafreed.NIMBUSLAF));
32
+        skyboxButton.setToolTipText(s);
33
+        skyboxButton.addActionListener(new ActionListener()
34
+        {
35
+                @Override
36
+                public void actionPerformed(ActionEvent e)
37
+                {
38
+                    ChangeSkybox(path);
39
+                }
40
+        });
41
+    }
42
+
43
+    public void ChangeSkybox(String name)
44
+    {
45
+        cameraView.envyoff = false;
46
+        cameraView.skyboxname = name;
47
+        cameraView.skyboxext = "jpg";
48
+        cameraView.repaint();
49
+    }
50
+    
26
51
     //ObjEditor objEditor;
27
52
 	public void closeUI2()
28
53
 	{
..
..
@@ -60,6 +85,12 @@
60
85
 		this.copy = this.group = group;
61
86
 		//selectees = this.group.selectees;
62
87
 		
88
+        if (copy.versions == null)
89
+        {
90
+            copy.versions = new byte[100][];
91
+            copy.versionindex = -1;
92
+        }
93
+        
63
94
 		if(ui)
64
95
                     SetupUI(objEditor);
65
96
 	}
..
..
@@ -80,10 +111,22 @@
80
111
 		SetupViews(objEditor);
81
112
                 
82
113
                 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
114
+                
115
+        if (copy.versions == null)
116
+        {
117
+            copy.versions = new byte[100][];
118
+            copy.versionindex = -1;
119
+            
120
+            Save(true);
121
+        }
83
122
 	}
84
123
 
85
124
     void CloneSelection(boolean supports)
86
125
     {
126
+        if (Globals.REPLACEONMAKE)
127
+            Save();
128
+        boolean keep = Globals.REPLACEONMAKE;
129
+        Globals.REPLACEONMAKE = false;
87
130
         //   Object3D keep = GrafreeD.clipboard;
88
131
            //Object3D obj;
89
132
            for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -94,6 +137,7 @@
94
137
                
95
138
                makeSomething(clone, i==group.selection.size()-1);
96
139
            }
140
+        Globals.REPLACEONMAKE = keep;
97
141
     }
98
142
 
99
143
     void CloneClipboard(boolean supports)
..
..
@@ -189,8 +233,8 @@
189
233
 //		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
190
234
 //		pasteExpandItem.addActionListener(this);
191
235
 		menu.add("-");
192
-		clearItem = menu.add(new MenuItem("Clear"));
193
-		clearItem.addActionListener(this);
236
+		deleteItem = menu.add(new MenuItem("Delete"));
237
+		deleteItem.addActionListener(this);
194
238
                 
195
239
         if (Globals.ADVANCED)
196
240
         {
..
..
@@ -380,13 +424,14 @@
380
424
 		shadowYItem.addActionListener(this);
381
425
                 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382
426
 		shadowZItem.addActionListener(this);
427
+		attributeItem = menu.add(new MenuItem("Attribute"));
428
+		attributeItem.addActionListener(this);
429
+                
383
430
         if (Globals.ADVANCED)
384
431
         {
385
432
 		menu.add("-");
386
433
 		linkerItem = menu.add(new MenuItem("Linker"));
387
434
 		linkerItem.addActionListener(this);
388
-		attributeItem = menu.add(new MenuItem("Attribute"));
389
-		attributeItem.addActionListener(this);
390
435
 		templateItem = menu.add(new MenuItem("Template"));
391
436
 		templateItem.addActionListener(this);
392
437
 		pointflowItem = menu.add(new MenuItem("Point Flow"));
..
..
@@ -415,7 +460,7 @@
415
460
 		genNormalsMESHItem.addActionListener(this);
416
461
         if (Globals.ADVANCED)
417
462
         {
418
-		genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
463
+		genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
419
464
 		genNormalsMINEItem.addActionListener(this);
420
465
         }
421
466
 		stripifyItem = menu.add(new MenuItem("Stripify"));
..
..
@@ -508,10 +553,15 @@
508
553
 		attachBumpItem.addActionListener(this);
509
554
 		pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
510
555
 		pigmentBumpItem.addActionListener(this);
556
+                //embedTexturesItem
511
557
 		detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
512
558
 		detachPigmentItem.addActionListener(this);
513
559
 		detachBumpItem = menu.add(new MenuItem("Detach Bump"));
514
560
 		detachBumpItem.addActionListener(this);
561
+		embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
562
+		embedTexturesItem.addActionListener(this);
563
+		deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
564
+		deEmbedTexturesItem.addActionListener(this);
515
565
 		menu.add("-");
516
566
 		sortbysizeItem = menu.add(new MenuItem("Sort by size"));
517
567
 		sortbysizeItem.addActionListener(this);
..
..
@@ -538,6 +588,7 @@
538
588
 		buildToolsMenu(menu);
539
589
 	}
540
590
 	
591
+        
541
592
 	void SetupUI2(ObjEditor oe)
542
593
 	{
543
594
             // June 2019
..
..
@@ -582,7 +633,7 @@
582
633
          */
583
634
                 cGridBag copyOptionsPanel = new cGridBag();
584
635
                                         
585
-                copyOptionsPanel.preferredHeight = 1;
636
+                copyOptionsPanel.preferredHeight = 2;
586
637
                 
587
638
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
588
639
                 
..
..
@@ -601,42 +652,55 @@
601
652
                 fullButton.setToolTipText("Full-screen window");
602
653
 		fullButton.addActionListener(this);
603
654
                 
655
+		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
656
+                screenfitButton.setToolTipText("Screen fit");
657
+		screenfitButton.addActionListener(this);
658
+
604
659
 		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
605
660
                 restoreCameraButton.setToolTipText("Restore viewpoint");
606
661
 		restoreCameraButton.addActionListener(this);
607
662
                 
663
+		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
664
+                saveButton.setToolTipText("New version");
665
+		saveButton.addActionListener(this);
666
+                                                
608
667
 		copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609
-                undoButton.setToolTipText("Undo changes");
668
+                undoButton.setToolTipText("Previous version");
610
669
 		undoButton.addActionListener(this);
611
670
                 undoButton.setEnabled(false);
612
671
                 
672
+                cGridBag updown = new cGridBag().setVertical(true);
673
+		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674
+                restoreButton.setToolTipText("Restore current");
675
+		restoreButton.addActionListener(this);
676
+                restoreButton.setEnabled(false);
677
+                
678
+		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
679
+                replaceButton.setToolTipText("Replace current");
680
+		replaceButton.addActionListener(this);
681
+                replaceButton.setEnabled(false);
682
+                
683
+                copyOptionsPanel.add(updown);
684
+                
613
685
 		copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
614
-                redoButton.setToolTipText("Redo changes");
686
+                redoButton.setToolTipText("Next version");
615
687
 		redoButton.addActionListener(this);
616
688
                 redoButton.setEnabled(false);
617
689
                 
618
-		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
619
-                saveButton.setToolTipText("Save changes");
620
-		saveButton.addActionListener(this);
621
-                
622
-                copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
690
+                oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
623
691
                 liveCB.setToolTipText("Enable animation");
624
692
                                 liveCB.addItemListener(this);
625
693
 
626
-		copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694
+		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
627
695
                 oneStepButton.setToolTipText("Animate one step forward");
628
696
 		oneStepButton.addActionListener(this);
629
697
                 
630
-                copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
698
+                oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
631
699
                 fastCB.setToolTipText("Fast mode");
632
700
                                 fastCB.addItemListener(this);
633
701
                                 
634
702
                 //oe.toolboxPanel.Return();
635
703
                 
636
-		copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637
-                screenfitButton.setToolTipText("Screen fit");
638
-		screenfitButton.addActionListener(this);
639
-
640
704
 //                copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
641
705
 //                trackCB.setToolTipText("Enable tracking");
642
706
 //                                trackCB.addItemListener(this);
..
..
@@ -649,31 +713,32 @@
649
713
                         oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650
714
                         snapobjectButton.addActionListener(this);
651
715
                         snapobjectButton.setToolTipText("Snap Object");
716
+                        
717
+		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
718
+		fourButton.addActionListener(this);
719
+                fourButton.setToolTipText("Show control panel only");
652
720
                 }
653
721
 
654
722
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
655
723
                 
656
-		oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657
-                twoButton.setToolTipText("Show center view only");
724
+		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
725
+                twoButton.setToolTipText("Show 3D view only");
658
726
 		twoButton.addActionListener(this);
659
727
                 this.fullscreenLayout = twoButton;
660
728
                 
661
-		oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662
-		fourButton.addActionListener(this);
663
-                fourButton.setToolTipText("Show left panel only");
664
-		oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
665
-                sixButton.setToolTipText("2-column layout left");
666
-		sixButton.addActionListener(this);
667
-		oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668
-                threeButton.setToolTipText("2-column layout right");
729
+		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730
+                threeButton.setToolTipText("Show controls and 3D view");
669
731
 		threeButton.addActionListener(this);
670
-		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671
-                sevenButton.setToolTipText("3-column layout");
672
-		sevenButton.addActionListener(this);
732
+		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
733
+                sixButton.setToolTipText("Show 3D view and controls");
734
+		sixButton.addActionListener(this);
735
+//		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
736
+//                sevenButton.setToolTipText("3-column layout");
737
+//		sevenButton.addActionListener(this);
673
738
                 //
674
739
 
675
-		oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
676
-                rootButton.setToolTipText("Edit selection in new tab");
740
+		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
741
+                rootButton.setToolTipText("Open selection in new tab");
677
742
 		rootButton.addActionListener(this);
678
743
 
679
744
                 oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -682,28 +747,30 @@
682
747
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
683
748
 		//clearButton.addActionListener(this);
684
749
 
750
+                cGridBag row1 = new cGridBag();
751
+                
685
752
                 // INSERT
686
-                oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
753
+                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
687
754
                 gridButton.setToolTipText("Create grid");
688
755
                                 gridButton.addActionListener(this);
689
756
 
690
-                oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
757
+                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
691
758
                 boxButton.setToolTipText("Create box");
692
759
                                 boxButton.addActionListener(this);
693
760
 
694
-                oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
761
+                row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
695
762
                 sphereButton.setToolTipText("Create sphere");
696
763
                                 sphereButton.addActionListener(this);
697
764
 
698
-                oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
765
+                row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
699
766
                 coneButton.setToolTipText("Create cone");
700
767
                                 coneButton.addActionListener(this);
701
768
 
702
-                oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
769
+                row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
703
770
                 torusButton.setToolTipText("Create torus");
704
771
                                 torusButton.addActionListener(this);
705
772
 
706
-                oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
773
+                row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
707
774
                 superButton.setToolTipText("Create superellipsoid");
708
775
                                 superButton.addActionListener(this);
709
776
 
..
..
@@ -714,50 +781,144 @@
714
781
                                     kleinButton.addActionListener(this);
715
782
                 }
716
783
                 
717
-                oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
784
+                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
718
785
                 particlesButton.setToolTipText("Create particle system");
719
786
                                particlesButton.addActionListener(this);
720
787
 
721
-                oe.toolboxPanel.Return();
788
+                oe.toolboxPanel.add(row1);
722
789
                 
723
-                oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
790
+                cGridBag row2 = new cGridBag();
791
+                
792
+                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
724
793
                 groupButton.setToolTipText("Create group");
725
794
                                groupButton.addActionListener(this);
726
795
 
727
-                oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
796
+                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
728
797
                 compositeButton.setToolTipText("Create composite");
729
798
                                compositeButton.addActionListener(this);
730
799
 
731
-                oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
800
+                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
732
801
                 switchButton.setToolTipText("Create item switcher");
733
802
                                switchButton.addActionListener(this);
734
803
 
735
-                oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
804
+                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
736
805
                 loopButton.setToolTipText("Create loop");
737
806
                                loopButton.addActionListener(this);
738
807
 
739
-                oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
808
+                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
740
809
                 textureButton.setToolTipText("Create texture");
741
810
                                textureButton.addActionListener(this);
742
811
 
743
-                oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
812
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
744
813
                 overlayButton.setToolTipText("Create overlay");
745
814
                                overlayButton.addActionListener(this);
746
815
 
747
-                oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
816
+                row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
748
817
                 lightButton.setToolTipText("Create light");
749
818
                                lightButton.addActionListener(this);
750
819
 
751
-                for (int i=6; --i>=0;)
820
+                oe.toolboxPanel.add(row2);
821
+                
822
+                // ENVYMAPS
823
+                cGridBag row3 = new cGridBag();
824
+                row3.preferredHeight = 20;
825
+                
826
+                AddSkyboxButton("default", "rgb", row3);
827
+                AddSkyboxButton("default", "cornell", row3);
828
+                AddSkyboxButton("default", "uffizi", row3);
829
+                AddSkyboxButton("default", "CloudyHills", row3);
830
+                AddSkyboxButton("default", "skycube", row3);
831
+                               
832
+                oe.toolboxPanel.add(row3);
833
+                               
834
+                cGridBag row4 = new cGridBag();
835
+                row4.preferredHeight = 20;
836
+                
837
+                AddSkyboxButton("bridge", "Bridge2", row4);
838
+                AddSkyboxButton("urban", "GamlaStan2", row4);
839
+                AddSkyboxButton("urban", "Parliament", row4);
840
+                AddSkyboxButton("urban", "Roundabout", row4);
841
+                
842
+                oe.toolboxPanel.add(row4);
843
+                               
844
+                cGridBag row5 = new cGridBag();
845
+                row5.preferredHeight = 20;
846
+                
847
+                AddSkyboxButton("urban", "SaintLazarusChurch", row5);
848
+                AddSkyboxButton("urban", "SaintLazarusChurch2", row5);
849
+                AddSkyboxButton("urban", "SaintLazarusChurch3", row5);
850
+                AddSkyboxButton("urban", "UnionSquare", row5);
851
+                
852
+                oe.toolboxPanel.add(row5);
853
+                               
854
+                cGridBag row6 = new cGridBag();
855
+                row6.preferredHeight = 20;
856
+                
857
+                AddSkyboxButton("park", "BerzeliiPark", row6);
858
+                AddSkyboxButton("park", "Buddha", row6);
859
+                AddSkyboxButton("park", "CNTower2", row6);
860
+                //AddSkyboxButton("park", "Fatbursparken", row6);
861
+                AddSkyboxButton("park", "NiagaraFalls1", row6);
862
+                
863
+                oe.toolboxPanel.add(row6);
864
+                
865
+                cGridBag row7 = new cGridBag();
866
+                row7.preferredHeight = 20;
867
+                
868
+                AddSkyboxButton("park", "NiagaraFalls3", row7);
869
+                AddSkyboxButton("park", "Park", row7);
870
+                //AddSkyboxButton("park", "Park2", row6);
871
+                //AddSkyboxButton("park", "Path", row6);
872
+                AddSkyboxButton("park", "Pond", row7);
873
+                AddSkyboxButton("park", "Skansen", row7);
874
+                
875
+                oe.toolboxPanel.add(row7);
876
+                
877
+                cGridBag row8 = new cGridBag();
878
+                row8.preferredHeight = 20;
879
+                
880
+                AddSkyboxButton("park", "Skansen2", row8);
881
+                AddSkyboxButton("park", "Skansen3", row8);
882
+                AddSkyboxButton("park", "Skansen4", row8);
883
+                AddSkyboxButton("park", "Skansen5", row8);
884
+                
885
+                oe.toolboxPanel.add(row8);
886
+                
887
+                cGridBag row9 = new cGridBag();
888
+                row9.preferredHeight = 20;
889
+                
890
+                AddSkyboxButton("park", "Stairs", row9);
891
+                //AddSkyboxButton("park", "Tantolunden", row6);
892
+                //AddSkyboxButton("park", "Tantolunden3", row6);
893
+                AddSkyboxButton("park", "Tantolunden4", row9);
894
+                
895
+                oe.toolboxPanel.add(row9);
896
+/*
897
+BerzeliiPark
898
+Buddha
899
+CNTower2
900
+Fatbursparken
901
+NiagaraFalls1
902
+NiagaraFalls3
903
+Park
904
+Park2
905
+Path
906
+Pond
907
+Skansen
908
+Skansen2
909
+Skansen3
910
+Skansen4
911
+Skansen5
912
+Stairs
913
+Tantolunden
914
+Tantolunden3
915
+Tantolunden4
916
+                 */
917
+                
918
+                for (int i=1; --i>=0;)
752
919
                 {
753
-                oe.toolboxPanel.Return();
754
-                oe.toolboxPanel.add(new cGridBag());
755
-                oe.toolboxPanel.add(new cGridBag());
756
-                oe.toolboxPanel.add(new cGridBag());
757
-                oe.toolboxPanel.add(new cGridBag());
758
-                oe.toolboxPanel.add(new cGridBag());
759
-                oe.toolboxPanel.add(new cGridBag());
760
-                oe.toolboxPanel.add(new cGridBag());
920
+                    //oe.toolboxPanel.Return();
921
+                    oe.toolboxPanel.add(new cGridBag());
761
922
                 }
762
923
                 
763
924
                 // EDIT panel
..
..
@@ -814,9 +975,12 @@
814
975
 
815
976
                 oe.treePanel.add(copyOptionsPanel);
816
977
                 oe.treePanel.Return();
978
+        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
979
+            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
980
+            sliderPane.preferredHeight = 1;
817
981
                 
818
-//        mainPanel.setDividerLocation(0.5); //1.0);
819
-//        mainPanel.setResizeWeight(0.5);
982
+//        mainPanel.setDividerLocation(0.1); //1.0);
983
+        mainPanel.setResizeWeight(0.4);
820
984
         
821
985
 		//jList.addListSelectionListener(this);
822
986
 		oe.jTree.addTreeSelectionListener(this);
..
..
@@ -824,7 +988,7 @@
824
988
 		//jTree.setEditable(true);
825
989
 		oe.jTree.setDragEnabled(true);
826
990
 		//jTree.setPreferredSize(new Dimension(10,10));
827
-		jSP.setPreferredSize(new Dimension(100,200));
991
+		//jSP.setPreferredSize(new Dimension(100,200));
828
992
 		
829
993
                 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
830
994
                 
..
..
@@ -836,7 +1000,7 @@
836
1000
 		dgr.addDragGestureListener(this);
837
1001
 		}catch(Exception e) {}
838
1002
 		*/
839
-        radio.layout = sevenButton;
1003
+        radio.layout = sixButton; // sevenButton;
840
1004
         oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
841
1005
 	}
842
1006
         
..
..
@@ -939,9 +1103,9 @@
939
1103
                 toggleSwitchCB.setToolTipText("Choose a single item");
940
1104
                                 toggleSwitchCB.addItemListener(this);
941
1105
                                 
942
-                panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
943
-                autosaveCB.setToolTipText("On structure change");
944
-                                autosaveCB.addItemListener(this);
1106
+                panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
1107
+                autokeepCB.setToolTipText("On structure change");
1108
+                                autokeepCB.addItemListener(this);
945
1109
 
946
1110
                 panel.Return();
947
1111
             if (Globals.ADVANCED)
..
..
@@ -970,7 +1134,7 @@
970
1134
         {
971
1135
             cRadio radioButton = new cRadio(obj.name);
972
1136
             
973
-            // Patch to avoid bug with transparency.
1137
+            // June 2019. Patch to avoid bug with transparency.
974
1138
             radioButton.hadMaterial = obj.material != null;
975
1139
             if (!radioButton.hadMaterial)
976
1140
             {
..
..
@@ -978,7 +1142,7 @@
978
1142
             }
979
1143
             
980
1144
             radioButton.SetObject(obj);
981
-            radioButton.layout = sevenButton;
1145
+            radioButton.layout = sixButton; // sevenButton;
982
1146
             radioButton.SetCamera(cameraView.renderCamera, false);
983
1147
             radioButton.addActionListener(this);
984
1148
             radioPanel.add(radioButton);
..
..
@@ -1018,7 +1182,7 @@
1018
1182
         
1019
1183
         cCheckBox oeilCB;
1020
1184
         cCheckBox shadowCB;
1021
-        cCheckBox autosaveCB;
1185
+        cCheckBox autokeepCB;
1022
1186
         cCheckBox lookAtCB;
1023
1187
         
1024
1188
 //        static int COLOR = 1;
..
..
@@ -1130,9 +1294,9 @@
1130
1294
             {
1131
1295
                 Globals.FREEZEONMOVE ^= true;
1132
1296
             }
1133
-            else if(e.getSource() == autosaveCB)
1297
+            else if(e.getSource() == autokeepCB)
1134
1298
             {
1135
-                Globals.SAVEONMAKE ^= true;
1299
+                Globals.REPLACEONMAKE ^= true;
1136
1300
             }
1137
1301
             else if(e.getSource() == lookAtCB)
1138
1302
             {
..
..
@@ -1214,8 +1378,6 @@
1214
1378
                         }
1215
1379
                     }
1216
1380
                     
1217
-                    String string = (String) object;
1218
-                    
1219
1381
                     System.out.println("Transfer = " + object + "; drop : " + target);
1220
1382
 //                    if( object instanceof java.io.File[])
1221
1383
 //                    {
..
..
@@ -1223,6 +1385,8 @@
1223
1385
 //                        objEditor.DropFile((java.io.File[]) object, true);
1224
1386
 //                        return;
1225
1387
 //                    }
1388
+                    
1389
+                    String string = object.toString();
1226
1390
                     
1227
1391
                     // File path for Mac and Windows
1228
1392
                     if (string.charAt(0) == '/' || string.charAt(1) == ':')
..
..
@@ -1472,8 +1636,8 @@
1472
1636
 		animationItem.addItemListener(this);
1473
1637
                 animationItem.setState(Globals.ANIMATION);
1474
1638
                 
1475
-		menu.add(archiveItem = new CheckboxMenuItem("Archive3D..."));
1476
-		archiveItem.addItemListener(this);
1639
+		menu.add(archiveItem = new MenuItem("Archive3D..."));
1640
+		archiveItem.addActionListener(this);
1477
1641
                 
1478
1642
 		menu.add("-");
1479
1643
 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
..
..
@@ -1487,6 +1651,8 @@
1487
1651
 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1488
1652
 		reduce34MorphItem.addActionListener(this);
1489
1653
 		menu.add("-");
1654
+		menu.add(memoryItem = new MenuItem("Memory Usage"));
1655
+		memoryItem.addActionListener(this);
1490
1656
 		menu.add(computeAOItem = new MenuItem("Compute AO"));
1491
1657
 		computeAOItem.addActionListener(this);
1492
1658
                 
..
..
@@ -1495,8 +1661,6 @@
1495
1661
 		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1496
1662
 		mirrorItem.addActionListener(this);
1497
1663
 		menu.add("-");
1498
-		menu.add(memoryItem = new MenuItem("Memory Usage"));
1499
-		memoryItem.addActionListener(this);
1500
1664
 		menu.add(analyzeItem = new MenuItem("Analyze"));
1501
1665
 		analyzeItem.addActionListener(this);
1502
1666
 		menu.add(dumpItem = new MenuItem("Print"));
..
..
@@ -1657,6 +1821,16 @@
1657
1821
                 listUI.remove(i);
1658
1822
             }
1659
1823
         }
1824
+    }
1825
+
1826
+    private void EditElement(Object3D elem, boolean newWindow)
1827
+    {
1828
+        //    if (!(elem instanceof Composite))
1829
+        //        newWindow = false;
1830
+            listUI.add(elem);
1831
+            elem.openEditWindow(this, newWindow); //, false);
1832
+            System.out.println("edit : " + elem);
1833
+            elem.editWindow.refreshContents(true); // ? new
1660
1834
     }
1661
1835
         
1662
1836
     /**
..
..
@@ -2086,6 +2260,23 @@
2086
2260
 		{
2087
2261
 			makeSomething(new Light());
2088
2262
 		} else
2263
+//		if (source == skybox1Button ||
2264
+//                    source == skybox2Button ||
2265
+//                    source == skybox3Button ||
2266
+//                    source == skybox4Button ||
2267
+//                    source == skybox5Button ||
2268
+//                    source == skybox6Button ||
2269
+//                    source == skybox7Button ||
2270
+//                    source == skybox11Button ||
2271
+//                    source == skybox12Button ||
2272
+//                    source == skybox13Button ||
2273
+//                    source == skybox14Button ||
2274
+//                    source == skybox15Button ||
2275
+//                    source == skybox16Button ||
2276
+//                    source == skybox17Button)
2277
+//		{
2278
+//                    ChangeSkybox(source);
2279
+//		} else
2089
2280
 		if (source == csgItem)
2090
2281
 		{
2091
2282
 			group(new CSG());
..
..
@@ -2171,7 +2362,7 @@
2171
2362
 		if (source == computeAOItem)
2172
2363
 		{
2173
2364
                     Globals.drawMode = CameraPane.OCCLUSION;
2174
-                    Globals.theRenderer.repaint();
2365
+                    cameraView.repaint();
2175
2366
 		} else
2176
2367
 		if (source == recompileItem)
2177
2368
 		{
..
..
@@ -2219,15 +2410,31 @@
2219
2410
 		} else
2220
2411
 		if (source == undoButton)
2221
2412
 		{
2413
+                        // Go to previous version
2414
+			//if (!Undo())
2415
+                            //java.awt.Toolkit.getDefaultToolkit().beep();
2222
2416
 			Undo();
2417
+		} else
2418
+		if (source == restoreButton)
2419
+		{
2420
+                        // Restore current version
2421
+			Restore();
2422
+		} else
2423
+		if (source == replaceButton)
2424
+		{
2425
+                        // Overwrite current version
2426
+			Replace();
2223
2427
 		} else
2224
2428
 		if (source == redoButton)
2225
2429
 		{
2430
+                        // Go to next version
2226
2431
 			Redo();
2227
2432
 		} else
2228
2433
 		if (source == saveButton)
2229
2434
 		{
2230
-			Save();
2435
+                        // Save a new version
2436
+			if (!Save(true))
2437
+                            java.awt.Toolkit.getDefaultToolkit().beep();
2231
2438
 		} else
2232
2439
 		if (source == oneStepButton)
2233
2440
 		{
..
..
@@ -2236,17 +2443,14 @@
2236
2443
 		} else
2237
2444
 		if (source == screenfitButton)
2238
2445
 		{
2239
-			//Reload(lastConverter, lastFilename, true);
2240
2446
                     ScreenFit();
2241
2447
 		} else
2242
2448
 		if (source == screenfitpointButton)
2243
2449
 		{
2244
-			//Reload(lastConverter, lastFilename, true);
2245
2450
                     ScreenFitPoint();
2246
2451
 		} else
2247
2452
 		if (source == snapobjectButton)
2248
2453
 		{
2249
-			//Reload(lastConverter, lastFilename, true);
2250
2454
                     SnapObject();
2251
2455
 		} else
2252
2456
 //		if (event.getSource() == recompileButton)
..
..
@@ -2610,7 +2814,7 @@
2610
2814
 		{
2611
2815
 			StepAll();
2612
2816
 		} else
2613
-		if (source == clearItem) // || event.getSource() == clearButton)
2817
+		if (source == deleteItem) // || event.getSource() == clearButton)
2614
2818
 		{
2615
2819
 			//int indices[] = jList.getSelectedIndices();
2616
2820
 			//for (int i = indices.length - 1; i >= 0; i--)
..
..
@@ -3092,7 +3296,7 @@
3092
3296
 			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3093
3297
 			{
3094
3298
 				obj = (Object3D)e.nextElement();
3095
-                                obj.SetBumpTexture(null);
3299
+                                obj.ResetBumpTexture();
3096
3300
 			}
3097
3301
 			
3098
3302
 			refreshContents();
..
..
@@ -3106,6 +3310,31 @@
3106
3310
                                 obj.SetBumpTexture(obj.GetPigmentTexture());
3107
3311
 			}
3108
3312
 			
3313
+			refreshContents();
3314
+		} else
3315
+		if (source == embedTexturesItem)
3316
+		{
3317
+			Object3D obj;
3318
+			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3319
+			{
3320
+				obj = (Object3D)e.nextElement();
3321
+                                obj.EmbedTextures(true);
3322
+			}
3323
+			
3324
+			refreshContents();
3325
+		} else
3326
+		if (source == deEmbedTexturesItem)
3327
+		{
3328
+			Object3D obj;
3329
+			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3330
+			{
3331
+				obj = (Object3D)e.nextElement();
3332
+                                obj.EmbedTextures(false);
3333
+			}
3334
+			
3335
+                CameraPane.texturepigment.clear();
3336
+                CameraPane.texturebump.clear();
3337
+                
3109
3338
 			refreshContents();
3110
3339
 		} else
3111
3340
 		if (source == flashSelectionButton)
..
..
@@ -3209,8 +3438,8 @@
3209
3438
 //                    centralPanel.setVisible(true);
3210
3439
 //                    XYZPanel.setVisible(true);
3211
3440
                     bigThree.ClearUI();
3441
+                    bigThree.add(scenePanel);
3212
3442
                     bigThree.add(centralPanel);
3213
-                    bigThree.add(XYZPanel);
3214
3443
                     bigThree.FlushUI();
3215
3444
                     
3216
3445
                     cameraView.requestFocusInWindow();
..
..
@@ -3290,8 +3519,8 @@
3290
3519
 //                    centralPanel.setVisible(true);
3291
3520
 //                    XYZPanel.setVisible(false);
3292
3521
                     bigThree.ClearUI();
3293
-                    bigThree.add(scenePanel);
3294
3522
                     bigThree.add(centralPanel);
3523
+                    bigThree.add(scenePanel);
3295
3524
                     bigThree.FlushUI();
3296
3525
                     
3297
3526
                     cameraView.requestFocusInWindow();
..
..
@@ -3474,6 +3703,9 @@
3474
3703
                     }
3475
3704
                     
3476
3705
                     copy = group;
3706
+                    
3707
+                    SetUndoStates();
3708
+
3477
3709
                     //Globals.theRenderer.object = group;
3478
3710
                     if(!useclient)
3479
3711
                     {
..
..
@@ -3502,8 +3734,10 @@
3502
3734
                     radio.layout.doClick();
3503
3735
                     
3504
3736
                     ClearUnpinned();
3505
-                    SetPinStates(group.selection.size() > 0);
3506
-                    if (group.selection.size() == 1)
3737
+                    //Grafreed.Assert(group != null);
3738
+                    //Grafreed.Assert(group.selection != null);
3739
+                    SetPinStates(group.selection == null || group.selection.size() > 0);
3740
+                    if (group.selection == null || group.selection.size() == 1)
3507
3741
                         EditSelection(false);
3508
3742
                     keepparent = group.parent;
3509
3743
                     // PARENT = NULL or not???
..
..
@@ -4097,7 +4331,7 @@
4097
4331
                             
4098
4332
                             try
4099
4333
                             {
4100
-                                texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4334
+                                texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4101
4335
                             }
4102
4336
                             catch (Exception e)
4103
4337
                             {
..
..
@@ -4574,6 +4808,12 @@
4574
4808
 	
4575
4809
 	void EditSelection(boolean newWindow)
4576
4810
 	{
4811
+                if (group.selection == null)
4812
+                {
4813
+                     EditElement(group, newWindow); // ? new
4814
+                     return;
4815
+                }
4816
+                
4577
4817
         //    aConstraints.gridy = 0;
4578
4818
 		for (int i=0; i<group.selection.size(); i++)
4579
4819
 		{
..
..
@@ -4584,12 +4824,7 @@
4584
4824
 			Object3D elem = (Object3D)group.selection.elementAt(i);
4585
4825
                         if(elem != group || !newWindow)
4586
4826
                         {
4587
-                        //    if (!(elem instanceof Composite))
4588
-                        //        newWindow = false;
4589
-                            listUI.add(elem);
4590
-                            elem.openEditWindow(this, newWindow); //, false);
4591
-                            System.out.println("edit : " + elem);
4592
-                            elem.editWindow.refreshContents(true); // ? new
4827
+                            EditElement(elem, newWindow); // ? new
4593
4828
                         }
4594
4829
 		}
4595
4830
 	}
..
..
@@ -4733,8 +4968,8 @@
4733
4968
 
4734
4969
         void refreshContents(boolean cp)
4735
4970
         {
4736
-            if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4737
-            if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4971
+            if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4972
+            if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4738
4973
             {
4739
4974
                 objEditor.ClearInfo(); // .GetMaterial());
4740
4975
 
..
..
@@ -4833,8 +5068,8 @@
4833
5068
                 
4834
5069
 		if (cut)
4835
5070
 		{
4836
-        if (Globals.SAVEONMAKE)
4837
-                    Save();
5071
+//        if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
5072
+//                    Save();
4838
5073
 			//int indices[] = jList.getSelectedIndices();
4839
5074
 			//for (int i = indices.length - 1; i >= 0; i--)
4840
5075
 			//jList.remove(indices[i]);
..
..
@@ -4937,6 +5172,10 @@
4937
5172
 	
4938
5173
 	void paste(boolean expand)
4939
5174
 	{
5175
+        if (Globals.REPLACEONMAKE)
5176
+            Save();
5177
+        boolean keep = Globals.REPLACEONMAKE;
5178
+        Globals.REPLACEONMAKE = false;
4940
5179
 	//	if (GrafreeD.clipboard == null)
4941
5180
 	//		return;
4942
5181
 		boolean first = true;
..
..
@@ -4996,6 +5235,7 @@
4996
5235
                         Grafreed.clipboard.get(0).parent = keepparent;
4997
5236
 		}
4998
5237
 		
5238
+        Globals.REPLACEONMAKE = keep;
4999
5239
 		ResetModel();
5000
5240
 		refreshContents();
5001
5241
 	}
..
..
@@ -5131,6 +5371,10 @@
5131
5371
         
5132
5372
 	void group(Object3D csg, boolean grab)
5133
5373
 	{
5374
+        if (Globals.REPLACEONMAKE)
5375
+            Save();
5376
+        boolean keep = Globals.REPLACEONMAKE;
5377
+        Globals.REPLACEONMAKE = false;
5134
5378
 		if (//false) // why??
5135
5379
                     !group.selection.isEmpty())
5136
5380
                 {
..
..
@@ -5244,10 +5488,15 @@
5244
5488
                 //node.add(csg);
5245
5489
 		//makeSomething(node);
5246
5490
 		makeSomething(csg);
5491
+        Globals.REPLACEONMAKE = keep;
5247
5492
 	}
5248
5493
 	
5249
5494
         void Ungroup(Object3D g)
5250
5495
         {
5496
+        if (Globals.REPLACEONMAKE)
5497
+            Save();
5498
+        boolean keep = Globals.REPLACEONMAKE;
5499
+        Globals.REPLACEONMAKE = false;
5251
5500
             if (g instanceof HiddenObject)
5252
5501
             {
5253
5502
                 HiddenObject h = (HiddenObject) g;
..
..
@@ -5264,6 +5513,7 @@
5264
5513
                     objEditor.makeSomething(g.get(i), false);
5265
5514
                 }
5266
5515
             }
5516
+        Globals.REPLACEONMAKE = keep;
5267
5517
         }
5268
5518
         
5269
5519
 	void ungroup()
..
..
@@ -5564,6 +5814,22 @@
5564
5814
         cButton loopButton;
5565
5815
         cButton textureButton;
5566
5816
         
5817
+        cButton skybox1Button;
5818
+        cButton skybox2Button;
5819
+        cButton skybox3Button;
5820
+        cButton skybox4Button;
5821
+        cButton skybox5Button;
5822
+        cButton skybox6Button;
5823
+        cButton skybox7Button;
5824
+        
5825
+        cButton skybox11Button;
5826
+        cButton skybox12Button;
5827
+        cButton skybox13Button;
5828
+        cButton skybox14Button;
5829
+        cButton skybox15Button;
5830
+        cButton skybox16Button;
5831
+        cButton skybox17Button;
5832
+        
5567
5833
         cButton gridButton;
5568
5834
         cButton boxButton;
5569
5835
         cButton sphereButton;
..
..
@@ -5627,7 +5893,7 @@
5627
5893
 	private MenuItem pasteLinkItem;
5628
5894
 	private MenuItem pasteCloneItem;
5629
5895
 	private MenuItem pasteExpandItem;
5630
-	private MenuItem clearItem;
5896
+	private MenuItem deleteItem;
5631
5897
 	private MenuItem clearAllItem;
5632
5898
 	private MenuItem genUVItem;
5633
5899
 	private MenuItem genNormalsMESHItem;
..
..
@@ -5711,6 +5977,8 @@
5711
5977
 	private MenuItem attachBumpItem;
5712
5978
 	private MenuItem detachBumpItem;
5713
5979
 	private MenuItem pigmentBumpItem;
5980
+	private MenuItem embedTexturesItem;
5981
+	private MenuItem deEmbedTexturesItem;
5714
5982
 
5715
5983
 	private MenuItem particleItem;
5716
5984
 	private MenuItem ragdollItem;