Normand Briere
2019-07-18 d7a17c35c443e2cb6c09eaa3cfeaf590a571faa1
CameraPane.java
....@@ -2065,7 +2065,7 @@
20652065 //System.err.println("Oeil on");
20662066 OEIL = true;
20672067 if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2068
- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2068
+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
20692069 //pingthread.StepToTarget(true);
20702070 }
20712071
....@@ -11028,9 +11028,9 @@
1102811028
1102911029 gl.glMatrixMode(GL.GL_MODELVIEW);
1103011030
11031
-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11032
-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
11033
-//gl.glEnable(gl.GL_MULTISAMPLE);
11031
+gl.glEnable(gl.GL_POLYGON_SMOOTH);
11032
+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11033
+gl.glEnable(gl.GL_MULTISAMPLE);
1103411034 } else
1103511035 {
1103611036 //gl.glDisable(GL.GL_TEXTURE_2D);
....@@ -11041,7 +11041,7 @@
1104111041 //System.out.println("BLENDING ON");
1104211042 gl.glEnable(GL.GL_BLEND);
1104311043 gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11044
-
11044
+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
1104511045 gl.glMatrixMode(gl.GL_PROJECTION);
1104611046 gl.glLoadIdentity();
1104711047
....@@ -11527,7 +11527,7 @@
1152711527 if ((TRACK || SHADOWTRACK) || zoomonce)
1152811528 {
1152911529 if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11530
- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11530
+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1153111531 pingthread.StepToTarget(true); // true);
1153211532 // zoomonce = false;
1153311533 }
....@@ -13943,7 +13943,7 @@
1394313943
1394413944 // fev 2014???
1394513945 if ((TRACK || SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13946
- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13946
+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1394713947 pingthread.StepToTarget(true); // true);
1394813948 }
1394913949 // if (!LIVE)
....@@ -14297,12 +14297,12 @@
1429714297 void GoDown(int mod)
1429814298 {
1429914299 MODIFIERS |= COMMAND;
14300
- /*
14300
+ /**/
1430114301 if((mod&SHIFT) == SHIFT)
1430214302 manipCamera.RotatePosition(0, -speed);
1430314303 else
14304
- manipCamera.BackForth(0, -speed*delta, getWidth());
14305
- */
14304
+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14305
+ /**/
1430614306 if ((mod & SHIFT) == SHIFT)
1430714307 {
1430814308 mouseMode = mouseMode; // VR??
....@@ -14318,12 +14318,12 @@
1431814318 void GoUp(int mod)
1431914319 {
1432014320 MODIFIERS |= COMMAND;
14321
- /*
14321
+ /**/
1432214322 if((mod&SHIFT) == SHIFT)
1432314323 manipCamera.RotatePosition(0, speed);
1432414324 else
14325
- manipCamera.BackForth(0, speed*delta, getWidth());
14326
- */
14325
+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14326
+ /**/
1432714327 if ((mod & SHIFT) == SHIFT)
1432814328 {
1432914329 mouseMode = mouseMode;
....@@ -14339,12 +14339,12 @@
1433914339 void GoLeft(int mod)
1434014340 {
1434114341 MODIFIERS |= COMMAND;
14342
- /*
14342
+ /**/
1434314343 if((mod&SHIFT) == SHIFT)
14344
- manipCamera.RotatePosition(speed, 0);
14345
- else
1434614344 manipCamera.Translate(speed*delta, 0, getWidth());
14347
- */
14345
+ else
14346
+ manipCamera.RotatePosition(speed, 0);
14347
+ /**/
1434814348 if ((mod & SHIFT) == SHIFT)
1434914349 {
1435014350 mouseMode = mouseMode;
....@@ -14360,12 +14360,12 @@
1436014360 void GoRight(int mod)
1436114361 {
1436214362 MODIFIERS |= COMMAND;
14363
- /*
14363
+ /**/
1436414364 if((mod&SHIFT) == SHIFT)
14365
- manipCamera.RotatePosition(-speed, 0);
14366
- else
1436714365 manipCamera.Translate(-speed*delta, 0, getWidth());
14368
- */
14366
+ else
14367
+ manipCamera.RotatePosition(-speed, 0);
14368
+ /**/
1436914369 if ((mod & SHIFT) == SHIFT)
1437014370 {
1437114371 mouseMode = mouseMode;
....@@ -14604,7 +14604,8 @@
1460414604 Globals.MOUSEDRAGGED = false;
1460514605
1460614606 movingcamera = false;
14607
- X = Y = 0;
14607
+ X = 0; // getBounds().width/2;
14608
+ Y = 0; // getBounds().height/2;
1460814609 //System.out.println("mouseReleased: " + e);
1460914610 clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1461014611 }
....@@ -14945,7 +14946,9 @@
1494514946 case 'E' : COMPACT ^= true;
1494614947 repaint();
1494714948 break;
14948
- case 'W' : DEBUGHSB ^= true;
14949
+ case 'W' : // Wide Window (fullscreen)
14950
+ //DEBUGHSB ^= true;
14951
+ ObjEditor.theFrame.ToggleFullScreen();
1494914952 repaint();
1495014953 break;
1495114954 case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
....@@ -14971,13 +14974,7 @@
1497114974 repaint();
1497214975 break;
1497314976 case 'l':
14974
- lightMode ^= true;
14975
- Globals.lighttouched = true;
14976
- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14977
- targetLookAt.set(manipCamera.lookAt);
14978
- repaint();
14979
- break;
14980
- case 'L':
14977
+ //case 'L':
1498114978 if (lightMode)
1498214979 {
1498314980 lightMode = false;
....@@ -15124,7 +15121,10 @@
1512415121 // kompactbit = 6;
1512515122 // break;
1512615123 case ' ':
15127
- ObjEditor.theFrame.ToggleFullScreen();
15124
+ lightMode ^= true;
15125
+ Globals.lighttouched = true;
15126
+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15127
+ targetLookAt.set(manipCamera.lookAt);
1512815128 repaint();
1512915129 break;
1513015130 //case '`' :
....@@ -15190,17 +15190,17 @@
1519015190 case '=':
1519115191 IncDepth();
1519215192 //fontsize += 1;
15193
- object.editWindow.refreshContents(true);
15193
+ object.GetWindow().refreshContents(true);
1519415194 maskbit = 6;
1519515195 break;
1519615196 case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
1519715197 DecDepth();
1519815198 maskbit = 5;
1519915199 //if(fontsize > 1) fontsize -= 1;
15200
- if (object.editWindow == null)
15201
- new Exception().printStackTrace();
15202
- else
15203
- object.editWindow.refreshContents(true);
15200
+// if (object.editWindow == null)
15201
+// new Exception().printStackTrace();
15202
+// else
15203
+ object.GetWindow().refreshContents(true);
1520415204 break;
1520515205 case '{':
1520615206 manipCamera.shaper_fovy /= 1.1;
....@@ -15424,7 +15424,7 @@
1542415424 }
1542515425 */
1542615426
15427
- object.editWindow.EditSelection(false);
15427
+ object.GetWindow().EditSelection(false);
1542815428 }
1542915429
1543015430 void SelectParent()
....@@ -15441,10 +15441,10 @@
1544115441 {
1544215442 //selectees.remove(i);
1544315443 System.out.println("select parent of " + elem);
15444
- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
15444
+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
1544515445 } else
1544615446 {
15447
- group.editWindow.Select(elem.GetTreePath(), first, true);
15447
+ group.GetWindow().Select(elem.GetTreePath(), first, true);
1544815448 }
1544915449
1545015450 first = false;
....@@ -15486,12 +15486,12 @@
1548615486 for (int j = 0; j < group.children.size(); j++)
1548715487 {
1548815488 elem = (Object3D) group.children.elementAt(j);
15489
- object.editWindow.Select(elem.GetTreePath(), first, true);
15489
+ object.GetWindow().Select(elem.GetTreePath(), first, true);
1549015490 first = false;
1549115491 }
1549215492 } else
1549315493 {
15494
- object.editWindow.Select(elem.GetTreePath(), first, true);
15494
+ object.GetWindow().Select(elem.GetTreePath(), first, true);
1549515495 }
1549615496
1549715497 first = false;
....@@ -15502,21 +15502,21 @@
1550215502 {
1550315503 //Composite group = (Composite) object;
1550415504 Object3D group = object;
15505
- group.editWindow.loadClipboard(true); // ClearSelection(false);
15505
+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
1550615506 }
1550715507
1550815508 void ResetTransform(int mask)
1550915509 {
1551015510 //Composite group = (Composite) object;
1551115511 Object3D group = object;
15512
- group.editWindow.ResetTransform(mask);
15512
+ group.GetWindow().ResetTransform(mask);
1551315513 }
1551415514
1551515515 void FlipTransform()
1551615516 {
1551715517 //Composite group = (Composite) object;
1551815518 Object3D group = object;
15519
- group.editWindow.FlipTransform();
15519
+ group.GetWindow().FlipTransform();
1552015520 // group.editWindow.ReduceMesh(true);
1552115521 }
1552215522
....@@ -15524,7 +15524,7 @@
1552415524 {
1552515525 //Composite group = (Composite) object;
1552615526 Object3D group = object;
15527
- group.editWindow.PrintMemory();
15527
+ group.GetWindow().PrintMemory();
1552815528 // group.editWindow.ReduceMesh(true);
1552915529 }
1553015530
....@@ -15532,7 +15532,7 @@
1553215532 {
1553315533 //Composite group = (Composite) object;
1553415534 Object3D group = object;
15535
- group.editWindow.ResetCentroid();
15535
+ group.GetWindow().ResetCentroid();
1553615536 }
1553715537
1553815538 void IncDepth()
....@@ -15708,6 +15708,7 @@
1570815708 info.bounds.y += (height - desired) / 2;
1570915709 }
1571015710 }
15711
+
1571115712 info.g = gr;
1571215713 info.camera = renderCamera;
1571315714 /*
....@@ -15717,23 +15718,44 @@
1571715718 */
1571815719 if (!isRenderer)
1571915720 {
15720
- object.drawEditHandles(info, 0);
15721
-
15722
- if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
15721
+ Grafreed.Assert(object != null);
15722
+ Grafreed.Assert(object.selection != null);
15723
+ if (object.selection.Size() > 0)
1572315724 {
15724
- switch (object.selection.get(0).hitSomething)
15725
+ int hitSomething = object.selection.get(0).hitSomething;
15726
+
15727
+ info.DX = 0;
15728
+ info.DY = 0;
15729
+ info.W = 1;
15730
+ if (hitSomething == Object3D.hitCenter)
1572515731 {
15726
- case Object3D.hitCenter: gr.setColor(Color.pink);
15727
- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15728
- break;
15729
- case Object3D.hitRotate: gr.setColor(Color.yellow);
15730
- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15731
- break;
15732
- case Object3D.hitScale: gr.setColor(Color.cyan);
15733
- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15734
- break;
15732
+ info.DX = X;
15733
+ if (X != 0)
15734
+ info.DX -= info.bounds.width/2;
15735
+
15736
+ info.DY = Y;
15737
+ if (Y != 0)
15738
+ info.DY -= info.bounds.height/2;
1573515739 }
15736
-
15740
+
15741
+ object.drawEditHandles(info, 0);
15742
+
15743
+ if (drag && (X != 0 || Y != 0))
15744
+ {
15745
+ switch (hitSomething)
15746
+ {
15747
+ case Object3D.hitCenter: gr.setColor(Color.pink);
15748
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15749
+ break;
15750
+ case Object3D.hitRotate: gr.setColor(Color.yellow);
15751
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15752
+ break;
15753
+ case Object3D.hitScale: gr.setColor(Color.cyan);
15754
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15755
+ break;
15756
+ }
15757
+
15758
+ }
1573715759 }
1573815760 }
1573915761 }
....@@ -16724,7 +16746,7 @@
1672416746 }
1672516747
1672616748 if (!movingcamera && !PAINTMODE)
16727
- object.editWindow.ScreenFitPoint(); // fev 2014
16749
+ object.GetWindow().ScreenFitPoint(); // fev 2014
1672816750
1672916751 if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1673016752 {
....@@ -16736,17 +16758,17 @@
1673616758
1673716759 group.add(paintobj); // link
1673816760
16739
- object.editWindow.SnapObject(group);
16761
+ object.GetWindow().SnapObject(group);
1674016762
16741
- Object3D folder = object.editWindow.copy;
16763
+ Object3D folder = object.GetWindow().copy;
1674216764
16743
- if (object.editWindow.copy.selection.Size() > 0)
16744
- folder = object.editWindow.copy.selection.elementAt(0);
16765
+ if (object.GetWindow().copy.selection.Size() > 0)
16766
+ folder = object.GetWindow().copy.selection.elementAt(0);
1674516767
1674616768 folder.add(group);
1674716769
16748
- object.editWindow.ResetModel();
16749
- object.editWindow.refreshContents();
16770
+ object.GetWindow().ResetModel();
16771
+ object.GetWindow().refreshContents();
1675016772 }
1675116773 else
1675216774 paintcount = 0;