davidcl pushed to scirenderer (f21). "Update to Scilab 5.5.2 version"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Apr 2 17:13:54 UTC 2015
>From 11124fe3fb31492b64b45a9dab5c3e7b0fc3dc9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?=
<clement.david at scilab-enterprises.com>
Date: Thu, 2 Apr 2015 19:01:12 +0200
Subject: Update to Scilab 5.5.2 version
diff --git a/scirenderer-0001-update-to-scilab-version.patch b/scirenderer-0001-update-to-scilab-version.patch
index b7fdc7a..f2b6af9 100644
--- a/scirenderer-0001-update-to-scilab-version.patch
+++ b/scirenderer-0001-update-to-scilab-version.patch
@@ -1,6 +1,6 @@
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/buffers/BuffersManager.java scirenderer-scilab/src/org/scilab/forge/scirenderer/buffers/BuffersManager.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/buffers/BuffersManager.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/buffers/BuffersManager.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/buffers/BuffersManager.java 2014-11-26 08:30:14.889018161 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -19,7 +19,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/buffers/BuffersMan
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/buffers/DataBuffer.java scirenderer-scilab/src/org/scilab/forge/scirenderer/buffers/DataBuffer.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/buffers/DataBuffer.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/buffers/DataBuffer.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/buffers/DataBuffer.java 2014-11-26 08:30:14.889018161 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -39,7 +39,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/buffers/DataBuffer
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/buffers/ElementsBuffer.java scirenderer-scilab/src/org/scilab/forge/scirenderer/buffers/ElementsBuffer.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/buffers/ElementsBuffer.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/buffers/ElementsBuffer.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/buffers/ElementsBuffer.java 2014-11-26 08:30:14.889018161 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -59,7 +59,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/buffers/ElementsBu
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/buffers/IndicesBuffer.java scirenderer-scilab/src/org/scilab/forge/scirenderer/buffers/IndicesBuffer.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/buffers/IndicesBuffer.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/buffers/IndicesBuffer.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/buffers/IndicesBuffer.java 2014-11-26 08:30:14.889018161 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -71,7 +71,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/buffers/IndicesBuf
package org.scilab.forge.scirenderer.buffers;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/Canvas.java scirenderer-scilab/src/org/scilab/forge/scirenderer/Canvas.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/Canvas.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/Canvas.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/Canvas.java 2014-11-26 08:30:14.889018161 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -83,7 +83,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/Canvas.java sciren
package org.scilab.forge.scirenderer;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/clipping/ClippingManager.java scirenderer-scilab/src/org/scilab/forge/scirenderer/clipping/ClippingManager.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/clipping/ClippingManager.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/clipping/ClippingManager.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/clipping/ClippingManager.java 2014-11-26 08:30:14.889018161 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -95,7 +95,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/clipping/ClippingM
package org.scilab.forge.scirenderer.clipping;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/clipping/ClippingPlane.java scirenderer-scilab/src/org/scilab/forge/scirenderer/clipping/ClippingPlane.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/clipping/ClippingPlane.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/clipping/ClippingPlane.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/clipping/ClippingPlane.java 2014-11-26 08:30:14.890018160 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -107,7 +107,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/clipping/ClippingP
package org.scilab.forge.scirenderer.clipping;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/data/AbstractDataProvider.java scirenderer-scilab/src/org/scilab/forge/scirenderer/data/AbstractDataProvider.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/data/AbstractDataProvider.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/data/AbstractDataProvider.java 2014-10-28 17:15:06.743213714 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/data/AbstractDataProvider.java 2014-11-26 08:30:14.890018160 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -119,7 +119,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/data/AbstractDataP
package org.scilab.forge.scirenderer.data;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/data/DataProvider.java scirenderer-scilab/src/org/scilab/forge/scirenderer/data/DataProvider.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/data/DataProvider.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/data/DataProvider.java 2014-10-28 17:15:06.743213714 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/data/DataProvider.java 2014-11-26 08:30:14.890018160 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -131,7 +131,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/data/DataProvider.
package org.scilab.forge.scirenderer.data;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/data/DataUser.java scirenderer-scilab/src/org/scilab/forge/scirenderer/data/DataUser.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/data/DataUser.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/data/DataUser.java 2014-10-28 17:15:06.743213714 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/data/DataUser.java 2014-11-26 08:30:14.890018160 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -143,7 +143,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/data/DataUser.java
package org.scilab.forge.scirenderer.data;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/Drawer.java scirenderer-scilab/src/org/scilab/forge/scirenderer/Drawer.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/Drawer.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/Drawer.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/Drawer.java 2014-11-26 08:30:14.889018161 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -155,7 +155,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/Drawer.java sciren
package org.scilab.forge.scirenderer;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/DrawingTools.java scirenderer-scilab/src/org/scilab/forge/scirenderer/DrawingTools.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/DrawingTools.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/DrawingTools.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/DrawingTools.java 2014-11-26 08:30:14.889018161 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -176,7 +176,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/DrawingTools.java
* Draw the given texture at given position.
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/buffers/G2DBuffersManager.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/buffers/G2DBuffersManager.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/buffers/G2DBuffersManager.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/buffers/G2DBuffersManager.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/buffers/G2DBuffersManager.java 2014-11-26 08:30:14.890018160 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -215,7 +215,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
return null;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/buffers/G2DElementsBuffer.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/buffers/G2DElementsBuffer.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/buffers/G2DElementsBuffer.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/buffers/G2DElementsBuffer.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/buffers/G2DElementsBuffer.java 2014-11-26 08:30:14.890018160 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -227,7 +227,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
package org.scilab.forge.scirenderer.implementation.g2d.buffers;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/buffers/G2DIndicesBuffer.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/buffers/G2DIndicesBuffer.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/buffers/G2DIndicesBuffer.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/buffers/G2DIndicesBuffer.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/buffers/G2DIndicesBuffer.java 2014-11-26 08:30:14.890018160 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -256,7 +256,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
data = null;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/clipping/G2DClippingManager.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/clipping/G2DClippingManager.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/clipping/G2DClippingManager.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/clipping/G2DClippingManager.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/clipping/G2DClippingManager.java 2014-11-26 08:30:14.890018160 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -268,7 +268,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
package org.scilab.forge.scirenderer.implementation.g2d.clipping;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/clipping/G2DClippingPlane.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/clipping/G2DClippingPlane.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/clipping/G2DClippingPlane.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/clipping/G2DClippingPlane.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/clipping/G2DClippingPlane.java 2014-11-26 08:30:14.891018160 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -339,7 +339,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/G2DCanvasFactory.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/G2DCanvasFactory.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/G2DCanvasFactory.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/G2DCanvasFactory.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/G2DCanvasFactory.java 2014-11-26 08:30:14.890018160 +0100
@@ -6,15 +6,13 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -359,7 +359,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
*/
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/G2DCanvas.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/G2DCanvas.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/G2DCanvas.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/G2DCanvas.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/G2DCanvas.java 2014-11-26 08:30:14.890018160 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -393,7 +393,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/G2DDrawingTools.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/G2DDrawingTools.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/G2DDrawingTools.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/G2DDrawingTools.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/G2DDrawingTools.java 2014-11-26 08:30:14.890018160 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -489,7 +489,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
@Override
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/lighting/G2DLight.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/lighting/G2DLight.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/lighting/G2DLight.java 1970-01-01 01:00:00.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/lighting/G2DLight.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/lighting/G2DLight.java 2014-11-26 08:30:14.891018160 +0100
@@ -0,0 +1,144 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -637,7 +637,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
+}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/lighting/G2DLightManager.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/lighting/G2DLightManager.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/lighting/G2DLightManager.java 1970-01-01 01:00:00.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/lighting/G2DLightManager.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/lighting/G2DLightManager.java 2014-11-26 08:30:14.891018160 +0100
@@ -0,0 +1,140 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -781,7 +781,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
+}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/AbstractDrawable3DObject.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/AbstractDrawable3DObject.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/AbstractDrawable3DObject.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/AbstractDrawable3DObject.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/AbstractDrawable3DObject.java 2014-11-26 08:30:14.891018160 +0100
@@ -6,14 +6,16 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -973,7 +973,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/BoundingBox.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/BoundingBox.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/BoundingBox.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/BoundingBox.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/BoundingBox.java 2014-11-26 08:30:14.891018160 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -1014,7 +1014,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
/**
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Clippable.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Clippable.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Clippable.java 1970-01-01 01:00:00.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Clippable.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Clippable.java 2014-11-26 08:30:14.891018160 +0100
@@ -0,0 +1,32 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -1051,7 +1051,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
\ Pas de fin de ligne à la fin du fichier
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/ConvexObject.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/ConvexObject.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/ConvexObject.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/ConvexObject.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/ConvexObject.java 2014-11-26 08:30:14.891018160 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -1124,7 +1124,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/DrawTools.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/DrawTools.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/DrawTools.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/DrawTools.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/DrawTools.java 2014-11-26 08:30:14.891018160 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -1212,7 +1212,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/G2DStroke.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/G2DStroke.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/G2DStroke.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/G2DStroke.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/G2DStroke.java 2014-11-26 08:30:14.891018160 +0100
@@ -6,15 +6,12 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -1286,7 +1286,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
if (t == 0) {
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/InvalidPolygonException.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/InvalidPolygonException.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/InvalidPolygonException.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/InvalidPolygonException.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/InvalidPolygonException.java 2014-11-26 08:30:14.891018160 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -1298,7 +1298,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
package org.scilab.forge.scirenderer.implementation.g2d.motor;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/LightHelper.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/LightHelper.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/LightHelper.java 1970-01-01 01:00:00.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/LightHelper.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/LightHelper.java 2014-11-26 08:30:14.891018160 +0100
@@ -0,0 +1,344 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -1646,7 +1646,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
+}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Motor3D.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Motor3D.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Motor3D.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Motor3D.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Motor3D.java 2014-11-26 08:30:14.892018159 +0100
@@ -1,12 +1,12 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -2051,7 +2051,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/PolyLine.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/PolyLine.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/PolyLine.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/PolyLine.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/PolyLine.java 2014-11-26 08:30:14.892018159 +0100
@@ -1,111 +1,317 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -2459,7 +2459,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Scene.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Scene.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Scene.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Scene.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Scene.java 2014-11-26 08:30:14.892018159 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -2563,7 +2563,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Segment.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Segment.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Segment.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Segment.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Segment.java 2014-11-26 08:30:14.892018159 +0100
@@ -6,46 +6,50 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -2795,7 +2795,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/SpritedRectangle.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/SpritedRectangle.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/SpritedRectangle.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/SpritedRectangle.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/SpritedRectangle.java 2014-11-26 08:30:14.892018159 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -3093,7 +3093,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Triangle.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Triangle.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Triangle.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Triangle.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/motor/Triangle.java 2014-11-26 08:30:14.892018159 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -3380,7 +3380,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/renderer/G2DRenderer.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/renderer/G2DRenderer.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/renderer/G2DRenderer.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/renderer/G2DRenderer.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/renderer/G2DRenderer.java 2014-11-26 08:30:14.892018159 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -3411,7 +3411,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/renderer/G2DRendererManager.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/renderer/G2DRendererManager.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/renderer/G2DRendererManager.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/renderer/G2DRendererManager.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/renderer/G2DRendererManager.java 2014-11-26 08:30:14.892018159 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -3423,7 +3423,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
package org.scilab.forge.scirenderer.implementation.g2d.renderer;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/texture/G2DTextureDrawingTools.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/texture/G2DTextureDrawingTools.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/texture/G2DTextureDrawingTools.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/texture/G2DTextureDrawingTools.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/texture/G2DTextureDrawingTools.java 2014-11-26 08:30:14.892018159 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -3485,7 +3485,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/texture/G2DTextureManager.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/texture/G2DTextureManager.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d/texture/G2DTextureManager.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/texture/G2DTextureManager.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/g2d/texture/G2DTextureManager.java 2014-11-26 08:30:14.893018159 +0100
@@ -6,12 +6,11 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -3932,7 +3932,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/g2d
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java 2014-11-26 08:30:14.893018159 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -3953,7 +3953,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java 2014-11-26 08:30:14.893018159 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -3974,7 +3974,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
dataUploaded = false;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java 2014-11-26 08:30:14.893018159 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -3986,7 +3986,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
package org.scilab.forge.scirenderer.implementation.jogl.buffers;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java 2014-11-26 08:30:14.893018159 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -4007,7 +4007,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
data = null;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java 2014-11-26 08:30:14.893018159 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -4019,7 +4019,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
package org.scilab.forge.scirenderer.implementation.jogl.clipping;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java 2014-11-26 08:30:14.893018159 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -4031,7 +4031,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
package org.scilab.forge.scirenderer.implementation.jogl.clipping;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java 2014-11-26 08:30:14.894018158 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -4204,7 +4204,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/HardwareFailException.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/HardwareFailException.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/HardwareFailException.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/HardwareFailException.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/HardwareFailException.java 2014-11-26 08:30:14.893018159 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -4216,7 +4216,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
package org.scilab.forge.scirenderer.implementation.jogl;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java 2014-11-26 08:30:14.893018159 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -4228,8 +4228,8 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
package org.scilab.forge.scirenderer.implementation.jogl;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java 2014-11-09 17:57:39.449435429 +0100
-@@ -6,7 +6,7 @@
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java 2015-04-02 15:04:23.016395787 +0200
+@@ -6,25 +6,16 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at
@@ -4238,14 +4238,17 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
*/
package org.scilab.forge.scirenderer.implementation.jogl;
-@@ -19,12 +19,14 @@ import org.scilab.forge.scirenderer.impl
- import org.scilab.forge.scirenderer.implementation.jogl.texture.JoGLTextureManager;
- import org.scilab.forge.scirenderer.picking.PickingManager;
-+import com.jogamp.opengl.util.awt.AWTGLReadBufferUtil;
- import com.jogamp.opengl.util.awt.ImageUtil;
+-import org.scilab.forge.scirenderer.Canvas;
+-import org.scilab.forge.scirenderer.Drawer;
+-import org.scilab.forge.scirenderer.implementation.jogl.buffers.JoGLBuffersManager;
+-import org.scilab.forge.scirenderer.implementation.jogl.picking.JoGLPickingManager;
+-import org.scilab.forge.scirenderer.implementation.jogl.renderer.JoGLRendererManager;
+-import org.scilab.forge.scirenderer.implementation.jogl.texture.JoGLTextureManager;
+-import org.scilab.forge.scirenderer.picking.PickingManager;
+-
+-import com.jogamp.opengl.util.awt.ImageUtil;
-import com.jogamp.opengl.util.awt.Screenshot;
-+
import java.awt.Dimension;
import java.awt.image.BufferedImage;
import java.lang.reflect.InvocationTargetException;
@@ -4254,7 +4257,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
import javax.media.opengl.DebugGL2;
import javax.media.opengl.GL2;
import javax.media.opengl.GLAutoDrawable;
-@@ -33,10 +35,9 @@ import javax.media.opengl.GLContext;
+@@ -33,10 +24,19 @@ import javax.media.opengl.GLContext;
import javax.media.opengl.GLDrawableFactory;
import javax.media.opengl.GLEventListener;
import javax.media.opengl.GLException;
@@ -4263,10 +4266,20 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
import javax.media.opengl.GLProfile;
import javax.swing.SwingUtilities;
-import jogamp.opengl.GLContextImpl;
++
++import org.scilab.forge.scirenderer.Canvas;
++import org.scilab.forge.scirenderer.Drawer;
++import org.scilab.forge.scirenderer.implementation.jogl.buffers.JoGLBuffersManager;
++import org.scilab.forge.scirenderer.implementation.jogl.picking.JoGLPickingManager;
++import org.scilab.forge.scirenderer.implementation.jogl.renderer.JoGLRendererManager;
++import org.scilab.forge.scirenderer.implementation.jogl.texture.JoGLTextureManager;
++import org.scilab.forge.scirenderer.picking.PickingManager;
++
++import com.jogamp.opengl.util.awt.AWTGLReadBufferUtil;
/**
* JoGL implementation of a Canvas.
-@@ -155,17 +156,17 @@ public final class JoGLCanvas implements
+@@ -155,17 +155,17 @@ public final class JoGLCanvas implements
@Override
public int getWidth() {
@@ -4287,7 +4300,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
}
@Override
-@@ -175,12 +176,18 @@ public final class JoGLCanvas implements
+@@ -175,12 +175,18 @@ public final class JoGLCanvas implements
@Override
public void redrawAndWait() {
@@ -4310,7 +4323,22 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
} catch (Exception e) { }
}
-@@ -237,31 +244,27 @@ public final class JoGLCanvas implements
+@@ -226,6 +232,14 @@ public final class JoGLCanvas implements
+ * @return an image
+ */
+ public BufferedImage getImage() {
++ return getImage(true);
++ }
++
++ /**
++ * Get an image from the autoDrawable
++ * @return an image
++ */
++ public BufferedImage getImage(final boolean alpha) {
+ while (!canvasAnimator.isDrawFinished() || !displayFinished) {
+ try {
+ Thread.sleep(10);
+@@ -237,31 +251,27 @@ public final class JoGLCanvas implements
final BufferedImage[] image = new BufferedImage[1];
final GLContext context = autoDrawable.getContext();
@@ -4318,8 +4346,8 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
- SwingUtilities.invokeAndWait(new Runnable() {
+ if (SwingUtilities.isEventDispatchThread()) {
+ context.makeCurrent();
-+ AWTGLReadBufferUtil buffer = new AWTGLReadBufferUtil(GLProfile.getDefault(), true);
-+ image[0] = buffer.readPixelsToBufferedImage(getGl(), 0, 0, autoDrawable.getSurfaceWidth(), autoDrawable.getSurfaceHeight(), false);
++ AWTGLReadBufferUtil buffer = new AWTGLReadBufferUtil(GLProfile.getDefault(), alpha);
++ image[0] = buffer.readPixelsToBufferedImage(getGl(), 0, 0, autoDrawable.getSurfaceWidth(), autoDrawable.getSurfaceHeight(), true);
+ context.release();
+ } else {
+ try {
@@ -4327,8 +4355,8 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
public void run() {
context.makeCurrent();
- image[0] = Screenshot.readToBufferedImage(autoDrawable.getWidth(), autoDrawable.getHeight());
-+ AWTGLReadBufferUtil buffer = new AWTGLReadBufferUtil(GLProfile.getDefault(), true);
-+ image[0] = buffer.readPixelsToBufferedImage(getGl(), 0, 0, autoDrawable.getSurfaceWidth(), autoDrawable.getSurfaceHeight(), false);
++ AWTGLReadBufferUtil buffer = new AWTGLReadBufferUtil(GLProfile.getDefault(), alpha);
++ image[0] = buffer.readPixelsToBufferedImage(getGl(), 0, 0, autoDrawable.getSurfaceWidth(), autoDrawable.getSurfaceHeight(), true);
context.release();
}
});
@@ -4357,7 +4385,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
}
return image[0];
-@@ -272,7 +275,7 @@ public final class JoGLCanvas implements
+@@ -272,7 +282,7 @@ public final class JoGLCanvas implements
*/
public void destroy() {
if (isOffscreen) {
@@ -4366,7 +4394,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
}
try {
isValid = false;
-@@ -290,9 +293,11 @@ public final class JoGLCanvas implements
+@@ -290,9 +300,11 @@ public final class JoGLCanvas implements
*/
private static GLAutoDrawable getOffscreenDrawable(int width, int height) {
GLDrawableFactory factory = GLDrawableFactory.getDesktopFactory();
@@ -4381,7 +4409,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
// Implementation of function from GLEventListener.
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java 2014-11-26 08:30:14.893018159 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -4421,7 +4449,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java 2014-11-26 08:30:14.893018159 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -4449,7 +4477,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
@Override
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java 2014-11-26 08:30:14.893018159 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -4476,7 +4504,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
return USE_VBO;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java 2014-11-26 08:30:14.894018158 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -4550,7 +4578,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java 2014-11-26 08:30:14.894018158 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -4607,7 +4635,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java 2014-11-26 08:30:14.894018158 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -4619,7 +4647,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
package org.scilab.forge.scirenderer.implementation.jogl.picking;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingManager.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingManager.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingManager.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingManager.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingManager.java 2014-11-26 08:30:14.894018158 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -4631,7 +4659,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
package org.scilab.forge.scirenderer.implementation.jogl.picking;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java 2014-11-26 08:30:14.894018158 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -4643,7 +4671,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
package org.scilab.forge.scirenderer.implementation.jogl.picking;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java 2014-11-26 08:30:14.894018158 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -4655,7 +4683,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
package org.scilab.forge.scirenderer.implementation.jogl.renderer;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java 2014-11-26 08:30:14.894018158 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -4667,7 +4695,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
package org.scilab.forge.scirenderer.implementation.jogl.renderer;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java 2015-01-08 14:44:23.335210133 +0100
@@ -6,15 +6,14 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -4819,7 +4847,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
/**
* Default constructor.
-@@ -154,12 +181,20 @@ public class JoGLTextureManager implemen
+@@ -154,19 +181,27 @@ public class JoGLTextureManager implemen
public JoGLTexture() {
}
@@ -4840,6 +4868,14 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
GL2 gl = drawingTools.getGl().getGL2();
if (isValid()) {
checkData(drawingTools);
+ if (textures.length == 1) {
+ gl.glEnable(GL2.GL_TEXTURE_2D);
+ gl.glEnable(GL2.GL_BLEND);
+- gl.glBlendFunc(GL2.GL_ONE, GL2.GL_ONE_MINUS_SRC_ALPHA);
++ gl.glBlendFunc(GL2.GL_SRC_ALPHA, GL2.GL_ONE_MINUS_SRC_ALPHA);
+ gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_MODE, GL2.GL_REPLACE);
+
+ textures[0].setTexParameteri(gl, GL2.GL_TEXTURE_MAG_FILTER, getAsGLFilter(getMagnificationFilter(), false));
@@ -178,7 +213,6 @@ public class JoGLTextureManager implemen
textures[0].setTexParameteri(gl, GL2.GL_TEXTURE_WRAP_S, GL2.GL_CLAMP_TO_EDGE);
textures[0].setTexParameteri(gl, GL2.GL_TEXTURE_WRAP_T, GL2.GL_CLAMP_TO_EDGE);
@@ -4973,15 +5009,15 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
+ }
+ textureData = null;
+ }
-+ }
-+
+ }
+
+- public void preDraw(JoGLDrawingTools drawingTools) throws SciRendererException {
+ public void dispose() {
+ if (drawingTools != null) {
+ releaseTextures(drawingTools.getGl().getGL2());
+ }
- }
-
-- public void preDraw(JoGLDrawingTools drawingTools) throws SciRendererException {
++ }
++
+ public boolean preDraw(JoGLDrawingTools drawingTools) throws SciRendererException {
checkData(drawingTools);
+
@@ -4992,15 +5028,20 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
final GL2 gl = drawingTools.getGl().getGL2();
gl.glMatrixMode(GL2.GL_TEXTURE);
-@@ -265,7 +351,6 @@ public class JoGLTextureManager implemen
+@@ -265,9 +351,10 @@ public class JoGLTextureManager implemen
gl.glLoadIdentity();
gl.glEnable(GL2.GL_TEXTURE_2D);
-
gl.glEnable(GL2.GL_BLEND);
- gl.glBlendFunc(GL2.GL_ONE, GL2.GL_ONE_MINUS_SRC_ALPHA);
+- gl.glBlendFunc(GL2.GL_ONE, GL2.GL_ONE_MINUS_SRC_ALPHA);
++
++ // ONE => SRC_ALPHA (fix for bug 13673)
++ gl.glBlendFunc(GL2.GL_SRC_ALPHA, GL2.GL_ONE_MINUS_SRC_ALPHA);
-@@ -287,8 +372,9 @@ public class JoGLTextureManager implemen
+ gl.glEnable(GL2.GL_ALPHA_TEST);
+ gl.glAlphaFunc(GL2.GL_GREATER, 0.0f);
+@@ -287,8 +374,9 @@ public class JoGLTextureManager implemen
textures[k].setTexParameteri(gl, GL2.GL_TEXTURE_WRAP_S, GL2.GL_CLAMP_TO_EDGE);
textures[k].setTexParameteri(gl, GL2.GL_TEXTURE_WRAP_T, GL2.GL_CLAMP_TO_EDGE);
}
@@ -5011,7 +5052,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
}
public void draw(JoGLDrawingTools drawingTools, AnchorPosition anchor, Vector3d position, double rotationAngle) throws SciRendererException {
-@@ -338,6 +424,7 @@ public class JoGLTextureManager implemen
+@@ -338,6 +426,7 @@ public class JoGLTextureManager implemen
gl.glMatrixMode(GL2.GL_PROJECTION);
gl.glPopMatrix();
@@ -5019,7 +5060,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
gl.glMatrixMode(GL2.GL_TEXTURE);
gl.glPopMatrix();
}
-@@ -352,30 +439,73 @@ public class JoGLTextureManager implemen
+@@ -352,30 +441,73 @@ public class JoGLTextureManager implemen
final Dimension textureSize = getDataProvider().getTextureSize();
final GL2 gl = drawingTools.getGl().getGL2();
@@ -5116,7 +5157,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
}
}
}
-@@ -413,12 +543,12 @@ public class JoGLTextureManager implemen
+@@ -413,12 +545,12 @@ public class JoGLTextureManager implemen
private int getAsGLWrappingMode(Texture.Wrap wrappingMode) {
switch (wrappingMode) {
@@ -5135,7 +5176,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
}
}
-@@ -426,27 +556,27 @@ public class JoGLTextureManager implemen
+@@ -426,27 +558,27 @@ public class JoGLTextureManager implemen
int returnedValue;
if (mipmap) {
switch (filter) {
@@ -5181,7 +5222,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
}
}
return returnedValue;
-@@ -454,6 +584,7 @@ public class JoGLTextureManager implemen
+@@ -454,6 +586,7 @@ public class JoGLTextureManager implemen
/** Called when gl context is gone. */
public void glReload() {
@@ -5189,7 +5230,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
textures = null;
upToDate = false;
}
-@@ -466,20 +597,20 @@ public class JoGLTextureManager implemen
+@@ -466,20 +599,20 @@ public class JoGLTextureManager implemen
protected double getAnchorDeltaX(AnchorPosition anchor) {
int spriteWidth = getDataProvider().getTextureSize().width;
switch (anchor) {
@@ -5224,7 +5265,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
}
}
-@@ -491,21 +622,122 @@ public class JoGLTextureManager implemen
+@@ -491,21 +624,122 @@ public class JoGLTextureManager implemen
protected double getAnchorDeltaY(AnchorPosition anchor) {
int spriteHeight = getDataProvider().getTextureSize().height;
switch (anchor) {
@@ -5363,7 +5404,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/utils/G2DShortCuts.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/utils/G2DShortCuts.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/utils/G2DShortCuts.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/utils/G2DShortCuts.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/utils/G2DShortCuts.java 2014-11-26 08:30:14.894018158 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -5375,7 +5416,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
package org.scilab.forge.scirenderer.implementation.jogl.utils;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java 2014-11-26 08:30:14.894018158 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -5396,7 +5437,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/implementation/jog
} else {
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/lightning/Light.java scirenderer-scilab/src/org/scilab/forge/scirenderer/lightning/Light.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/lightning/Light.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/lightning/Light.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/lightning/Light.java 2014-11-26 08:30:14.894018158 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -5428,7 +5469,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/lightning/Light.ja
*/
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/lightning/LightManager.java scirenderer-scilab/src/org/scilab/forge/scirenderer/lightning/LightManager.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/lightning/LightManager.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/lightning/LightManager.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/lightning/LightManager.java 2014-11-26 08:30:14.895018158 +0100
@@ -6,11 +6,13 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -5457,7 +5498,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/lightning/LightMan
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/PackageInfo.java scirenderer-scilab/src/org/scilab/forge/scirenderer/PackageInfo.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/PackageInfo.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/PackageInfo.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/PackageInfo.java 2014-11-26 08:30:14.889018161 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -5469,7 +5510,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/PackageInfo.java s
package org.scilab.forge.scirenderer;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/picking/PickingManager.java scirenderer-scilab/src/org/scilab/forge/scirenderer/picking/PickingManager.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/picking/PickingManager.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/picking/PickingManager.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/picking/PickingManager.java 2014-11-26 08:30:14.895018158 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -5481,7 +5522,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/picking/PickingMan
package org.scilab.forge.scirenderer.picking;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/picking/PickingTask.java scirenderer-scilab/src/org/scilab/forge/scirenderer/picking/PickingTask.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/picking/PickingTask.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/picking/PickingTask.java 2014-10-28 17:15:06.743213714 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/picking/PickingTask.java 2014-11-26 08:30:14.895018158 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -5493,7 +5534,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/picking/PickingTas
package org.scilab.forge.scirenderer.picking;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/picking/PickingTools.java scirenderer-scilab/src/org/scilab/forge/scirenderer/picking/PickingTools.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/picking/PickingTools.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/picking/PickingTools.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/picking/PickingTools.java 2014-11-26 08:30:14.895018158 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -5505,7 +5546,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/picking/PickingToo
package org.scilab.forge.scirenderer.picking;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/renderer/Renderer.java scirenderer-scilab/src/org/scilab/forge/scirenderer/renderer/Renderer.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/renderer/Renderer.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/renderer/Renderer.java 2014-10-28 17:15:06.743213714 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/renderer/Renderer.java 2014-11-26 08:30:14.895018158 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -5517,7 +5558,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/renderer/Renderer.
package org.scilab.forge.scirenderer.renderer;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/renderer/RendererManager.java scirenderer-scilab/src/org/scilab/forge/scirenderer/renderer/RendererManager.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/renderer/RendererManager.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/renderer/RendererManager.java 2014-10-28 17:15:06.743213714 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/renderer/RendererManager.java 2014-11-26 08:30:14.895018158 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -5529,7 +5570,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/renderer/RendererM
package org.scilab.forge.scirenderer.renderer;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/DefaultRulerModel.java scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/DefaultRulerModel.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/DefaultRulerModel.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/DefaultRulerModel.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/DefaultRulerModel.java 2014-11-26 08:30:14.895018158 +0100
@@ -7,7 +7,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -5587,7 +5628,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/DefaultRuler
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/DefaultRulerSpriteFactory.java scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/DefaultRulerSpriteFactory.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/DefaultRulerSpriteFactory.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/DefaultRulerSpriteFactory.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/DefaultRulerSpriteFactory.java 2014-11-26 08:30:14.895018158 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -5599,8 +5640,15 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/DefaultRuler
package org.scilab.forge.scirenderer.ruler;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/graduations/AbstractGraduations.java scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/graduations/AbstractGraduations.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/graduations/AbstractGraduations.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/graduations/AbstractGraduations.java 2014-10-28 17:15:06.744213715 +0100
-@@ -7,7 +7,7 @@
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/graduations/AbstractGraduations.java 2015-04-02 15:04:23.016395787 +0200
+@@ -1,13 +1,13 @@
+ /*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2009-2011 - DIGITEO - Pierre Lando
+- * Copyright (C) 2013 - Scilab Enterprises - Calixte DENIZET
++ * Copyright (C) 2013-2015 - Scilab Enterprises - Calixte DENIZET
+ *
+ * This file must be used under the terms of the CeCILL.
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at
@@ -5618,6 +5666,15 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/graduations/
/** The left bracket used by {@link #toString()} */
private static final String LEFT_BRACKET = "[";
+@@ -43,7 +45,7 @@ public abstract class AbstractGraduation
+
+ private final Graduations parentGraduations;
+ private DecimalFormat numberFormat;
+- private List<Double> subValues;
++ protected List<Double> subValues;
+
+ /**
+ * Constructor from parent graduations.
@@ -105,8 +107,6 @@ public abstract class AbstractGraduation
this.upperBound = upperBound;
}
@@ -5672,19 +5729,21 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/graduations/
String lowerBoundBracket;
String upperBoundBracket;
-@@ -220,7 +227,7 @@ public abstract class AbstractGraduation
+@@ -219,8 +226,8 @@ public abstract class AbstractGraduation
+ } else {
upperBoundBracket = LEFT_BRACKET;
}
- return "Graduation " + lowerBoundBracket
+- return "Graduation " + lowerBoundBracket
- + getFormat().format(lowerBound) + ", "
- + getFormat().format(upperBound) + upperBoundBracket;
++ return getClass().getSimpleName() + lowerBoundBracket
+ + getFormat().format(lowerBound) + ", "
+ + getFormat().format(upperBound) + upperBoundBracket;
}
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/graduations/Graduations.java scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/graduations/Graduations.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/graduations/Graduations.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/graduations/Graduations.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/graduations/Graduations.java 2014-11-26 08:30:14.896018158 +0100
@@ -7,7 +7,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -5696,7 +5755,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/graduations/
package org.scilab.forge.scirenderer.ruler.graduations;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/graduations/LinearGraduations.java scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/graduations/LinearGraduations.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/graduations/LinearGraduations.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/graduations/LinearGraduations.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/graduations/LinearGraduations.java 2014-11-26 08:30:14.896018158 +0100
@@ -7,13 +7,11 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -5879,8 +5938,15 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/graduations/
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/graduations/LogarithmicGraduations.java scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/graduations/LogarithmicGraduations.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/graduations/LogarithmicGraduations.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/graduations/LogarithmicGraduations.java 2014-10-28 17:15:06.744213715 +0100
-@@ -7,7 +7,7 @@
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/graduations/LogarithmicGraduations.java 2015-04-02 15:04:23.016395787 +0200
+@@ -1,17 +1,18 @@
+ /*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2009-2011 - DIGITEO - Pierre Lando
+- * Copyright (C) 2013 - Scilab Enterprises - Calixte DENIZET
++ * Copyright (C) 2013-2015 - Scilab Enterprises - Calixte DENIZET
+ *
+ * This file must be used under the terms of the CeCILL.
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at
@@ -5889,7 +5955,61 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/graduations/
*/
package org.scilab.forge.scirenderer.ruler.graduations;
-@@ -268,14 +268,14 @@ public final class LogarithmicGraduation
+
++import java.util.Collections;
+ import java.util.LinkedList;
+ import java.util.List;
+
+@@ -128,6 +129,33 @@ public final class LogarithmicGraduation
+ }
+
+ @Override
++ public List<Double> getSubGraduations(final int N) {
++ if (subValues == null) {
++ List<Double> ticksValue = getAllValues();
++ if (N == 0 || ticksValue.size() == 0) {
++ subValues = new LinkedList<Double>();
++ } else {
++ Collections.sort(ticksValue);
++ subValues = new LinkedList<Double>();
++
++ for (int i = 0; i < ticksValue.size() - 1; i++) {
++ final double first = Math.log10(ticksValue.get(i));
++ final double second = Math.log10(ticksValue.get(i + 1));
++ final double step = (second - first) / (N + 1);
++ double v = first;
++ for (int j = 0; j <= N; j++) {
++ subValues.add(Math.pow(10, v));
++ v += step;
++ }
++ }
++ subValues.add(ticksValue.get(ticksValue.size() - 1));
++ }
++ }
++
++ return subValues;
++ }
++
++ @Override
+ public int getSubDensity() {
+ if (stepExponent >= 3) {
+ return 3;
+@@ -138,6 +166,14 @@ public final class LogarithmicGraduation
+ }
+ }
+
++ @Override
++ public String toString() {
++ String s = super.toString();
++ s += "; stepExponent=" + stepExponent + "; parent=" + getParentGraduations();
++
++ return s;
++ }
++
+ /**
+ * This class manage linear graduation between 10^n and 10^(n+1)
+ */
+@@ -268,14 +304,14 @@ public final class LogarithmicGraduation
this,
getLowerBound(), true,
getUpperBound(), true
@@ -5906,7 +6026,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/graduations/
}
if (aPower != bPower) {
-@@ -285,7 +285,7 @@ public final class LogarithmicGraduation
+@@ -285,7 +321,7 @@ public final class LogarithmicGraduation
this,
Math.pow(10, i), false,
Math.pow(10, i + 1), false
@@ -5915,7 +6035,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/graduations/
}
}
-@@ -294,7 +294,7 @@ public final class LogarithmicGraduation
+@@ -294,7 +330,7 @@ public final class LogarithmicGraduation
this,
b, false,
getUpperBound(), true
@@ -5926,7 +6046,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/graduations/
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/graduations/TinyIntervalFormat.java scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/graduations/TinyIntervalFormat.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/graduations/TinyIntervalFormat.java 1970-01-01 01:00:00.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/graduations/TinyIntervalFormat.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/graduations/TinyIntervalFormat.java 2014-11-26 08:30:14.896018158 +0100
@@ -0,0 +1,95 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -6025,8 +6145,8 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/graduations/
+}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/graduations/UserDefinedFormat.java scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/graduations/UserDefinedFormat.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/graduations/UserDefinedFormat.java 1970-01-01 01:00:00.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/graduations/UserDefinedFormat.java 2014-10-28 17:15:06.744213715 +0100
-@@ -0,0 +1,92 @@
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/graduations/UserDefinedFormat.java 2015-04-02 15:04:23.016395787 +0200
+@@ -0,0 +1,96 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2014 - Scilab Enterprises - Calixte DENIZET
@@ -6072,6 +6192,10 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/graduations/
+ this.fallback = fallback;
+ }
+
++ public String getFormat() {
++ return format;
++ }
++
+ /**
+ * {@inheritDoc}
+ */
@@ -6121,7 +6245,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/graduations/
+}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/RulerDrawer.java scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/RulerDrawer.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/RulerDrawer.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/RulerDrawer.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/RulerDrawer.java 2014-11-26 08:30:14.895018158 +0100
@@ -8,7 +8,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -6364,7 +6488,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/RulerDrawer.
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/RulerDrawingResult.java scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/RulerDrawingResult.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/RulerDrawingResult.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/RulerDrawingResult.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/RulerDrawingResult.java 2014-11-26 08:30:14.895018158 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -6376,7 +6500,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/RulerDrawing
package org.scilab.forge.scirenderer.ruler;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/RulerModel.java scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/RulerModel.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/RulerModel.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/RulerModel.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/RulerModel.java 2014-11-26 08:30:14.895018158 +0100
@@ -7,7 +7,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -6411,7 +6535,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/RulerModel.j
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/RulerSpriteFactory.java scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/RulerSpriteFactory.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/RulerSpriteFactory.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/RulerSpriteFactory.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/ruler/RulerSpriteFactory.java 2014-11-26 08:30:14.895018158 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -6423,7 +6547,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/ruler/RulerSpriteF
package org.scilab.forge.scirenderer.ruler;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/SciRendererException.java scirenderer-scilab/src/org/scilab/forge/scirenderer/SciRendererException.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/SciRendererException.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/SciRendererException.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/SciRendererException.java 2014-11-26 08:30:14.889018161 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -6435,7 +6559,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/SciRendererExcepti
package org.scilab.forge.scirenderer;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/shapes/appearance/Appearance.java scirenderer-scilab/src/org/scilab/forge/scirenderer/shapes/appearance/Appearance.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/shapes/appearance/Appearance.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/shapes/appearance/Appearance.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/shapes/appearance/Appearance.java 2014-11-26 08:30:14.896018158 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -6481,7 +6605,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/shapes/appearance/
+
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/shapes/appearance/Color.java scirenderer-scilab/src/org/scilab/forge/scirenderer/shapes/appearance/Color.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/shapes/appearance/Color.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/shapes/appearance/Color.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/shapes/appearance/Color.java 2014-11-26 08:30:14.896018158 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -6493,7 +6617,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/shapes/appearance/
package org.scilab.forge.scirenderer.shapes.appearance;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/shapes/appearance/Material.java scirenderer-scilab/src/org/scilab/forge/scirenderer/shapes/appearance/Material.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/shapes/appearance/Material.java 1970-01-01 01:00:00.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/shapes/appearance/Material.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/shapes/appearance/Material.java 2014-11-26 08:30:14.896018158 +0100
@@ -0,0 +1,100 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -6597,7 +6721,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/shapes/appearance/
+}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/shapes/geometry/DefaultGeometry.java scirenderer-scilab/src/org/scilab/forge/scirenderer/shapes/geometry/DefaultGeometry.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/shapes/geometry/DefaultGeometry.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/shapes/geometry/DefaultGeometry.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/shapes/geometry/DefaultGeometry.java 2014-11-26 08:30:14.896018158 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -6609,7 +6733,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/shapes/geometry/De
package org.scilab.forge.scirenderer.shapes.geometry;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/shapes/geometry/Geometry.java scirenderer-scilab/src/org/scilab/forge/scirenderer/shapes/geometry/Geometry.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/shapes/geometry/Geometry.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/shapes/geometry/Geometry.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/shapes/geometry/Geometry.java 2014-11-26 08:30:14.896018158 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -6621,7 +6745,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/shapes/geometry/Ge
package org.scilab.forge.scirenderer.shapes.geometry;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/AbstractTextureDataProvider.java scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/AbstractTextureDataProvider.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/AbstractTextureDataProvider.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/AbstractTextureDataProvider.java 2014-10-28 17:15:06.743213714 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/AbstractTextureDataProvider.java 2014-11-26 08:30:14.897018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -6652,7 +6776,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/AbstractTe
final ByteBuffer data = getData();
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/AbstractTexture.java scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/AbstractTexture.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/AbstractTexture.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/AbstractTexture.java 2014-10-28 17:15:06.743213714 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/AbstractTexture.java 2014-11-26 08:30:14.896018158 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -6664,7 +6788,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/AbstractTe
package org.scilab.forge.scirenderer.texture;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/AnchorPosition.java scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/AnchorPosition.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/AnchorPosition.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/AnchorPosition.java 2014-10-28 17:15:06.743213714 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/AnchorPosition.java 2014-11-26 08:30:14.897018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -6676,7 +6800,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/AnchorPosi
package org.scilab.forge.scirenderer.texture;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/BufferedImageTextureDrawingTools.java scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/BufferedImageTextureDrawingTools.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/BufferedImageTextureDrawingTools.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/BufferedImageTextureDrawingTools.java 2014-10-28 17:15:06.743213714 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/BufferedImageTextureDrawingTools.java 2015-04-02 15:04:23.017395789 +0200
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -6686,18 +6810,24 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/BufferedIm
*/
package org.scilab.forge.scirenderer.texture;
-@@ -82,8 +82,8 @@ public class BufferedImageTextureDrawing
+@@ -82,11 +82,12 @@ public class BufferedImageTextureDrawing
@Override
public void drawPlus(int size, Appearance appearance) {
int r = size / 2;
- int[] coords1 = new int[]{-r, 0, r, 0};
- int[] coords2 = new int[]{0, -r, 0, r};
+-
+ int[] coords1 = new int[] { -r, 0, r, 0};
-+ int[] coords2 = new int[] {0, -r, 0, r};
-
drawPolyline(coords1, appearance);
- drawPolyline(coords2, appearance);
-@@ -173,7 +173,7 @@ public class BufferedImageTextureDrawing
+- drawPolyline(coords2, appearance);
++ if (r != 0) {
++ int[] coords2 = new int[] {0, -r, 0, r};
++ drawPolyline(coords2, appearance);
++ }
+ }
+
+ @Override
+@@ -173,7 +174,7 @@ public class BufferedImageTextureDrawing
g2d.setColor(textEntity.getTextColor());
TextLayout textLayout = new TextLayout(textEntity.getText(), textEntity.getFont(), g2d.getFontRenderContext());
Rectangle2D bounds = textLayout.getBounds();
@@ -6708,7 +6838,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/BufferedIm
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/DrawnTextureDataProvider.java scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/DrawnTextureDataProvider.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/DrawnTextureDataProvider.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/DrawnTextureDataProvider.java 2014-10-28 17:15:06.743213714 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/DrawnTextureDataProvider.java 2014-11-26 08:30:14.897018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -6775,7 +6905,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/DrawnTextu
return null;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/TextEntity.java scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/TextEntity.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/TextEntity.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/TextEntity.java 2014-10-28 17:15:06.743213714 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/TextEntity.java 2014-11-26 08:30:14.897018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -6858,7 +6988,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/TextEntity
return new Dimension(0, 0);
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/TextureBufferedImage.java scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/TextureBufferedImage.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/TextureBufferedImage.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/TextureBufferedImage.java 2014-10-28 17:15:06.743213714 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/TextureBufferedImage.java 2014-11-26 08:30:14.897018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -6920,7 +7050,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/TextureBuf
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/TextureDataProvider.java scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/TextureDataProvider.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/TextureDataProvider.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/TextureDataProvider.java 2014-10-28 17:15:06.743213714 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/TextureDataProvider.java 2014-11-26 08:30:14.897018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -7004,7 +7134,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/TextureDat
* @return the size of the texture in pixel.
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/TextureDrawer.java scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/TextureDrawer.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/TextureDrawer.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/TextureDrawer.java 2014-10-28 17:15:06.743213714 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/TextureDrawer.java 2014-11-26 08:30:14.897018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -7016,7 +7146,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/TextureDra
package org.scilab.forge.scirenderer.texture;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/TextureDrawingTools.java scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/TextureDrawingTools.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/TextureDrawingTools.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/TextureDrawingTools.java 2014-10-28 17:15:06.743213714 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/TextureDrawingTools.java 2014-11-26 08:30:14.897018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -7028,7 +7158,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/TextureDra
package org.scilab.forge.scirenderer.texture;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/Texture.java scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/Texture.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/Texture.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/Texture.java 2014-10-28 17:15:06.743213714 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/Texture.java 2014-11-26 08:30:14.897018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -7040,7 +7170,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/Texture.ja
package org.scilab.forge.scirenderer.texture;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/TextureManager.java scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/TextureManager.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/TextureManager.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/TextureManager.java 2014-10-28 17:15:06.743213714 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/texture/TextureManager.java 2014-11-26 08:30:14.897018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -7052,7 +7182,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/texture/TextureMan
package org.scilab.forge.scirenderer.texture;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/DegenerateMatrixException.java scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/DegenerateMatrixException.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/DegenerateMatrixException.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/DegenerateMatrixException.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/DegenerateMatrixException.java 2014-11-26 08:30:14.897018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -7064,7 +7194,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/Deg
package org.scilab.forge.scirenderer.tranformations;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/Rotation.java scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/Rotation.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/Rotation.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/Rotation.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/Rotation.java 2014-11-26 08:30:14.897018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -7119,7 +7249,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/Rot
private void computeRotationMatrix() {
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/TransformationFactory.java scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/TransformationFactory.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/TransformationFactory.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/TransformationFactory.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/TransformationFactory.java 2014-11-26 08:30:14.897018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -7195,7 +7325,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/Tra
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/Transformation.java scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/Transformation.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/Transformation.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/Transformation.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/Transformation.java 2014-11-26 08:30:14.897018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -7207,7 +7337,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/Tra
package org.scilab.forge.scirenderer.tranformations;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/TransformationManagerImpl.java scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/TransformationManagerImpl.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/TransformationManagerImpl.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/TransformationManagerImpl.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/TransformationManagerImpl.java 2014-11-26 08:30:14.898018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -7316,7 +7446,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/Tra
throw new Error("Canvas is to big.", e);
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/TransformationManager.java scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/TransformationManager.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/TransformationManager.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/TransformationManager.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/TransformationManager.java 2014-11-26 08:30:14.897018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -7328,7 +7458,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/Tra
package org.scilab.forge.scirenderer.tranformations;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/TransformationManagerListener.java scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/TransformationManagerListener.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/TransformationManagerListener.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/TransformationManagerListener.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/TransformationManagerListener.java 2014-11-26 08:30:14.898018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -7340,7 +7470,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/Tra
package org.scilab.forge.scirenderer.tranformations;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/TransformationStackImpl.java scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/TransformationStackImpl.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/TransformationStackImpl.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/TransformationStackImpl.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/TransformationStackImpl.java 2014-11-26 08:30:14.898018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -7352,7 +7482,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/Tra
package org.scilab.forge.scirenderer.tranformations;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/TransformationStack.java scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/TransformationStack.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/TransformationStack.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/TransformationStack.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/TransformationStack.java 2014-11-26 08:30:14.898018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -7364,7 +7494,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/Tra
package org.scilab.forge.scirenderer.tranformations;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/TransformationStackListener.java scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/TransformationStackListener.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/TransformationStackListener.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/TransformationStackListener.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/TransformationStackListener.java 2014-11-26 08:30:14.898018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -7376,7 +7506,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/Tra
package org.scilab.forge.scirenderer.tranformations;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/Vector3d.java scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/Vector3d.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/Vector3d.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/Vector3d.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/Vector3d.java 2014-11-26 08:30:14.898018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -7423,7 +7553,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/Vec
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/Vector3f.java scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/Vector3f.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/Vector3f.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/Vector3f.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/Vector3f.java 2014-11-26 08:30:14.898018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -7498,7 +7628,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/Vec
}
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/Vector4d.java scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/Vector4d.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/Vector4d.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/Vector4d.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/tranformations/Vector4d.java 2014-11-26 08:30:14.898018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -7510,7 +7640,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/tranformations/Vec
package org.scilab.forge.scirenderer.tranformations;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/utils/shapes/geometry/CubeFactory.java scirenderer-scilab/src/org/scilab/forge/scirenderer/utils/shapes/geometry/CubeFactory.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/utils/shapes/geometry/CubeFactory.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/utils/shapes/geometry/CubeFactory.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/utils/shapes/geometry/CubeFactory.java 2014-11-26 08:30:14.898018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -7531,7 +7661,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/utils/shapes/geome
for (int j = 0; j < borderLength; j++) {
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/utils/shapes/geometry/SphereFactory.java scirenderer-scilab/src/org/scilab/forge/scirenderer/utils/shapes/geometry/SphereFactory.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/utils/shapes/geometry/SphereFactory.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/utils/shapes/geometry/SphereFactory.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/utils/shapes/geometry/SphereFactory.java 2014-11-26 08:30:14.898018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -7543,7 +7673,7 @@ diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/utils/shapes/geome
package org.scilab.forge.scirenderer.utils.shapes.geometry;
diff -rupN scirenderer-1.1.0/src/org/scilab/forge/scirenderer/utils/shapes/geometry/TetrahedronFactory.java scirenderer-scilab/src/org/scilab/forge/scirenderer/utils/shapes/geometry/TetrahedronFactory.java
--- scirenderer-1.1.0/src/org/scilab/forge/scirenderer/utils/shapes/geometry/TetrahedronFactory.java 2013-03-28 17:25:15.000000000 +0100
-+++ scirenderer-scilab/src/org/scilab/forge/scirenderer/utils/shapes/geometry/TetrahedronFactory.java 2014-10-28 17:15:06.744213715 +0100
++++ scirenderer-scilab/src/org/scilab/forge/scirenderer/utils/shapes/geometry/TetrahedronFactory.java 2014-11-26 08:30:14.898018157 +0100
@@ -6,7 +6,7 @@
* This source file is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
diff --git a/scirenderer.spec b/scirenderer.spec
index c6d5159..3133227 100644
--- a/scirenderer.spec
+++ b/scirenderer.spec
@@ -1,6 +1,6 @@
Name: scirenderer
Version: 1.1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A Java rendering library based on JoGL
License: CeCILL
@@ -79,6 +79,9 @@ cp -pr docs/* %{buildroot}%{_javadocdir}/%{name}
%doc CHANGES
%changelog
+* Thu Apr 02 2015 Clément David <c.david86 at gmail.com> - 1.1.0-6
+- Update to Scilab 5.5.2 version
+
* Fri Dec 12 2014 Clément David <c.david86 at gmail.com> - 1.1.0-5
- Update to the latest Scilab version
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/scirenderer.git/commit/?h=f21&id=11124fe3fb31492b64b45a9dab5c3e7b0fc3dc9e
More information about the scm-commits
mailing list