GroupEditor.java | ●●●●● patch | view | raw | blame | history | |
ObjEditor.java | ●●●●● patch | view | raw | blame | history |
GroupEditor.java
.. .. @@ -171,6 +171,14 @@ 171 171 //editItem.addActionListener(this); 172 172 duplicateItem = menu.add(new MenuItem("Duplicate")); 173 173 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("-");174 182 cutItem = menu.add(new MenuItem("Cut")); 175 183 cutItem.addActionListener(this); 176 184 copyItem = menu.add(new MenuItem("Copy")); .. .. @@ -178,10 +186,7 @@ 178 186 pasteItem = menu.add(new MenuItem("Paste")); 179 187 pasteItem.addActionListener(this); 180 188 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 +185 190 menu.add("-"); 186 191 pasteIntoItem = menu.add(new MenuItem("Paste into")); 187 192 pasteIntoItem.addActionListener(this); .. .. @@ -272,6 +277,7 @@ 272 277 273 278 if (Globals.ADVANCED) 274 279 { 280 + menu.add("-");275 281 physicsItem = menu.add(new MenuItem("Physics")); 276 282 physicsItem.addActionListener(this); 277 283 frameselectorItem = menu.add(new MenuItem("Frame Selector")); .. .. @@ -297,6 +303,7 @@ 297 303 shadowZItem.addActionListener(this); 298 304 if (Globals.ADVANCED) 299 305 { 306 + menu.add("-");300 307 linkerItem = menu.add(new MenuItem("Linker")); 301 308 linkerItem.addActionListener(this); 302 309 attributeItem = menu.add(new MenuItem("Attribute")); .. .. @@ -305,8 +312,8 @@ 305 312 templateItem.addActionListener(this); 306 313 pointflowItem = menu.add(new MenuItem("Point Flow")); 307 314 pointflowItem.addActionListener(this); 308 - menu.add("-");309 315 } 316 + menu.add("-");310 317 resetTransformItem = menu.add(new MenuItem("Reset Transform")); 311 318 resetTransformItem.addActionListener(this); 312 319 resetCentroidItem = menu.add(new MenuItem("Reset Centroid")); .. .. @@ -1164,13 +1171,13 @@ 1164 1171 parseverticesItem.addActionListener(this); 1165 1172 textureFieldItem = menu.add(new MenuItem("Texture Field")); 1166 1173 textureFieldItem.addActionListener(this); 1167 - alignItem = menu.add(new MenuItem("Align Object"));1174 + alignItem = menu.add(new MenuItem("Align Objects"));1168 1175 alignItem.addActionListener(this); 1169 1176 reduceMorphItem = menu.add(new MenuItem("Reduce Morphs")); 1170 1177 reduceMorphItem.addActionListener(this); 1171 1178 reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)")); 1172 1179 reduce34MorphItem.addActionListener(this); 1173 -1180 + menu.add("-");1174 1181 menu.add(computeAOItem = new MenuItem("Compute AO")); 1175 1182 computeAOItem.addActionListener(this); 1176 1183 ObjEditor.java
.. .. @@ -319,8 +319,21 @@ 319 319 toggleTextureItem.addItemListener(this); 320 320 toggleTextureItem.setState(CameraPane.textureon); 321 321 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 +322 334 if (Globals.ADVANCED) 323 335 { 336 + cameraMenu.add("-");324 337 cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live")); 325 338 toggleLiveItem.addItemListener(this); 326 339 toggleLiveItem.setState(Globals.isLIVE()); .. .. @@ -350,18 +363,6 @@ 350 363 cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline")); 351 364 toggleTimelineItem.addItemListener(this); 352 365 } 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);365 366 366 367 // cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root")); 367 368 // toggleRootItem.addItemListener(this); .. .. @@ -1329,7 +1330,7 @@ 1329 1330 scrollpane.addMouseWheelListener(this); // Default not fast enough 1330 1331 1331 1332 /*JTabbedPane*/ scenePanel = new cGridBag(); 1332 - scenePanel.preferredWidth = 7;1333 + scenePanel.preferredWidth = 6;1333 1334 1334 1335 JTabbedPane tabbedPane = new JTabbedPane(); 1335 1336 tabbedPane.add(scrollpane); .. .. @@ -1435,8 +1436,8 @@ 1435 1436 1436 1437 // aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc); 1437 1438 1438 - frame.setSize(1024, 768);1439 - frame.show();1439 + frame.setSize(1280, 860);1440 + frame.setVisible(true);1440 1441 1441 1442 gridPanel.setDividerLocation(1.0); 1442 1443 .. .. @@ -3276,7 +3277,6 @@ 3276 3277 callee.refreshContents(); 3277 3278 } else 3278 3279 { 3279 - new Exception().printStackTrace();3280 3280 System.exit(0); 3281 3281 } 3282 3282 }