.. | .. |
---|
98 | 98 | |
---|
99 | 99 | void CloneClipboard(boolean supports) |
---|
100 | 100 | { |
---|
101 | | - assert(GrafreeD.clipboard.parent == null); |
---|
102 | | - Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent; |
---|
103 | | - GrafreeD.clipboard.get(0).parent = null; // Avoid copy? |
---|
104 | | - if (LA.isIdentity(GrafreeD.clipboard.toParent)) |
---|
105 | | - makeSomething(CloneObject(GrafreeD.clipboard.get(0), false)); |
---|
| 101 | + assert(Grafreed.clipboard.parent == null); |
---|
| 102 | + Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent; |
---|
| 103 | + Grafreed.clipboard.get(0).parent = null; // Avoid copy? |
---|
| 104 | + if (LA.isIdentity(Grafreed.clipboard.toParent)) |
---|
| 105 | + makeSomething(CloneObject(Grafreed.clipboard.get(0), false)); |
---|
106 | 106 | else |
---|
107 | | - makeSomething(CloneObject(GrafreeD.clipboard, false)); |
---|
108 | | - GrafreeD.clipboard.get(0).parent = keepparent; |
---|
| 107 | + makeSomething(CloneObject(Grafreed.clipboard, false)); |
---|
| 108 | + Grafreed.clipboard.get(0).parent = keepparent; |
---|
109 | 109 | } |
---|
110 | 110 | |
---|
111 | 111 | static Object3D CloneObject(Object3D obj, boolean supports) |
---|
.. | .. |
---|
119 | 119 | // obj.support = null; |
---|
120 | 120 | if (!supports) |
---|
121 | 121 | obj.SaveSupports(); |
---|
122 | | - Object3D clone = (Object3D)GrafreeD.clone(obj); |
---|
| 122 | + Object3D clone = (Object3D)Grafreed.clone(obj); |
---|
123 | 123 | obj.parent = parent; |
---|
124 | 124 | // obj.support = support; |
---|
125 | 125 | // clone.support = support; // aout 2013 |
---|
.. | .. |
---|
150 | 150 | |
---|
151 | 151 | void SetupMenu2(ObjEditor oe) |
---|
152 | 152 | { |
---|
| 153 | + if (Globals.ADVANCED) |
---|
| 154 | + { |
---|
153 | 155 | oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest")); |
---|
154 | 156 | //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection")); |
---|
155 | 157 | //cameraMenu.add(switchItem = new MenuItem("Reverse View")); |
---|
.. | .. |
---|
161 | 163 | lookAtItem.addActionListener(this); |
---|
162 | 164 | //lookFromItem.addActinoListener(this); |
---|
163 | 165 | //switchItem.addActionListener(this); |
---|
| 166 | + } |
---|
| 167 | + |
---|
164 | 168 | Menu menu; |
---|
165 | 169 | oe.menuBar.add(menu = new Menu("Edit")); |
---|
166 | 170 | //editItem = menu.add(new MenuItem("Edit")); |
---|
167 | 171 | //editItem.addActionListener(this); |
---|
168 | 172 | duplicateItem = menu.add(new MenuItem("Duplicate")); |
---|
169 | 173 | duplicateItem.addActionListener(this); |
---|
170 | | - menu.add("-"); |
---|
171 | 174 | cloneItem = menu.add(new MenuItem("Clone")); |
---|
172 | 175 | cloneItem.addActionListener(this); |
---|
| 176 | + if (Globals.ADVANCED) |
---|
| 177 | + { |
---|
173 | 178 | cloneSupportItem = menu.add(new MenuItem("Clone (+supports)")); |
---|
174 | 179 | cloneSupportItem.addActionListener(this); |
---|
| 180 | + } |
---|
175 | 181 | menu.add("-"); |
---|
176 | 182 | cutItem = menu.add(new MenuItem("Cut")); |
---|
177 | 183 | cutItem.addActionListener(this); |
---|
.. | .. |
---|
179 | 185 | copyItem.addActionListener(this); |
---|
180 | 186 | pasteItem = menu.add(new MenuItem("Paste")); |
---|
181 | 187 | pasteItem.addActionListener(this); |
---|
| 188 | + menu.add("-"); |
---|
| 189 | + |
---|
| 190 | + menu.add("-"); |
---|
| 191 | + pasteIntoItem = menu.add(new MenuItem("Paste into")); |
---|
| 192 | + pasteIntoItem.addActionListener(this); |
---|
182 | 193 | pasteLinkItem = menu.add(new MenuItem("Paste link")); |
---|
183 | 194 | pasteLinkItem.addActionListener(this); |
---|
184 | 195 | pasteCloneItem = menu.add(new MenuItem("Paste clone")); |
---|
185 | 196 | pasteCloneItem.addActionListener(this); |
---|
186 | 197 | // pasteExpandItem = menu.add(new MenuItem("Paste expand")); |
---|
187 | 198 | // pasteExpandItem.addActionListener(this); |
---|
| 199 | + menu.add("-"); |
---|
188 | 200 | clearItem = menu.add(new MenuItem("Clear")); |
---|
189 | 201 | clearItem.addActionListener(this); |
---|
| 202 | + |
---|
| 203 | + if (Globals.ADVANCED) |
---|
| 204 | + { |
---|
| 205 | + // Deletes the cameras... |
---|
190 | 206 | clearAllItem = menu.add(new MenuItem("Clear All")); |
---|
191 | 207 | clearAllItem.addActionListener(this); |
---|
| 208 | + } |
---|
192 | 209 | |
---|
193 | 210 | oe.menuBar.add(menu = new Menu("Setting")); |
---|
| 211 | + if (Globals.ADVANCED) |
---|
| 212 | + { |
---|
194 | 213 | resetMeshItem = menu.add(new MenuItem("Reset All")); |
---|
195 | 214 | resetMeshItem.addActionListener(this); |
---|
196 | 215 | stepAllItem = menu.add(new MenuItem("Step All")); |
---|
.. | .. |
---|
200 | 219 | resetreferencesItem = menu.add(new MenuItem("Reset Mesh References")); |
---|
201 | 220 | resetreferencesItem.addActionListener(this); |
---|
202 | 221 | menu.add("-"); |
---|
| 222 | + } |
---|
203 | 223 | overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry")); |
---|
204 | 224 | overwriteGeoItem.addActionListener(this); |
---|
205 | 225 | overwriteMatItem = menu.add(new MenuItem("Overwrite Material")); |
---|
.. | .. |
---|
211 | 231 | overwriteUVItem = menu.add(new MenuItem("Overwrite UV")); |
---|
212 | 232 | overwriteUVItem.addActionListener(this); |
---|
213 | 233 | menu.add("-"); |
---|
| 234 | + if (Globals.ADVANCED) |
---|
| 235 | + { |
---|
214 | 236 | generateMeshItem = menu.add(new MenuItem("Generate Meshes")); |
---|
215 | 237 | generateMeshItem.addActionListener(this); |
---|
216 | 238 | poseMeshItem = menu.add(new MenuItem("Set Pose Meshes")); |
---|
217 | 239 | poseMeshItem.addActionListener(this); |
---|
218 | 240 | menu.add("-"); |
---|
| 241 | + } |
---|
219 | 242 | resetsupportItem = menu.add(new MenuItem("Reset support")); |
---|
220 | 243 | resetsupportItem.addActionListener(this); |
---|
221 | 244 | linkverticesItem = menu.add(new MenuItem("Link to Support")); |
---|
222 | 245 | linkverticesItem.addActionListener(this); |
---|
223 | 246 | relinkverticesItem = menu.add(new MenuItem("Re-link to Support")); |
---|
224 | 247 | relinkverticesItem.addActionListener(this); |
---|
| 248 | + |
---|
| 249 | + if (Globals.ADVANCED) |
---|
| 250 | + { |
---|
225 | 251 | setMasterItem = menu.add(new MenuItem("Set Master Mesh")); |
---|
226 | 252 | setMasterItem.addActionListener(this); |
---|
| 253 | + } |
---|
227 | 254 | |
---|
228 | 255 | oe.menuBar.add(menu = new Menu("Group")); |
---|
229 | 256 | grabItem = menu.add(new MenuItem("Grab")); |
---|
.. | .. |
---|
234 | 261 | frontItem.addActionListener(this); |
---|
235 | 262 | compositeItem = menu.add(new MenuItem("Composite")); |
---|
236 | 263 | compositeItem.addActionListener(this); |
---|
237 | | - hideItem = menu.add(new MenuItem("Hide")); |
---|
| 264 | + hideItem = menu.add(new MenuItem("Hidden Group")); |
---|
238 | 265 | hideItem.addActionListener(this); |
---|
239 | 266 | ungroupItem = menu.add(new MenuItem("Ungroup")); |
---|
240 | 267 | ungroupItem.addActionListener(this); |
---|
241 | 268 | menu.add("-"); |
---|
242 | | - randomItem = menu.add(new MenuItem("Random")); |
---|
| 269 | + randomItem = menu.add(new MenuItem("Switch node")); |
---|
243 | 270 | randomItem.addActionListener(this); |
---|
244 | | - physicsItem = menu.add(new MenuItem("Physics")); |
---|
245 | | - physicsItem.addActionListener(this); |
---|
246 | | - frameselectorItem = menu.add(new MenuItem("Frame Selector")); |
---|
247 | | - frameselectorItem.addActionListener(this); |
---|
248 | 271 | switchGeoItem = menu.add(new MenuItem("Switch Geometry")); |
---|
249 | 272 | switchGeoItem.addActionListener(this); |
---|
250 | 273 | switchTransfoItem = menu.add(new MenuItem("Switch Transform")); |
---|
251 | 274 | switchTransfoItem.addActionListener(this); |
---|
252 | | - morphItem = menu.add(new MenuItem("Morph")); |
---|
| 275 | + morphItem = menu.add(new MenuItem("Morph Group")); |
---|
253 | 276 | morphItem.addActionListener(this); |
---|
| 277 | + |
---|
| 278 | + if (Globals.ADVANCED) |
---|
| 279 | + { |
---|
| 280 | + menu.add("-"); |
---|
| 281 | + physicsItem = menu.add(new MenuItem("Physics")); |
---|
| 282 | + physicsItem.addActionListener(this); |
---|
| 283 | + frameselectorItem = menu.add(new MenuItem("Frame Selector")); |
---|
| 284 | + frameselectorItem.addActionListener(this); |
---|
254 | 285 | scriptNodeItem = menu.add(new MenuItem("Script Node")); |
---|
255 | 286 | scriptNodeItem.addActionListener(this); |
---|
256 | 287 | cameraItem = menu.add(new MenuItem("Camera")); |
---|
257 | 288 | cameraItem.addActionListener(this); |
---|
| 289 | + } |
---|
258 | 290 | |
---|
259 | 291 | oe.menuBar.add(menu = new Menu("Object")); |
---|
260 | 292 | textureItem = menu.add(new MenuItem("Texture")); |
---|
.. | .. |
---|
269 | 301 | shadowYItem.addActionListener(this); |
---|
270 | 302 | shadowZItem = menu.add(new MenuItem("Shadow Z")); |
---|
271 | 303 | shadowZItem.addActionListener(this); |
---|
| 304 | + if (Globals.ADVANCED) |
---|
| 305 | + { |
---|
| 306 | + menu.add("-"); |
---|
272 | 307 | linkerItem = menu.add(new MenuItem("Linker")); |
---|
273 | 308 | linkerItem.addActionListener(this); |
---|
274 | | - templateItem = menu.add(new MenuItem("Template")); |
---|
275 | | - templateItem.addActionListener(this); |
---|
276 | 309 | attributeItem = menu.add(new MenuItem("Attribute")); |
---|
277 | 310 | attributeItem.addActionListener(this); |
---|
| 311 | + templateItem = menu.add(new MenuItem("Template")); |
---|
| 312 | + templateItem.addActionListener(this); |
---|
278 | 313 | pointflowItem = menu.add(new MenuItem("Point Flow")); |
---|
279 | 314 | pointflowItem.addActionListener(this); |
---|
| 315 | + } |
---|
280 | 316 | menu.add("-"); |
---|
281 | 317 | resetTransformItem = menu.add(new MenuItem("Reset Transform")); |
---|
282 | 318 | resetTransformItem.addActionListener(this); |
---|
.. | .. |
---|
294 | 330 | genNormalsCADItem.addActionListener(this); |
---|
295 | 331 | genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals")); |
---|
296 | 332 | genNormalsMESHItem.addActionListener(this); |
---|
| 333 | + if (Globals.ADVANCED) |
---|
| 334 | + { |
---|
297 | 335 | genNormalsMINEItem = menu.add(new MenuItem("My Normals")); |
---|
298 | 336 | genNormalsMINEItem.addActionListener(this); |
---|
| 337 | + } |
---|
299 | 338 | stripifyItem = menu.add(new MenuItem("Stripify")); |
---|
300 | 339 | stripifyItem.addActionListener(this); |
---|
301 | 340 | unstripifyItem = menu.add(new MenuItem("Unstripify")); |
---|
.. | .. |
---|
317 | 356 | reduce34MeshItem.addActionListener(this); |
---|
318 | 357 | increaseMeshItem = menu.add(new MenuItem("Increase mesh")); |
---|
319 | 358 | increaseMeshItem.addActionListener(this); |
---|
320 | | - smoothMeshItem = menu.add(new MenuItem("Smooth mesh")); |
---|
321 | | - smoothMeshItem.addActionListener(this); |
---|
322 | 359 | clipMeshItem = menu.add(new MenuItem("Clip mesh")); |
---|
323 | 360 | clipMeshItem.addActionListener(this); |
---|
| 361 | + |
---|
| 362 | + if (Globals.ADVANCED) |
---|
| 363 | + { |
---|
| 364 | + smoothMeshItem = menu.add(new MenuItem("Smooth mesh")); |
---|
| 365 | + smoothMeshItem.addActionListener(this); |
---|
| 366 | + } |
---|
324 | 367 | |
---|
325 | 368 | oe.menuBar.add(menu = new Menu("Attributes")); |
---|
326 | 369 | clearMaterialsItem = menu.add(new MenuItem("Clear Materials")); |
---|
.. | .. |
---|
330 | 373 | liveleavesItem.addActionListener(this); |
---|
331 | 374 | unliveleavesItem = menu.add(new MenuItem("Unlive Leaves")); |
---|
332 | 375 | unliveleavesItem.addActionListener(this); |
---|
| 376 | + if (Globals.ADVANCED) |
---|
| 377 | + { |
---|
333 | 378 | supportleavesItem = menu.add(new MenuItem("Support Leaves")); |
---|
334 | 379 | supportleavesItem.addActionListener(this); |
---|
335 | 380 | unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves")); |
---|
336 | 381 | unsupportleavesItem.addActionListener(this); |
---|
| 382 | + } |
---|
337 | 383 | hideleavesItem = menu.add(new MenuItem("Hide Leaves")); |
---|
338 | 384 | hideleavesItem.addActionListener(this); |
---|
339 | 385 | showleavesItem = menu.add(new MenuItem("Show Leaves")); |
---|
.. | .. |
---|
376 | 422 | sortbysizeItem.addActionListener(this); |
---|
377 | 423 | sortbynameItem = menu.add(new MenuItem("Sort by name")); |
---|
378 | 424 | sortbynameItem.addActionListener(this); |
---|
| 425 | + if (Globals.ADVANCED) |
---|
| 426 | + { |
---|
379 | 427 | menu.add("-"); |
---|
380 | 428 | extractGeometriesItem = menu.add(new MenuItem("Link Geometry")); |
---|
381 | 429 | extractGeometriesItem.addActionListener(this); |
---|
.. | .. |
---|
385 | 433 | shareGeometriesItem.addActionListener(this); |
---|
386 | 434 | mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry")); |
---|
387 | 435 | mergeGeometriesItem.addActionListener(this); |
---|
| 436 | + } |
---|
388 | 437 | |
---|
389 | 438 | oe.menuBar.add(menu = new Menu("Insert")); |
---|
390 | 439 | buildCreateMenu(menu); |
---|
391 | 440 | |
---|
392 | | - |
---|
393 | 441 | oe.menuBar.add(menu = new Menu("Include")); |
---|
394 | | - importGFDItem = menu.add(new MenuItem("GrafreeD Object...")); |
---|
395 | | - importGFDItem.addActionListener(this); |
---|
396 | | - importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object...")); |
---|
397 | | - importVRMLX3DItem.addActionListener(this); |
---|
398 | | - importOBJItem = menu.add(new MenuItem("OBJ Object...")); |
---|
| 442 | + importOBJItem = menu.add(new MenuItem("OBJ file...")); |
---|
399 | 443 | importOBJItem.addActionListener(this); |
---|
400 | | - import3DSItem = menu.add(new MenuItem("3DS Object...")); |
---|
| 444 | + menu.add("-"); |
---|
| 445 | + import3DSItem = menu.add(new MenuItem("3DS file...")); |
---|
401 | 446 | import3DSItem.addActionListener(this); |
---|
| 447 | + menu.add("-"); |
---|
| 448 | + importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file...")); |
---|
| 449 | + importVRMLX3DItem.addActionListener(this); |
---|
| 450 | + menu.add("-"); |
---|
| 451 | + importGFDItem = menu.add(new MenuItem("GrafreeD file...")); |
---|
| 452 | + importGFDItem.addActionListener(this); |
---|
402 | 453 | |
---|
403 | 454 | oe.menuBar.add(menu = new Menu("Tools")); |
---|
404 | 455 | buildToolsMenu(menu); |
---|
.. | .. |
---|
440 | 491 | liveCB.setToolTipText("Enabled animation"); |
---|
441 | 492 | liveCB.addItemListener(this); |
---|
442 | 493 | |
---|
| 494 | + oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 495 | + oneStepButton.setToolTipText("Animate one step forward"); |
---|
| 496 | + oneStepButton.addActionListener(this); |
---|
| 497 | + |
---|
443 | 498 | oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints); |
---|
444 | 499 | fastCB.setToolTipText("Fast mode"); |
---|
445 | 500 | fastCB.addItemListener(this); |
---|
.. | .. |
---|
448 | 503 | trackCB.setToolTipText("Enable tracking"); |
---|
449 | 504 | trackCB.addItemListener(this); |
---|
450 | 505 | |
---|
451 | | - oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 506 | + oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
452 | 507 | screenfitButton.setToolTipText("Screen fit"); |
---|
453 | 508 | screenfitButton.addActionListener(this); |
---|
454 | 509 | |
---|
455 | 510 | // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints); |
---|
456 | 511 | // screenfitpointButton.addActionListener(this); |
---|
457 | | -// oe.aConstraints.gridx += 1; |
---|
458 | | - oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints); |
---|
459 | | - snapobjectButton.addActionListener(this); |
---|
460 | | - snapobjectButton.setToolTipText("Snap Object"); |
---|
461 | | - oe.aConstraints.gridx += 1; |
---|
462 | 512 | |
---|
463 | | - //aConstraints.gridx = 0; |
---|
464 | | - //aConstraints.gridy += 1; |
---|
465 | | - oe.aConstraints.weighty = 0; |
---|
466 | | - oe.aConstraints.gridwidth = 1; |
---|
467 | | - |
---|
468 | | - oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 513 | + if (Globals.ADVANCED) |
---|
| 514 | + { |
---|
| 515 | + oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 516 | + snapobjectButton.addActionListener(this); |
---|
| 517 | + snapobjectButton.setToolTipText("Snap Object"); |
---|
| 518 | + } |
---|
| 519 | + |
---|
| 520 | + oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
469 | 521 | flashSelectionButton.setToolTipText("Show selection"); |
---|
470 | 522 | flashSelectionButton.addActionListener(this); |
---|
471 | 523 | |
---|
472 | 524 | oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL)); |
---|
473 | 525 | |
---|
474 | | - oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 526 | + oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
475 | 527 | twoButton.setToolTipText("Show center view only"); |
---|
476 | 528 | twoButton.addActionListener(this); |
---|
477 | | - oe.toolbarPanel.add(fourButton = new cButton("+||", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 529 | + oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
478 | 530 | fourButton.addActionListener(this); |
---|
479 | 531 | fourButton.setToolTipText("Show left panel only"); |
---|
480 | | - oe.toolbarPanel.add(sixButton = new cButton("+|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 532 | + oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
481 | 533 | sixButton.setToolTipText("2-column layout left"); |
---|
482 | 534 | sixButton.addActionListener(this); |
---|
483 | | - oe.toolbarPanel.add(threeButton = new cButton("|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 535 | + oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
484 | 536 | threeButton.setToolTipText("2-column layout right"); |
---|
485 | 537 | threeButton.addActionListener(this); |
---|
486 | | - oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 538 | + oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
487 | 539 | sevenButton.setToolTipText("3-column layout"); |
---|
488 | 540 | sevenButton.addActionListener(this); |
---|
489 | 541 | // |
---|
490 | 542 | |
---|
491 | | - oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 543 | + oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
492 | 544 | rootButton.setToolTipText("Edit selection in new tab"); |
---|
493 | 545 | rootButton.addActionListener(this); |
---|
494 | 546 | |
---|
495 | | - oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 547 | + oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
496 | 548 | closeButton.setToolTipText("Close tab"); |
---|
497 | 549 | closeButton.addActionListener(this); |
---|
498 | 550 | //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints); |
---|
.. | .. |
---|
500 | 552 | |
---|
501 | 553 | cGridBag commandsPanel = new cGridBag(); |
---|
502 | 554 | |
---|
503 | | - commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 555 | + commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
504 | 556 | editButton.setToolTipText("Edit selection"); |
---|
505 | 557 | editButton.addActionListener(this); |
---|
506 | 558 | |
---|
507 | | - commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 559 | + commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
508 | 560 | uneditButton.setToolTipText("Unedit selection"); |
---|
509 | 561 | uneditButton.addActionListener(this); |
---|
510 | 562 | |
---|
511 | | - commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 563 | + commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints); |
---|
| 564 | + allParamsButton.setToolTipText("Edit all params"); |
---|
| 565 | + allParamsButton.addActionListener(this); |
---|
| 566 | + |
---|
| 567 | + commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
512 | 568 | clearPanelButton.setToolTipText("Clear edit panel"); |
---|
513 | 569 | clearPanelButton.addActionListener(this); |
---|
514 | 570 | |
---|
515 | | - commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints); |
---|
516 | | - allParamsButton.setToolTipText("All params??"); |
---|
517 | | - allParamsButton.addActionListener(this); |
---|
518 | | - |
---|
519 | | - commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 571 | + commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
520 | 572 | unselectButton.setToolTipText("Unselect"); |
---|
521 | 573 | unselectButton.addActionListener(this); |
---|
522 | 574 | |
---|
.. | .. |
---|
591 | 643 | |
---|
592 | 644 | void AddOptions(cGridBag panel) //, GridBagConstraints constraints) |
---|
593 | 645 | { |
---|
| 646 | + panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints); |
---|
| 647 | + boxCB.setToolTipText("Display bounding boxes"); |
---|
| 648 | + boxCB.addItemListener(this); |
---|
| 649 | + |
---|
| 650 | + panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints); |
---|
| 651 | + zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel"); |
---|
| 652 | + zoomBoxCB.addItemListener(this); |
---|
| 653 | + |
---|
| 654 | + if (Globals.ADVANCED) |
---|
| 655 | + { |
---|
594 | 656 | panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints); |
---|
595 | | - supportCB.setToolTipText("Enabled rigging"); |
---|
| 657 | + supportCB.setToolTipText("Enable rigging"); |
---|
596 | 658 | supportCB.addItemListener(this); |
---|
597 | 659 | |
---|
598 | 660 | // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints); |
---|
.. | .. |
---|
610 | 672 | slowCB.setToolTipText("Smooth interpolation"); |
---|
611 | 673 | slowCB.addItemListener(this); |
---|
612 | 674 | |
---|
613 | | - panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints); |
---|
614 | | - boxCB.setToolTipText("Display bounding boxes"); |
---|
615 | | - boxCB.addItemListener(this); |
---|
616 | | - |
---|
617 | | - panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints); |
---|
618 | | - zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel"); |
---|
619 | | - zoomBoxCB.addItemListener(this); |
---|
620 | | - |
---|
621 | 675 | // constraints.gridy += 1; |
---|
622 | 676 | // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints); |
---|
623 | 677 | // speakerMocapCB.addItemListener(this); |
---|
.. | .. |
---|
648 | 702 | panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints); |
---|
649 | 703 | lookAtCB.setToolTipText("Look-at target"); |
---|
650 | 704 | lookAtCB.addItemListener(this); |
---|
| 705 | + |
---|
| 706 | + } |
---|
651 | 707 | |
---|
652 | 708 | cGridBag fill = new cGridBag(); |
---|
653 | 709 | |
---|
.. | .. |
---|
884 | 940 | // objEditor.DropFile((java.io.File[]) object, true); |
---|
885 | 941 | // return; |
---|
886 | 942 | // } |
---|
887 | | - if (string.charAt(0) == '/') |
---|
| 943 | + |
---|
| 944 | + // File path for Mac and Windows |
---|
| 945 | + if (string.charAt(0) == '/' || string.charAt(1) == ':') |
---|
888 | 946 | { |
---|
889 | 947 | // file(s) |
---|
890 | 948 | String[] names = string.split("\n"); |
---|
.. | .. |
---|
911 | 969 | |
---|
912 | 970 | flashIt = false; |
---|
913 | 971 | CameraPane pane = (CameraPane) target; |
---|
914 | | - pane.clickStart(objEditor.location.x, objEditor.location.y, 0); |
---|
| 972 | + pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0); |
---|
915 | 973 | pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true); |
---|
916 | 974 | |
---|
917 | 975 | if (group.selection.size() == 1) |
---|
.. | .. |
---|
938 | 996 | { |
---|
939 | 997 | loadClipboard(true); |
---|
940 | 998 | objEditor.jTree.setSelectionPath(destinationPath); |
---|
941 | | - pasteInto(false); |
---|
| 999 | + pasteInto(false, false); |
---|
942 | 1000 | } else { |
---|
943 | 1001 | loadClipboard(false); |
---|
944 | 1002 | objEditor.jTree.setSelectionPath(destinationPath); |
---|
945 | | - pasteInto(false); // true); // ??? |
---|
| 1003 | + pasteInto(false, false); // true); // ??? |
---|
946 | 1004 | } |
---|
947 | 1005 | } |
---|
948 | 1006 | public void dropActionChanged(DropTargetDragEvent dtde) |
---|
.. | .. |
---|
1064 | 1122 | kleinItem.addActionListener(this); |
---|
1065 | 1123 | particleItem = menu.add(new MenuItem("Particle system")); |
---|
1066 | 1124 | particleItem.addActionListener(this); |
---|
| 1125 | + if (Globals.ADVANCED) |
---|
| 1126 | + { |
---|
1067 | 1127 | ragdollItem = menu.add(new MenuItem("Rag Walk")); |
---|
1068 | 1128 | ragdollItem.addActionListener(this); |
---|
1069 | 1129 | ragdoll2Item = menu.add(new MenuItem("Rag Fall")); |
---|
1070 | 1130 | ragdoll2Item.addActionListener(this); |
---|
| 1131 | + } |
---|
1071 | 1132 | menu.add("-"); |
---|
1072 | | - meshItem = menu.add(new MenuItem("Mesh")); |
---|
| 1133 | + meshItem = menu.add(new MenuItem("Dynamic Mesh")); |
---|
1073 | 1134 | meshItem.addActionListener(this); |
---|
1074 | 1135 | // meshGroupItem = menu.add(new MenuItem("Mesh Group")); |
---|
1075 | 1136 | // meshGroupItem.addActionListener(this); |
---|
| 1137 | + if (Globals.ADVANCED) |
---|
| 1138 | + { |
---|
1076 | 1139 | springItem = menu.add(new MenuItem("Spring")); |
---|
1077 | 1140 | springItem.addActionListener(this); |
---|
1078 | 1141 | flagItem = menu.add(new MenuItem("Flag")); |
---|
1079 | 1142 | flagItem.addActionListener(this); |
---|
1080 | | - bezierItem = menu.add(new MenuItem("Patch")); |
---|
1081 | | - bezierItem.addActionListener(this); |
---|
1082 | | - checkerItem = menu.add(new MenuItem("Checker")); |
---|
1083 | | - checkerItem.addActionListener(this); |
---|
1084 | 1143 | blobItem = menu.add(new MenuItem("Blob")); |
---|
1085 | 1144 | blobItem.addActionListener(this); |
---|
1086 | 1145 | latheItem = menu.add(new MenuItem("Lathe")); |
---|
1087 | 1146 | latheItem.addActionListener(this); |
---|
| 1147 | + } |
---|
| 1148 | + bezierItem = menu.add(new MenuItem("Bezier Patch")); |
---|
| 1149 | + bezierItem.addActionListener(this); |
---|
| 1150 | + overlayItem = menu.add(new MenuItem("Overlay")); |
---|
| 1151 | + overlayItem.addActionListener(this); |
---|
1088 | 1152 | lightItem = menu.add(new MenuItem("Light")); |
---|
1089 | 1153 | lightItem.addActionListener(this); |
---|
1090 | 1154 | menu.add("-"); |
---|
.. | .. |
---|
1094 | 1158 | loopItem.addActionListener(this); |
---|
1095 | 1159 | doubleItem = menu.add(new MenuItem("Fork")); |
---|
1096 | 1160 | doubleItem.addActionListener(this); |
---|
| 1161 | + if (Globals.ADVANCED) |
---|
| 1162 | + { |
---|
1097 | 1163 | tripleItem = menu.add(new MenuItem("Trident")); |
---|
1098 | 1164 | tripleItem.addActionListener(this); |
---|
| 1165 | + } |
---|
1099 | 1166 | } |
---|
1100 | 1167 | |
---|
1101 | 1168 | void buildToolsMenu(Menu menu) |
---|
.. | .. |
---|
1109 | 1176 | parseverticesItem.addActionListener(this); |
---|
1110 | 1177 | textureFieldItem = menu.add(new MenuItem("Texture Field")); |
---|
1111 | 1178 | textureFieldItem.addActionListener(this); |
---|
1112 | | - alignItem = menu.add(new MenuItem("Align")); |
---|
| 1179 | + alignItem = menu.add(new MenuItem("Align Objects")); |
---|
1113 | 1180 | alignItem.addActionListener(this); |
---|
1114 | | - mirrorItem = menu.add(new MenuItem("Mirror Poses")); |
---|
1115 | | - mirrorItem.addActionListener(this); |
---|
1116 | 1181 | reduceMorphItem = menu.add(new MenuItem("Reduce Morphs")); |
---|
1117 | 1182 | reduceMorphItem.addActionListener(this); |
---|
1118 | 1183 | reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)")); |
---|
1119 | 1184 | reduce34MorphItem.addActionListener(this); |
---|
1120 | | - |
---|
| 1185 | + menu.add("-"); |
---|
1121 | 1186 | menu.add(computeAOItem = new MenuItem("Compute AO")); |
---|
1122 | 1187 | computeAOItem.addActionListener(this); |
---|
1123 | | - menu.add("-"); |
---|
1124 | 1188 | |
---|
| 1189 | + if (Globals.ADVANCED) |
---|
| 1190 | + { |
---|
| 1191 | + mirrorItem = menu.add(new MenuItem("Mirror Poses")); |
---|
| 1192 | + mirrorItem.addActionListener(this); |
---|
| 1193 | + menu.add("-"); |
---|
1125 | 1194 | menu.add(memoryItem = new MenuItem("Memory Usage")); |
---|
1126 | 1195 | memoryItem.addActionListener(this); |
---|
1127 | 1196 | menu.add(analyzeItem = new MenuItem("Analyze")); |
---|
.. | .. |
---|
1144 | 1213 | menu.add("-"); |
---|
1145 | 1214 | menu.add(editScriptItem = new MenuItem("Edit Script...")); |
---|
1146 | 1215 | editScriptItem.addActionListener(this); |
---|
| 1216 | + } |
---|
1147 | 1217 | } |
---|
1148 | 1218 | |
---|
1149 | 1219 | void ScreenFit() |
---|
.. | .. |
---|
1472 | 1542 | |
---|
1473 | 1543 | void Overwrite(int mask) |
---|
1474 | 1544 | { |
---|
1475 | | - if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1) |
---|
| 1545 | + if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1) |
---|
1476 | 1546 | { |
---|
1477 | | - Object3D content = GrafreeD.clipboard.get(0); |
---|
| 1547 | + Object3D content = Grafreed.clipboard.get(0); |
---|
1478 | 1548 | |
---|
1479 | 1549 | if (content instanceof cGroup && ((cGroup)content).transientlink ) |
---|
1480 | 1550 | content = ((cGroup)content).get(0); |
---|
.. | .. |
---|
1645 | 1715 | { |
---|
1646 | 1716 | makeSomething(new BezierSurface()); |
---|
1647 | 1717 | } else |
---|
1648 | | - if (source == checkerItem) |
---|
| 1718 | + if (source == overlayItem) |
---|
1649 | 1719 | { |
---|
1650 | 1720 | /* |
---|
1651 | 1721 | Object3D obj = new BezierSurface(5,8); |
---|
.. | .. |
---|
1794 | 1864 | } else |
---|
1795 | 1865 | if (source == importOBJItem) |
---|
1796 | 1866 | { |
---|
1797 | | - objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ"); |
---|
| 1867 | + //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ"); |
---|
| 1868 | + FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD); |
---|
| 1869 | + browser.setVisible(true); |
---|
| 1870 | + String filename = browser.getFile(); |
---|
| 1871 | + if (filename != null && filename.length() > 0) |
---|
| 1872 | + { |
---|
| 1873 | + String fullname = browser.getDirectory() + filename; |
---|
| 1874 | + makeSomething(ReadOBJ(fullname), true); |
---|
| 1875 | + } |
---|
1798 | 1876 | } else |
---|
1799 | 1877 | if (source == computeAOItem) |
---|
1800 | 1878 | { |
---|
.. | .. |
---|
1814 | 1892 | if (source == invariantsItem) |
---|
1815 | 1893 | { |
---|
1816 | 1894 | System.out.println("Invariants:"); |
---|
1817 | | - GrafreeD.grafreeD.universe.invariants(); |
---|
| 1895 | + Grafreed.grafreeD.universe.invariants(); |
---|
1818 | 1896 | } else |
---|
1819 | 1897 | if (source == memoryItem) |
---|
1820 | 1898 | { |
---|
.. | .. |
---|
1832 | 1910 | if (source == dumpItem) |
---|
1833 | 1911 | { |
---|
1834 | 1912 | DumpObject(); |
---|
| 1913 | + } else |
---|
| 1914 | + if (source == oneStepButton) |
---|
| 1915 | + { |
---|
| 1916 | + Globals.ONESTEP = true; |
---|
| 1917 | + cameraView.repaint(); |
---|
1835 | 1918 | } else |
---|
1836 | 1919 | if (source == screenfitButton) |
---|
1837 | 1920 | { |
---|
.. | .. |
---|
1884 | 1967 | } else |
---|
1885 | 1968 | if (source == duplicateItem) |
---|
1886 | 1969 | { |
---|
1887 | | - Object3D keep = GrafreeD.clipboard; |
---|
| 1970 | + Object3D keep = Grafreed.clipboard; |
---|
1888 | 1971 | loadClipboard(false); |
---|
1889 | 1972 | paste(false); |
---|
1890 | | - GrafreeD.clipboard = keep; |
---|
| 1973 | + Grafreed.clipboard = keep; |
---|
1891 | 1974 | } else |
---|
1892 | 1975 | if (source == cloneItem) |
---|
1893 | 1976 | { |
---|
.. | .. |
---|
1905 | 1988 | { |
---|
1906 | 1989 | paste(false); |
---|
1907 | 1990 | } else |
---|
| 1991 | + if (source == pasteIntoItem) |
---|
| 1992 | + { |
---|
| 1993 | + pasteInto(true, false); |
---|
| 1994 | + } else |
---|
1908 | 1995 | if (source == pasteLinkItem) |
---|
1909 | 1996 | { |
---|
1910 | | - pasteInto(false); |
---|
| 1997 | + pasteInto(false, false); |
---|
1911 | 1998 | } else |
---|
1912 | 1999 | if (source == pasteCloneItem) |
---|
1913 | 2000 | { |
---|
1914 | | - pasteInto(true); |
---|
| 2001 | + pasteInto(true, true); |
---|
1915 | 2002 | } else |
---|
1916 | 2003 | if (source == pasteExpandItem) |
---|
1917 | 2004 | { |
---|
.. | .. |
---|
2103 | 2190 | // group.selection.get(0).setMasterThis(content); // should be identity |
---|
2104 | 2191 | // refreshContents(); |
---|
2105 | 2192 | // } |
---|
2106 | | - if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1) |
---|
| 2193 | + if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1) |
---|
2107 | 2194 | { |
---|
2108 | | - Object3D content = GrafreeD.clipboard.get(0); |
---|
| 2195 | + Object3D content = Grafreed.clipboard.get(0); |
---|
2109 | 2196 | |
---|
2110 | 2197 | if (content instanceof cGroup && ((cGroup)content).transientlink ) |
---|
2111 | 2198 | content = ((cGroup)content).get(0); |
---|
.. | .. |
---|
2113 | 2200 | Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR)); |
---|
2114 | 2201 | for (int i=0; i<group.selection.size(); i++) |
---|
2115 | 2202 | { |
---|
2116 | | - boolean random = CameraPane.RANDOM; |
---|
2117 | | - CameraPane.RANDOM = false; // parse all random nodes |
---|
| 2203 | + boolean random = CameraPane.SWITCH; |
---|
| 2204 | + CameraPane.SWITCH = false; // parse all random nodes |
---|
2118 | 2205 | group.selection.get(i).linkVerticesThis(content); |
---|
2119 | 2206 | // group.selection.get(i).setMasterThis(content); // should be identity |
---|
2120 | | - CameraPane.RANDOM = random; |
---|
| 2207 | + CameraPane.SWITCH = random; |
---|
2121 | 2208 | } |
---|
2122 | 2209 | Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR)); |
---|
2123 | 2210 | refreshContents(); |
---|
.. | .. |
---|
2127 | 2214 | { |
---|
2128 | 2215 | for (int i=0; i<group.selection.size(); i++) |
---|
2129 | 2216 | { |
---|
2130 | | - boolean random = CameraPane.RANDOM; |
---|
2131 | | - CameraPane.RANDOM = false; // parse all random nodes |
---|
| 2217 | + boolean random = CameraPane.SWITCH; |
---|
| 2218 | + CameraPane.SWITCH = false; // parse all random nodes |
---|
2132 | 2219 | group.selection.get(i).linkVerticesThis(null); |
---|
2133 | | - CameraPane.RANDOM = random; |
---|
| 2220 | + CameraPane.SWITCH = random; |
---|
2134 | 2221 | } |
---|
2135 | 2222 | |
---|
2136 | 2223 | refreshContents(); |
---|
2137 | 2224 | } else |
---|
2138 | 2225 | if (source == relinkverticesItem) |
---|
2139 | 2226 | { |
---|
2140 | | - boolean random = CameraPane.RANDOM; |
---|
2141 | | - CameraPane.RANDOM = false; // parse all random nodes |
---|
| 2227 | + boolean random = CameraPane.SWITCH; |
---|
| 2228 | + CameraPane.SWITCH = false; // parse all random nodes |
---|
2142 | 2229 | group.selection.RelinkToSupport(); |
---|
2143 | | - CameraPane.RANDOM = random; |
---|
| 2230 | + CameraPane.SWITCH = random; |
---|
2144 | 2231 | |
---|
2145 | 2232 | refreshContents(); |
---|
2146 | 2233 | } else |
---|
.. | .. |
---|
2155 | 2242 | } else |
---|
2156 | 2243 | if (source == setMasterItem) |
---|
2157 | 2244 | { |
---|
2158 | | - if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1) |
---|
| 2245 | + if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1) |
---|
2159 | 2246 | { |
---|
2160 | | - Object3D content = GrafreeD.clipboard.get(0); |
---|
| 2247 | + Object3D content = Grafreed.clipboard.get(0); |
---|
2161 | 2248 | |
---|
2162 | 2249 | if (content instanceof cGroup && ((cGroup)content).transientlink ) |
---|
2163 | 2250 | content = ((cGroup)content).get(0); |
---|
.. | .. |
---|
2170 | 2257 | { |
---|
2171 | 2258 | if (group.selection.size() == 1) |
---|
2172 | 2259 | { |
---|
2173 | | - if (GrafreeD.clipboard.size() == 1) |
---|
| 2260 | + if (Grafreed.clipboard.size() == 1) |
---|
2174 | 2261 | { |
---|
2175 | | - Object3D content = GrafreeD.clipboard.get(0); |
---|
| 2262 | + Object3D content = Grafreed.clipboard.get(0); |
---|
2176 | 2263 | |
---|
2177 | 2264 | if (content instanceof cGroup && ((cGroup)content).transientlink ) |
---|
2178 | 2265 | content = ((cGroup)content).get(0); |
---|
.. | .. |
---|
2238 | 2325 | RandomNode random = new RandomNode(); |
---|
2239 | 2326 | group(random); |
---|
2240 | 2327 | if (random.size() > 0) |
---|
2241 | | - random.name = random.get(0).name + "Rnd"; |
---|
| 2328 | + random.name = random.get(0).name + "Switch"; |
---|
2242 | 2329 | } else |
---|
2243 | 2330 | if (source == physicsItem) |
---|
2244 | 2331 | { |
---|
.. | .. |
---|
2895 | 2982 | |
---|
2896 | 2983 | child.editWindow = null; // ??????????? |
---|
2897 | 2984 | } |
---|
2898 | | - objEditor.ctrlPanel.validate(); |
---|
| 2985 | + objEditor.ctrlPanel.FlushUI(); |
---|
2899 | 2986 | //objEditor.jTree.clearSelection(); |
---|
2900 | 2987 | //objEditor.ResetSliders(); |
---|
2901 | 2988 | refreshContents(true); |
---|
.. | .. |
---|
3251 | 3338 | obj = (Object3D)e.nextElement(); |
---|
3252 | 3339 | |
---|
3253 | 3340 | System.out.println("Object is: " + obj); |
---|
3254 | | - GrafreeD.AnalyzeObject(obj); |
---|
| 3341 | + Grafreed.AnalyzeObject(obj); |
---|
3255 | 3342 | System.out.println("Boundary rep: " + obj.bRep); |
---|
3256 | | - GrafreeD.AnalyzeObject(obj.bRep); |
---|
| 3343 | + Grafreed.AnalyzeObject(obj.bRep); |
---|
3257 | 3344 | |
---|
3258 | 3345 | // System.err.println((size/1024) + " KB is the size of " + obj); |
---|
3259 | 3346 | } |
---|
.. | .. |
---|
3467 | 3554 | |
---|
3468 | 3555 | void ParseVertices() |
---|
3469 | 3556 | { |
---|
3470 | | - boolean epsequal = GrafreeD.epsequal; |
---|
3471 | | - GrafreeD.epsequal = true; |
---|
| 3557 | + boolean epsequal = Grafreed.epsequal; |
---|
| 3558 | + Grafreed.epsequal = true; |
---|
3472 | 3559 | |
---|
3473 | 3560 | for (int i=0; i<group.selection.size(); i++) |
---|
3474 | 3561 | { |
---|
.. | .. |
---|
3493 | 3580 | LA.matTranslate(g.toParent, temp.x, temp.y, temp.z); |
---|
3494 | 3581 | LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z); |
---|
3495 | 3582 | |
---|
3496 | | - g.add(GrafreeD.clipboard); |
---|
| 3583 | + g.add(Grafreed.clipboard); |
---|
3497 | 3584 | |
---|
3498 | 3585 | buffer.add(g); |
---|
3499 | 3586 | } |
---|
.. | .. |
---|
3508 | 3595 | makeSomething(buffer, i==group.selection.size()-1); |
---|
3509 | 3596 | } |
---|
3510 | 3597 | |
---|
3511 | | - GrafreeD.epsequal = epsequal; |
---|
| 3598 | + Grafreed.epsequal = epsequal; |
---|
3512 | 3599 | |
---|
3513 | 3600 | refreshContents(); |
---|
3514 | 3601 | } |
---|
.. | .. |
---|
3614 | 3701 | |
---|
3615 | 3702 | SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY); |
---|
3616 | 3703 | |
---|
3617 | | - boolean random = CameraPane.RANDOM; |
---|
3618 | | - CameraPane.RANDOM = false; // parse all random nodes |
---|
| 3704 | + boolean random = CameraPane.SWITCH; |
---|
| 3705 | + CameraPane.SWITCH = false; // parse all random nodes |
---|
3619 | 3706 | lowres.linkVerticesThis(null); |
---|
3620 | 3707 | lowres.linkVerticesThis(sn); |
---|
3621 | | - CameraPane.RANDOM = random; |
---|
| 3708 | + CameraPane.SWITCH = random; |
---|
3622 | 3709 | |
---|
3623 | 3710 | System.err.flush(); |
---|
3624 | 3711 | |
---|
.. | .. |
---|
3658 | 3745 | return; |
---|
3659 | 3746 | |
---|
3660 | 3747 | Object3D poses = group.selection.get(0); |
---|
3661 | | - Object3D ref = GrafreeD.clipboard.get(0); |
---|
| 3748 | + Object3D ref = Grafreed.clipboard.get(0); |
---|
3662 | 3749 | |
---|
3663 | 3750 | Object3D newgroup = new Object3D("Po:" + poses.name); |
---|
3664 | 3751 | |
---|
.. | .. |
---|
3852 | 3939 | |
---|
3853 | 3940 | void ClipMesh() |
---|
3854 | 3941 | { |
---|
3855 | | - if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1) |
---|
| 3942 | + if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1) |
---|
3856 | 3943 | { |
---|
3857 | | - Object3D content = GrafreeD.clipboard.get(0); |
---|
| 3944 | + Object3D content = Grafreed.clipboard.get(0); |
---|
3858 | 3945 | |
---|
3859 | 3946 | if (content instanceof cGroup && ((cGroup)content).transientlink ) |
---|
3860 | 3947 | content = ((cGroup)content).get(0); |
---|
.. | .. |
---|
3863 | 3950 | // { |
---|
3864 | 3951 | // group.selection.get(i).ClipMesh(GrafreeD.clipboard); |
---|
3865 | 3952 | // } |
---|
3866 | | - group.selection.ClipMesh(GrafreeD.clipboard); |
---|
| 3953 | + group.selection.ClipMesh(Grafreed.clipboard); |
---|
3867 | 3954 | } |
---|
3868 | 3955 | // group.selection.ClipMesh(GrafreeD.clipboard); |
---|
3869 | 3956 | System.out.println("DONE."); |
---|
.. | .. |
---|
4203 | 4290 | { |
---|
4204 | 4291 | if (group.selection.isEmpty()) |
---|
4205 | 4292 | return; |
---|
4206 | | - GrafreeD.clipboardIsTempGroup = false; |
---|
| 4293 | + Grafreed.clipboardIsTempGroup = false; |
---|
4207 | 4294 | Composite tGroup = null; |
---|
4208 | 4295 | if (group.selection.size() > 0) // 1) |
---|
4209 | 4296 | { |
---|
4210 | 4297 | tGroup = new cGroup(); |
---|
4211 | | - GrafreeD.clipboardIsTempGroup = true; |
---|
| 4298 | + Grafreed.clipboardIsTempGroup = true; |
---|
4212 | 4299 | } |
---|
4213 | 4300 | |
---|
4214 | 4301 | if (cut) |
---|
.. | .. |
---|
4248 | 4335 | //System.out.println("cut " + child); |
---|
4249 | 4336 | //System.out.println("parent = " + child.parent); |
---|
4250 | 4337 | // tmp.addChild(child); |
---|
4251 | | - if (GrafreeD.clipboardIsTempGroup) |
---|
| 4338 | + if (Grafreed.clipboardIsTempGroup) |
---|
4252 | 4339 | tGroup.add/*Child*/(tmp); |
---|
4253 | 4340 | else |
---|
4254 | | - GrafreeD.clipboard = tmp; |
---|
| 4341 | + Grafreed.clipboard = tmp; |
---|
4255 | 4342 | } |
---|
4256 | 4343 | else |
---|
4257 | | - if (GrafreeD.clipboardIsTempGroup) |
---|
| 4344 | + if (Grafreed.clipboardIsTempGroup) |
---|
4258 | 4345 | tGroup.add/*Child*/(child); |
---|
4259 | 4346 | else |
---|
4260 | | - GrafreeD.clipboard = child; |
---|
| 4347 | + Grafreed.clipboard = child; |
---|
4261 | 4348 | } |
---|
4262 | 4349 | |
---|
4263 | 4350 | //ResetModel(); |
---|
.. | .. |
---|
4289 | 4376 | //System.out.println("cut " + elem); |
---|
4290 | 4377 | //System.out.println("parent = " + elem.parent); |
---|
4291 | 4378 | // tmp.addChild(elem); |
---|
4292 | | - if (GrafreeD.clipboardIsTempGroup) |
---|
| 4379 | + if (Grafreed.clipboardIsTempGroup) |
---|
4293 | 4380 | tGroup.add/*Child*/(tmp); |
---|
4294 | 4381 | else |
---|
4295 | | - GrafreeD.clipboard = tmp; |
---|
| 4382 | + Grafreed.clipboard = tmp; |
---|
4296 | 4383 | } |
---|
4297 | 4384 | else |
---|
4298 | | - if (GrafreeD.clipboardIsTempGroup) |
---|
| 4385 | + if (Grafreed.clipboardIsTempGroup) |
---|
4299 | 4386 | tGroup.add/*Child*/(child); |
---|
4300 | 4387 | else |
---|
4301 | | - GrafreeD.clipboard = child; |
---|
| 4388 | + Grafreed.clipboard = child; |
---|
4302 | 4389 | } |
---|
4303 | 4390 | |
---|
4304 | 4391 | } |
---|
4305 | | - if (GrafreeD.clipboardIsTempGroup) |
---|
4306 | | - GrafreeD.clipboard = tGroup; |
---|
| 4392 | + if (Grafreed.clipboardIsTempGroup) |
---|
| 4393 | + Grafreed.clipboard = tGroup; |
---|
4307 | 4394 | if (cut) |
---|
4308 | 4395 | { |
---|
4309 | 4396 | ResetModel(); |
---|
.. | .. |
---|
4317 | 4404 | // return; |
---|
4318 | 4405 | boolean first = true; |
---|
4319 | 4406 | |
---|
4320 | | - if (GrafreeD.clipboardIsTempGroup) |
---|
| 4407 | + if (Grafreed.clipboardIsTempGroup) |
---|
4321 | 4408 | { |
---|
4322 | 4409 | Composite temp; |
---|
4323 | 4410 | |
---|
.. | .. |
---|
4328 | 4415 | temp = (Composite)Applet3D.clipboard.deepCopy(); |
---|
4329 | 4416 | */ |
---|
4330 | 4417 | Object3D elem; |
---|
4331 | | - for (Enumeration e = /*temp.children*/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name)) |
---|
| 4418 | + for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name)) |
---|
4332 | 4419 | { |
---|
4333 | 4420 | Object3D child = (Object3D)e.nextElement(); |
---|
4334 | 4421 | |
---|
.. | .. |
---|
4362 | 4449 | //Object3D cb = Applet3D.clipboard; |
---|
4363 | 4450 | //temp.addChild(cb); |
---|
4364 | 4451 | //makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0)); |
---|
4365 | | - assert(GrafreeD.clipboard.parent == null); |
---|
4366 | | - Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent; |
---|
4367 | | - GrafreeD.clipboard.get(0).parent = null; // Avoid copy? |
---|
4368 | | - if (LA.isIdentity(GrafreeD.clipboard.toParent)) |
---|
4369 | | - makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy()); |
---|
| 4452 | + assert(Grafreed.clipboard.parent == null); |
---|
| 4453 | + Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent; |
---|
| 4454 | + Grafreed.clipboard.get(0).parent = null; // Avoid copy? |
---|
| 4455 | + if (LA.isIdentity(Grafreed.clipboard.toParent)) |
---|
| 4456 | + makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy()); |
---|
4370 | 4457 | else |
---|
4371 | | - makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy()); |
---|
4372 | | - GrafreeD.clipboard.get(0).parent = keepparent; |
---|
| 4458 | + makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy()); |
---|
| 4459 | + Grafreed.clipboard.get(0).parent = keepparent; |
---|
4373 | 4460 | } |
---|
4374 | 4461 | |
---|
4375 | 4462 | ResetModel(); |
---|
4376 | 4463 | refreshContents(); |
---|
4377 | 4464 | } |
---|
4378 | 4465 | |
---|
4379 | | - void pasteInto(boolean copyit) |
---|
| 4466 | + void pasteInto(boolean copyit, boolean clone) |
---|
4380 | 4467 | { |
---|
4381 | 4468 | // if (GrafreeD.clipboard == null) |
---|
4382 | 4469 | // return; |
---|
.. | .. |
---|
4405 | 4492 | if (copyit) |
---|
4406 | 4493 | { |
---|
4407 | 4494 | // paste(false); |
---|
4408 | | - CloneClipboard(false); // sept 2014 |
---|
| 4495 | + if (clone) |
---|
| 4496 | + { |
---|
| 4497 | + CloneClipboard(false); // sept 2014 |
---|
| 4498 | + } |
---|
| 4499 | + else |
---|
| 4500 | + { |
---|
| 4501 | + paste(false); |
---|
| 4502 | + } |
---|
4409 | 4503 | } |
---|
4410 | 4504 | else |
---|
4411 | 4505 | { |
---|
4412 | 4506 | boolean first = true; |
---|
4413 | 4507 | |
---|
4414 | | - if (GrafreeD.clipboardIsTempGroup) |
---|
| 4508 | + if (Grafreed.clipboardIsTempGroup) |
---|
4415 | 4509 | { |
---|
4416 | | - Composite temp = (Composite)GrafreeD.clipboard; |
---|
| 4510 | + Composite temp = (Composite)Grafreed.clipboard; |
---|
4417 | 4511 | Object3D copy; |
---|
4418 | 4512 | for (Enumeration e = temp.children.elements(); e.hasMoreElements();) |
---|
4419 | 4513 | { |
---|
.. | .. |
---|
4423 | 4517 | } |
---|
4424 | 4518 | } else |
---|
4425 | 4519 | { |
---|
4426 | | - linkSomething(GrafreeD.clipboard); //.get(0)); |
---|
| 4520 | + linkSomething(Grafreed.clipboard); //.get(0)); |
---|
4427 | 4521 | } |
---|
4428 | 4522 | } |
---|
4429 | 4523 | } |
---|
.. | .. |
---|
4868 | 4962 | |
---|
4869 | 4963 | void ImportVRMLX3D() |
---|
4870 | 4964 | { |
---|
4871 | | - if (GrafreeD.standAlone) |
---|
| 4965 | + if (Grafreed.standAlone) |
---|
4872 | 4966 | { |
---|
4873 | 4967 | /**/ |
---|
4874 | 4968 | FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD); |
---|
.. | .. |
---|
4885 | 4979 | |
---|
4886 | 4980 | String GetFile(String dialogName) |
---|
4887 | 4981 | { |
---|
4888 | | - if (GrafreeD.standAlone) |
---|
| 4982 | + if (Grafreed.standAlone) |
---|
4889 | 4983 | { |
---|
4890 | 4984 | FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD); |
---|
4891 | 4985 | browser.show(); |
---|
.. | .. |
---|
4949 | 5043 | cButton flashSelectionButton; |
---|
4950 | 5044 | cButton editButton; |
---|
4951 | 5045 | cButton uneditButton; |
---|
| 5046 | + JCheckBox allParamsButton; |
---|
4952 | 5047 | cButton clearpanelButton; |
---|
4953 | | - cButton allParamsButton; |
---|
4954 | 5048 | cButton unselectButton; |
---|
4955 | 5049 | |
---|
| 5050 | + cButton oneStepButton; |
---|
| 5051 | + |
---|
4956 | 5052 | cButton screenfitButton; |
---|
4957 | 5053 | cButton screenfitpointButton; |
---|
4958 | 5054 | cButton snapobjectButton; |
---|
.. | .. |
---|
5007 | 5103 | private MenuItem mergeGeometriesItem; |
---|
5008 | 5104 | private MenuItem copyItem; |
---|
5009 | 5105 | private MenuItem pasteItem; |
---|
| 5106 | + private MenuItem pasteIntoItem; |
---|
5010 | 5107 | private MenuItem pasteLinkItem; |
---|
5011 | 5108 | private MenuItem pasteCloneItem; |
---|
5012 | 5109 | private MenuItem pasteExpandItem; |
---|
.. | .. |
---|
5104 | 5201 | private MenuItem blobItem; |
---|
5105 | 5202 | private MenuItem latheItem; |
---|
5106 | 5203 | private MenuItem bezierItem; |
---|
5107 | | - private MenuItem checkerItem; |
---|
| 5204 | + private MenuItem overlayItem; |
---|
5108 | 5205 | private MenuItem meshItem; |
---|
5109 | 5206 | // private MenuItem meshGroupItem; |
---|
5110 | 5207 | private MenuItem springItem; |
---|