CSG + paint mode.

Normand Briere

2019-07-20 0a52bd4800459cd9935f360d7ca9555b6bea2146

CSG + paint mode.

 CSGEditor.java
..
..
@@ -10,6 +10,8 @@
10
10
 
11
11
 import java.util.Vector;
12
12
 
13
+import grafeme.ui.*;
14
+
13
15
 class CSGEditor extends ObjEditor implements ChangeListener, ActionListener, ObjectUI
14
16
 {
15
17
     
..
..
@@ -44,19 +46,18 @@
44
46
                 super.SetupUI2(oe); // Shows composite UI !!
45
47
                 //super.SetupName(oe);
46
48
                 
47
-                oe.aConstraints.weighty = 0;
49
+		oe.ctrlPanel.add(refreshButton = new JButton("Refresh")); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
50
+                oe.ctrlPanel.Return();
48
51
                 
49
-		oe.aConstraints.fill = 0;
50
-		oe.aConstraints.gridwidth = 1;
51
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
52
-		oe.ctrlPanel.add(refreshButton = new JButton("Refresh"), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
53
-		oe.aConstraints.gridwidth = 1;
54
-		oe.aConstraints.gridx /* = 0;
55
-		oe.aConstraints.gridy */ += 1;
56
-
57
-                oe.aConstraints.fill = 0;
58
-		oe.aConstraints.gridwidth = 1;
59
-		//this.csg = (CSG) copy;
52
+                menuPane = new cGridBag();
53
+                oe.ctrlPanel.add(menuPane);
54
+                oe.ctrlPanel.Return();
55
+                
56
+                menuPane2 = new cGridBag();
57
+                oe.ctrlPanel.add(menuPane2);
58
+                oe.ctrlPanel.Return();
59
+                
60
+                //this.csg = (CSG) copy;
60
61
                 /*
61
62
 		oe.ctrlPanel.add(typeLabel = new JLabel("Type"), oe.aConstraints);
62
63
 		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
..
..
@@ -67,33 +68,26 @@
67
68
 		list.add("Merge");
68
69
 		list.add("Intersection");
69
70
 		list.add("Difference");
70
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
71
-		oe.ctrlPanel.add(typeMenu = new JComboBox(new ObjEditor.cListModel(list, csg.csgType - 1)), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
71
+		menuPane.add(typeMenu = new JComboBox(new ObjEditor.cListModel(list, csg.csgType - 1))); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
72
72
 		//typeMenu.select(csg.csgType - 1);
73
73
 
74
-                oe.aConstraints.gridx += 1;
75
-		//oe.aConstraints.gridy += 1;
76
-		//oe.aConstraints.gridx = 0;
77
-
74
+                oe.ctrlPanel.Return();
75
+                
78
76
                 list = new Vector();
79
77
                 list.add("Surface");
80
78
                 list.add("Volume");
81
79
                 list.add("Inner");
82
80
                 list.add("Outer");
83
81
                 list.add("Boundary");
82
+                
84
83
                 /*
85
84
 		oe.aConstraints.fill = 0;
86
85
 		oe.ctrlPanel.add(genLabel = new JLabel("Generation"), oe.aConstraints);
87
86
 		oe.aConstraints.gridx += 1;
88
87
                  */
89
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
90
-		oe.ctrlPanel.add(genMenu = new JComboBox(new ObjEditor.cListModel(list, 0)), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
88
+		menuPane.add(genMenu = new JComboBox(new ObjEditor.cListModel(list, 0))); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
91
89
 		//typeMenu.select(csg.csgType - 1);
92
-		//oe.aConstraints.gridy += 1;
93
-		oe.aConstraints.gridx += 1;
94
90
                 
95
-                oe.ctrlPanel.Return();
96
-		
97
91
                 list = new Vector();
98
92
                 list.add("Smooth");
99
93
                 list.add("Flat");
..
..
@@ -102,11 +96,8 @@
102
96
 		oe.ctrlPanel.add(normalsLabel = new JLabel("Shading"), oe.aConstraints);
103
97
 		oe.aConstraints.gridx += 1;
104
98
                  */
105
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
106
-		oe.ctrlPanel.add(normalsMenu = new JComboBox(new ObjEditor.cListModel(list, 0)), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
99
+		menuPane2.add(normalsMenu = new JComboBox(new ObjEditor.cListModel(list, 0))); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
107
100
 		//typeMenu.select(csg.csgType - 1);
108
-		oe.aConstraints.gridx += 1;
109
-		oe.aConstraints.gridwidth = 1;
110
101
 		
111
102
                 list = new Vector();
112
103
                 list.add("Strip");
..
..
@@ -117,55 +108,39 @@
117
108
 		oe.ctrlPanel.add(normalsLabel = new JLabel("Shading"), oe.aConstraints);
118
109
 		oe.aConstraints.gridx += 1;
119
110
                  */
120
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
121
-		oe.ctrlPanel.add(stripifyMenu = new JComboBox(new ObjEditor.cListModel(list, 0)), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
111
+		menuPane2.add(stripifyMenu = new JComboBox(new ObjEditor.cListModel(list, 0))); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
122
112
 		//typeMenu.select(csg.csgType - 1);
123
-		oe.aConstraints.gridy += 1;
124
-		oe.aConstraints.gridx = 0;
125
-		oe.aConstraints.gridwidth = 1;
126
113
 		
127
-		//oe.aConstraints.fill = 0;
128
-		oe.ctrlPanel.add(sizeLabel = new JLabel("Depth"), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
129
-		oe.aConstraints.gridx += 1;
130
-		oe.aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
131
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
132
-		oe.ctrlPanel.add(sizeField = new NumberSlider(0,10), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
133
-		oe.aConstraints.gridy += 1;
134
-		oe.aConstraints.gridx = 0;
114
+//		oe.ctrlPanel.add(sizeLabel = new JLabel("Depth")); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
115
+//		oe.ctrlPanel.add(sizeSlider = new NumberSlider(0,10)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
116
+        sizeSliderPane = AddSlider(oe.ctrlPanel, "Depth", 0, 10, 0);
117
+            sizeSlider = (cNumberSlider)sizeSliderPane.getComponent(1);
118
+                oe.ctrlPanel.Return();
135
119
 		
136
-		oe.aConstraints.fill = 0;
137
-		oe.aConstraints.gridwidth = 1;
138
-		oe.ctrlPanel.add(size2Label = new JLabel("Depth2"), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
139
-		oe.aConstraints.gridx += 1;
140
-		oe.aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
141
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
142
-		oe.ctrlPanel.add(size2Field = new NumberSlider(0,10), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
143
-		oe.aConstraints.gridy += 1;
144
-		oe.aConstraints.gridx = 0;
120
+//		oe.ctrlPanel.add(size2Label = new JLabel("Depth2")); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
121
+//		oe.ctrlPanel.add(size2Slider = new NumberSlider(0,10)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
122
+        size2SliderPane = AddSlider(oe.ctrlPanel, "Depth2", 0, 10, 0);
123
+            size2Slider = (cNumberSlider)size2SliderPane.getComponent(1);
124
+                oe.ctrlPanel.Return();
145
125
 		
146
-		oe.aConstraints.gridwidth = 1;
147
-		oe.aConstraints.fill = 0;
148
-		oe.ctrlPanel.add(tolLabel = new JLabel("Tolerance"), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
149
-		oe.aConstraints.gridx += 1;
150
-		oe.aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
151
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
152
-		oe.ctrlPanel.add(tolField = new NumberSlider(0,10,1), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
153
-		oe.aConstraints.gridy += 1;
154
-		oe.aConstraints.gridx = 0;
155
-		oe.aConstraints.gridwidth = 1;
126
+//		oe.ctrlPanel.add(tolLabel = new JLabel("Tolerance")); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
127
+//		oe.ctrlPanel.add(toleranceSlider = new NumberSlider(0,10,1)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
128
+        toleranceSliderPane = AddSlider(oe.ctrlPanel, "Tolerance", 0, 10, 1, 1);
129
+            toleranceSlider = (cNumberSlider)toleranceSliderPane.getComponent(1);
130
+                oe.ctrlPanel.Return();
156
131
 		
157
-		sizeField.setInteger(csg.cellSize);
158
-		size2Field.setInteger(csg.cellSize2);
132
+		sizeSlider.setInteger(csg.cellSize);
133
+		size2Slider.setInteger(csg.cellSize2);
159
134
                 System.out.println("csg.tolerance = " + csg.tolerance);
160
-		tolField.setFloat(csg.tolerance);
135
+		toleranceSlider.setFloat(csg.tolerance);
161
136
                 normalsMenu.setSelectedIndex(csg.normals?0:1);
162
137
                 typeMenu.setSelectedIndex(csg.csgType - 1);
163
138
                 genMenu.setSelectedIndex(csg.genType);
164
139
                 stripifyMenu.setSelectedIndex(csg.userType); // ==0?0:1);
165
140
                 
166
-		sizeField.addChangeListener(this);
167
-		size2Field.addChangeListener(this);
168
-		tolField.addChangeListener(this);
141
+		sizeSlider.addChangeListener(this);
142
+		size2Slider.addChangeListener(this);
143
+		toleranceSlider.addChangeListener(this);
169
144
 		
170
145
 		typeMenu.addActionListener(this);
171
146
 		genMenu.addActionListener(this);
..
..
@@ -199,24 +174,29 @@
199
174
 		normalsMenu.removeActionListener(this);
200
175
 		refreshButton.removeActionListener(this);
201
176
                 
202
-		sizeField.removeChangeListener(this);
203
-		size2Field.removeChangeListener(this);
204
-		tolField.removeChangeListener(this);
205
-		oe.ctrlPanel.remove(sizeField);
206
-		oe.ctrlPanel.remove(size2Field);
207
-		oe.ctrlPanel.remove(tolField);
208
-		oe.ctrlPanel.remove(sizeLabel);
209
-		oe.ctrlPanel.remove(size2Label);
210
-		oe.ctrlPanel.remove(tolLabel);
211
-		oe.ctrlPanel.remove(typeMenu);
212
-		//oe.ctrlPanel.remove(typeLabel);
213
-		oe.ctrlPanel.remove(genMenu);
214
-		//oe.ctrlPanel.remove(genLabel);
215
-		oe.ctrlPanel.remove(normalsMenu);
216
-		oe.ctrlPanel.remove(stripifyMenu);
217
-		//oe.ctrlPanel.remove(normalsLabel);
218
-		oe.ctrlPanel.remove(refreshButton);
219
-		//oe.ctrlPanel.repaint();
177
+		sizeSlider.removeChangeListener(this);
178
+		size2Slider.removeChangeListener(this);
179
+		toleranceSlider.removeChangeListener(this);
180
+                
181
+		oe.ctrlPanel.remove(this.refreshButton);
182
+		oe.ctrlPanel.remove(menuPane);
183
+		oe.ctrlPanel.remove(menuPane2);
184
+		oe.ctrlPanel.remove(sizeSliderPane);
185
+		oe.ctrlPanel.remove(size2SliderPane);
186
+		oe.ctrlPanel.remove(toleranceSliderPane);
187
+                
188
+//		oe.ctrlPanel.remove(sizeLabel);
189
+//		oe.ctrlPanel.remove(size2Label);
190
+//		oe.ctrlPanel.remove(tolLabel);
191
+//		oe.ctrlPanel.remove(typeMenu);
192
+//		//oe.ctrlPanel.remove(typeLabel);
193
+//		oe.ctrlPanel.remove(genMenu);
194
+//		//oe.ctrlPanel.remove(genLabel);
195
+//		oe.ctrlPanel.remove(normalsMenu);
196
+//		oe.ctrlPanel.remove(stripifyMenu);
197
+//		//oe.ctrlPanel.remove(normalsLabel);
198
+//		oe.ctrlPanel.remove(refreshButton);
199
+//		//oe.ctrlPanel.repaint();
220
200
 		
221
201
 		super.closeUI();
222
202
 	}
..
..
@@ -226,7 +206,7 @@
226
206
 	{
227
207
 		super.doLayout();
228
208
 		labelAndField(typeLabel, typeMenu);
229
-		labelAndField(sizeLabel, sizeField);
209
+		labelAndField(sizeLabel, sizeSlider);
230
210
 		widgetPos += 5;
231
211
 	}
232
212
 	*/
..
..
@@ -252,9 +232,9 @@
252
232
 	
253
233
 	public void stateChanged(ChangeEvent e)
254
234
 	{
255
-		if (e.getSource() == sizeField ||
256
-			e.getSource() == size2Field ||
257
-	        e.getSource() == tolField)
235
+		if (e.getSource() == sizeSlider ||
236
+			e.getSource() == size2Slider ||
237
+	        e.getSource() == toleranceSlider)
258
238
 		{
259
239
                     // Can't choose...
260
240
 			//applySelf();
..
..
@@ -272,15 +252,16 @@
272
252
 		csg.genType = genMenu.getSelectedIndex();
273
253
 		csg.normals = normalsMenu.getSelectedIndex() == 0;
274
254
 		csg.userType = stripifyMenu.getSelectedIndex();
275
-		csg.cellSize = sizeField.getInteger();
276
-		csg.cellSize2 = size2Field.getInteger();
277
-		csg.tolerance = tolField.getFloat();
255
+		csg.cellSize = sizeSlider.getInteger();
256
+		csg.cellSize2 = size2Slider.getInteger();
257
+		csg.tolerance = toleranceSlider.getFloat();
278
258
                 
279
259
                 if (csg.link2master)
280
260
                     csg.retile();
281
261
 	}
282
262
 	
283
263
 	CSG csg;
264
+        
284
265
 	JLabel typeLabel;
285
266
 	JLabel genLabel;
286
267
 	JLabel normalsLabel;
..
..
@@ -291,10 +272,16 @@
291
272
 	JComboBox genMenu;
292
273
 	JComboBox normalsMenu;
293
274
 	JComboBox stripifyMenu;
294
-	NumberSlider sizeField;
295
-	NumberSlider size2Field;
296
-	NumberSlider tolField;
275
+	cNumberSlider sizeSlider;
276
+	cNumberSlider size2Slider;
277
+	cNumberSlider toleranceSlider;
297
278
 
279
+        cGridBag menuPane;
280
+        cGridBag menuPane2;
281
+        cGridBag sizeSliderPane;
282
+        cGridBag size2SliderPane;
283
+        cGridBag toleranceSliderPane;
284
+        
298
285
         JButton refreshButton;
299
286
         
300
287
 	//GroupEditor objEditor;
 CameraPane.java
..
..
@@ -2298,10 +2298,17 @@
2298
2298
         HANDLES ^= true;
2299
2299
     }
2300
2300
 
2301
+    Object3D paintFolder;
2302
+    
2301
2303
     void TogglePaint()
2302
2304
     {
2303
2305
         PAINTMODE ^= true;
2304
2306
         paintcount = 0;
2307
+        
2308
+        if (PAINTMODE)
2309
+        {
2310
+            paintFolder = GetFolder();
2311
+        }
2305
2312
     }
2306
2313
 
2307
2314
     void SwapCamera(int a, int b)
..
..
@@ -8503,7 +8510,7 @@
8503
8510
         return texture!=null?texture.texturedata:null;
8504
8511
     }
8505
8512
     
8506
-    boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
8513
+    com.sun.opengl.util.texture.Texture BindTexture(String tex, boolean bump, int resolution) throws Exception
8507
8514
     {
8508
8515
         if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
8509
8516
         {
..
..
@@ -8515,7 +8522,7 @@
8515
8522
         com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8516
8523
 
8517
8524
         if (texture == null)
8518
-            return false;
8525
+            return texture;
8519
8526
         /**/
8520
8527
 
8521
8528
         if (textureon || tex.equals("DEFAULT_TEXTURE") || tex.equals("DEFAULT_TEXTURE_BUMP") || tex.equals("WHITE_NOISE")) // || tex.equals("IMMORTAL"))
..
..
@@ -16553,6 +16560,14 @@
16553
16560
         }
16554
16561
     }
16555
16562
     
16563
+    private Object3D GetFolder()
16564
+    {
16565
+        Object3D folder = object.GetWindow().copy;
16566
+        if (object.GetWindow().copy.selection.Size() > 0)
16567
+            folder = object.GetWindow().copy.selection.elementAt(0);
16568
+        return folder;
16569
+    }
16570
+
16556
16571
     class SelectBuffer implements GLEventListener
16557
16572
     {
16558
16573
 
..
..
@@ -16632,6 +16647,17 @@
16632
16647
 
16633
16648
             //gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16634
16649
 
16650
+                if (PAINTMODE)
16651
+                {
16652
+                    if (object.GetWindow().copy.selection.Size() > 0)
16653
+                    {
16654
+                        Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16655
+
16656
+                        // Make what you paint not selectable.
16657
+                        paintobj.ResetSelectable();
16658
+                    }
16659
+                }
16660
+                
16635
16661
             //int tmp = selection_view;
16636
16662
             //selection_view = -1;
16637
16663
             int temp = DrawMode();
..
..
@@ -16643,6 +16669,17 @@
16643
16669
             //    temp = DEFAULT; // patch for selection debug
16644
16670
             Globals.drawMode = temp; // WARNING
16645
16671
 
16672
+                if (PAINTMODE)
16673
+                {
16674
+                    if (object.GetWindow().copy.selection.Size() > 0)
16675
+                    {
16676
+                        Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16677
+
16678
+                        // Revert.
16679
+                        paintobj.RestoreSelectable();
16680
+                    }
16681
+                }
16682
+                
16646
16683
             //gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16647
16684
 
16648
16685
             // trying different ways of getting the depth info over
..
..
@@ -16748,27 +16785,29 @@
16748
16785
                 if (!movingcamera && !PAINTMODE)
16749
16786
                     object.GetWindow().ScreenFitPoint(); // fev 2014
16750
16787
                 
16751
-                if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16788
+                if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16752
16789
                 {
16753
-                    Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16754
-                    
16755
-                    Object3D group = new Object3D("inst" + paintcount++);
16756
-                    
16757
-                    group.CreateMaterial(); // use a void leaf to select instances
16758
-                    
16759
-                    group.add(paintobj); // link
16760
-                    
16761
-                    object.GetWindow().SnapObject(group);
16762
-                    
16763
-                    Object3D folder = object.GetWindow().copy;
16790
+                    //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16764
16791
                     
16765
16792
                     if (object.GetWindow().copy.selection.Size() > 0)
16766
-                        folder = object.GetWindow().copy.selection.elementAt(0);
16793
+                    {
16794
+                        Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16767
16795
                     
16768
-                    folder.add(group);
16769
-                    
16770
-                    object.GetWindow().ResetModel();
16771
-                    object.GetWindow().refreshContents();
16796
+                        Object3D inst = new Object3D("inst" + paintcount++);
16797
+
16798
+                        inst.CreateMaterial(); // use a void leaf to select instances
16799
+
16800
+                        inst.add(paintobj); // link
16801
+
16802
+                        object.GetWindow().SnapObject(inst);
16803
+
16804
+                        Object3D folder = paintFolder; // GetFolder();
16805
+
16806
+                        folder.add(inst);
16807
+
16808
+                        object.GetWindow().ResetModel();
16809
+                        object.GetWindow().refreshContents();
16810
+                    }
16772
16811
                 }
16773
16812
                 else
16774
16813
                     paintcount = 0;
 GroupEditor.java
..
..
@@ -80,18 +80,20 @@
80
80
 		this.copy = this.group = copy;
81
81
 		//selectees = this.group.selectees;
82
82
 		
83
-        if (copy.versions == null)
84
-        {
85
-            copy.versions = new byte[100][];
86
-            copy.versionindex = -1;
87
-        }
88
-        
89
83
 		SetupMenu2(this); //objEditor);
90
84
 		SetupUI2(objEditor);
91
85
 		objEditor.SetupUI(true);
92
86
 		SetupViews(objEditor);
93
87
                 
94
88
                 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
89
+                
90
+        if (copy.versions == null)
91
+        {
92
+            copy.versions = new byte[100][];
93
+            copy.versionindex = -1;
94
+            
95
+            Save(true);
96
+        }
95
97
 	}
96
98
 
97
99
     void CloneSelection(boolean supports)
..
..
@@ -4798,7 +4800,7 @@
4798
4800
 
4799
4801
         void refreshContents(boolean cp)
4800
4802
         {
4801
-            if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4803
+            if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4802
4804
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4803
4805
             {
4804
4806
                 objEditor.ClearInfo(); // .GetMaterial());
 ObjEditor.java
..
..
@@ -327,8 +327,8 @@
327
327
 
328
328
         if (copy.versions == null)
329
329
         {
330
-            copy.versions = new byte[100][];
331
-            copy.versionindex = -1;
330
+//            copy.versions = new byte[100][];
331
+//            copy.versionindex = -1;
332
332
         }
333
333
         
334
334
         SetupMenu();
..
..
@@ -974,7 +974,7 @@
974
974
 //    NumberSlider vDivsField;
975
975
 //    JCheckBox endcaps;
976
976
     JCheckBox liveCB;
977
-    JCheckBox selectCB;
977
+    JCheckBox selectableCB;
978
978
     JCheckBox hideCB;
979
979
     JCheckBox link2masterCB;
980
980
     JCheckBox markCB;
..
..
@@ -1186,9 +1186,10 @@
1186
1186
             
1187
1187
         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1188
1188
                 liveCB.setToolTipText("Animate object");
1189
-        selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1190
-                selectCB.setToolTipText("Make object selectable");
1189
+        selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1190
+                selectableCB.setToolTipText("Make object selectable");
1191
1191
 //            Return();
1192
+                
1192
1193
         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1193
1194
                 hideCB.setToolTipText("Hide object");
1194
1195
         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
..
..
@@ -3250,7 +3251,7 @@
3250
3251
         {
3251
3252
             copy.live ^= true;
3252
3253
             return;
3253
-        } else if (event.getSource() == selectCB)
3254
+        } else if (event.getSource() == selectableCB)
3254
3255
         {
3255
3256
             copy.dontselect ^= true;
3256
3257
             return;
 Object3D.java
..
..
@@ -29,7 +29,7 @@
29
29
     Object3D saveskeleton;
30
30
     //
31
31
     
32
-    byte[] versions[] = new byte[100][];
32
+    byte[] versions[];
33
33
     int versionindex = -1;    
34
34
         
35
35
     ScriptNode scriptnode;
..
..
@@ -426,6 +426,7 @@
426
426
         }
427
427
         
428
428
     boolean live = false;
429
+    transient boolean keepdontselect;
429
430
     boolean dontselect = false;
430
431
     boolean hide = false;
431
432
     boolean link2master = false; // performs reset support/master at each frame
..
..
@@ -5420,6 +5421,51 @@
5420
5421
         blockloop = false;
5421
5422
     }
5422
5423
 
5424
+    void ResetSelectable()
5425
+    {
5426
+        if (blockloop)
5427
+            return;
5428
+        
5429
+        blockloop = true;
5430
+
5431
+        keepdontselect = dontselect;
5432
+        dontselect = true;
5433
+        
5434
+        Object3D child;
5435
+        int nb = Size();
5436
+        for (int i = 0; i < nb; i++)
5437
+        {
5438
+            child = (Object3D) get(i);
5439
+            if (child == null)
5440
+                continue;
5441
+            child.ResetSelectable();
5442
+        }
5443
+        
5444
+        blockloop = false;
5445
+    }
5446
+
5447
+    void RestoreSelectable()
5448
+    {
5449
+        if (blockloop)
5450
+            return;
5451
+        
5452
+        blockloop = true;
5453
+
5454
+        dontselect = keepdontselect;
5455
+        
5456
+        Object3D child;
5457
+        int nb = Size();
5458
+        for (int i = 0; i < nb; i++)
5459
+        {
5460
+            child = (Object3D) get(i);
5461
+            if (child == null)
5462
+                continue;
5463
+            child.RestoreSelectable();
5464
+        }
5465
+        
5466
+        blockloop = false;
5467
+    }
5468
+
5423
5469
     boolean IsSelected()
5424
5470
     {
5425
5471
         if (parent == null)
 cMesh.java
..
..
@@ -560,6 +560,8 @@
560
560
                 maxima = new cVector();
561
561
             }
562
562
             
563
+            CameraPane.CreateSelectedPoint();
564
+            
563
565
 //            ref.getBounds(minima, maxima, true);
564
566
 //            Phys.reference.set((maxima.x+minima.x)/2,(maxima.y+minima.y)/2,(maxima.z+minima.z)/2);
565
567
             //ref.