Normand Briere
2019-09-04 c8bb659043bfa0ccf9436d7cbbc49255b4c82402
Paste expand.
5 files modified
23 ■■■■■ changed files
CameraPane.java 2 ●●● patch | view | raw | blame | history
Composite.java 4 ●●● patch | view | raw | blame | history
GroupEditor.java 6 ●●●●● patch | view | raw | blame | history
Object3D.java 6 ●●●●● patch | view | raw | blame | history
RandomEditor.java 5 ●●●●● patch | view | raw | blame | history
CameraPane.java
....@@ -14830,7 +14830,7 @@
1483014830 }
1483114831 PingThread pingthread = new PingThread();
1483214832 int delta = 2;
14833
- int speed = 10;
14833
+ int speed = 5;
1483414834 boolean autorepeat = false;
1483514835
1483614836 void GoDown(int mod)
Composite.java
....@@ -279,7 +279,9 @@
279279
280280 Composite compo = new Composite();
281281
282
- super.deepCopySelf(compo);
282
+ super.deepCopyNode(compo);
283
+
284
+ compo.count = 2;
283285
284286 for (int i = 0; i < Children().size(); i++)
285287 {
GroupEditor.java
....@@ -557,8 +557,10 @@
557557 pasteLinkItem.addActionListener(this);
558558 pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
559559 pasteCloneItem.addActionListener(this);
560
-// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
561
-// pasteExpandItem.addActionListener(this);
560
+// CRASH
561
+ pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
562
+//
563
+ pasteExpandItem.addActionListener(this);
562564 //menu.add("-");
563565 oe.jTree.popup.addSeparator();
564566
Object3D.java
....@@ -1303,8 +1303,10 @@
13031303
13041304 // will share the geometry
13051305 assert (!(this instanceof Composite));
1306
- return deepCopy(); // Never called for Composite
1307
-
1306
+
1307
+ Object3D obj = deepCopy(); // Never called for Composite
1308
+ obj.count = 2;
1309
+ return obj;
13081310 }
13091311
13101312 boolean HasLoops()
RandomEditor.java
....@@ -141,9 +141,8 @@
141141 itemField.setMinimum(0);
142142 itemField.setMaximum(randomnode.Size() - 1);
143143 itemField.setInteger(randomnode.rndIndex);
144
-
145
- itemField.validate();
146
- // objEditor.refreshContents();
144
+
145
+ // objEditor.refreshContents();
147146 }
148147
149148 RandomNode randomnode;