Normand Briere
2019-05-02 a7277e6c6381e55761f7fa87276260fac1c94d5e
Bigger default size.
2 files modified
53 ■■■■■ changed files
GroupEditor.java 21 ●●●●● patch | view | raw | blame | history
ObjEditor.java 32 ●●●● patch | view | raw | blame | history
GroupEditor.java
....@@ -171,6 +171,14 @@
171171 //editItem.addActionListener(this);
172172 duplicateItem = menu.add(new MenuItem("Duplicate"));
173173 duplicateItem.addActionListener(this);
174
+ cloneItem = menu.add(new MenuItem("Clone"));
175
+ cloneItem.addActionListener(this);
176
+ if (Globals.ADVANCED)
177
+ {
178
+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
179
+ cloneSupportItem.addActionListener(this);
180
+ }
181
+ menu.add("-");
174182 cutItem = menu.add(new MenuItem("Cut"));
175183 cutItem.addActionListener(this);
176184 copyItem = menu.add(new MenuItem("Copy"));
....@@ -178,10 +186,7 @@
178186 pasteItem = menu.add(new MenuItem("Paste"));
179187 pasteItem.addActionListener(this);
180188 menu.add("-");
181
- cloneItem = menu.add(new MenuItem("Clone"));
182
- cloneItem.addActionListener(this);
183
- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
184
- cloneSupportItem.addActionListener(this);
189
+
185190 menu.add("-");
186191 pasteIntoItem = menu.add(new MenuItem("Paste into"));
187192 pasteIntoItem.addActionListener(this);
....@@ -272,6 +277,7 @@
272277
273278 if (Globals.ADVANCED)
274279 {
280
+ menu.add("-");
275281 physicsItem = menu.add(new MenuItem("Physics"));
276282 physicsItem.addActionListener(this);
277283 frameselectorItem = menu.add(new MenuItem("Frame Selector"));
....@@ -297,6 +303,7 @@
297303 shadowZItem.addActionListener(this);
298304 if (Globals.ADVANCED)
299305 {
306
+ menu.add("-");
300307 linkerItem = menu.add(new MenuItem("Linker"));
301308 linkerItem.addActionListener(this);
302309 attributeItem = menu.add(new MenuItem("Attribute"));
....@@ -305,8 +312,8 @@
305312 templateItem.addActionListener(this);
306313 pointflowItem = menu.add(new MenuItem("Point Flow"));
307314 pointflowItem.addActionListener(this);
308
- menu.add("-");
309315 }
316
+ menu.add("-");
310317 resetTransformItem = menu.add(new MenuItem("Reset Transform"));
311318 resetTransformItem.addActionListener(this);
312319 resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
....@@ -1164,13 +1171,13 @@
11641171 parseverticesItem.addActionListener(this);
11651172 textureFieldItem = menu.add(new MenuItem("Texture Field"));
11661173 textureFieldItem.addActionListener(this);
1167
- alignItem = menu.add(new MenuItem("Align Object"));
1174
+ alignItem = menu.add(new MenuItem("Align Objects"));
11681175 alignItem.addActionListener(this);
11691176 reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
11701177 reduceMorphItem.addActionListener(this);
11711178 reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
11721179 reduce34MorphItem.addActionListener(this);
1173
-
1180
+ menu.add("-");
11741181 menu.add(computeAOItem = new MenuItem("Compute AO"));
11751182 computeAOItem.addActionListener(this);
11761183
ObjEditor.java
....@@ -319,8 +319,21 @@
319319 toggleTextureItem.addItemListener(this);
320320 toggleTextureItem.setState(CameraPane.textureon);
321321
322
+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
323
+ toggleSwitchItem.addItemListener(this);
324
+ toggleSwitchItem.setState(CameraPane.SWITCH);
325
+
326
+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
327
+ toggleHandleItem.addItemListener(this);
328
+ toggleHandleItem.setState(CameraPane.HANDLES);
329
+
330
+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
331
+ togglePaintItem.addItemListener(this);
332
+ togglePaintItem.setState(CameraPane.PAINTMODE);
333
+
322334 if (Globals.ADVANCED)
323335 {
336
+ cameraMenu.add("-");
324337 cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
325338 toggleLiveItem.addItemListener(this);
326339 toggleLiveItem.setState(Globals.isLIVE());
....@@ -350,18 +363,6 @@
350363 cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
351364 toggleTimelineItem.addItemListener(this);
352365 }
353
-
354
- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
355
- toggleSwitchItem.addItemListener(this);
356
- toggleSwitchItem.setState(CameraPane.SWITCH);
357
-
358
- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
359
- toggleHandleItem.addItemListener(this);
360
- toggleHandleItem.setState(CameraPane.HANDLES);
361
-
362
- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
363
- togglePaintItem.addItemListener(this);
364
- togglePaintItem.setState(CameraPane.PAINTMODE);
365366
366367 // cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
367368 // toggleRootItem.addItemListener(this);
....@@ -1329,7 +1330,7 @@
13291330 scrollpane.addMouseWheelListener(this); // Default not fast enough
13301331
13311332 /*JTabbedPane*/ scenePanel = new cGridBag();
1332
- scenePanel.preferredWidth = 7;
1333
+ scenePanel.preferredWidth = 6;
13331334
13341335 JTabbedPane tabbedPane = new JTabbedPane();
13351336 tabbedPane.add(scrollpane);
....@@ -1435,8 +1436,8 @@
14351436
14361437 // aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
14371438
1438
- frame.setSize(1024, 768);
1439
- frame.show();
1439
+ frame.setSize(1280, 860);
1440
+ frame.setVisible(true);
14401441
14411442 gridPanel.setDividerLocation(1.0);
14421443
....@@ -3276,7 +3277,6 @@
32763277 callee.refreshContents();
32773278 } else
32783279 {
3279
- new Exception().printStackTrace();
32803280 System.exit(0);
32813281 }
32823282 }