rusefi
/
jzy3d-api
mirror of https://github.com/rusefi/jzy3d-api.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Initiate 2.0.0 to allow integration of emulated GL renderer

This commit is contained in:
Martin 2020-10-10 17:28:30 +02:00
parent 49a8adc675
commit 117696bbac
18 changed files with 49 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jzy3d-api/.classpath
View File

@ -10,6 +10,7 @@
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/classes" path="src/bridge">

2
jzy3d-api/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<groupId>org.jzy3d</groupId>
<artifactId>jzy3d-master</artifactId>
<version>1.0.3-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<description>A Java API for 3d charts</description>

4
jzy3d-api/src/api/org/jzy3d/plot3d/primitives/AbstractGeometry.java
View File

@ -16,6 +16,7 @@ import org.jzy3d.plot3d.rendering.view.Camera;
import org.jzy3d.plot3d.transform.Transform;
import com.jogamp.opengl.GL;
import com.jogamp.opengl.GL2;
import com.jogamp.opengl.GL2GL3;
import com.jogamp.opengl.glu.GLU;
@ -59,6 +60,9 @@ public abstract class AbstractGeometry extends AbstractWireframeable implements
// Draw edge of polygon
if (wfstatus) {
applyPolygonModeLine(gl);
gl.getGL2().glBegin(GL2.GL_LINE_LOOP);
if (polygonOffsetFillEnable)
polygonOffseFillEnable(gl);
callPointForWireframe(gl);

14
jzy3d-api/src/api/org/jzy3d/plot3d/primitives/Scatter.java
View File

@ -192,6 +192,20 @@ public class Scatter extends AbstractDrawable implements ISingleColorable {
public void setWidth(float width) {
this.width = width;
}
public Color[] getColors() {
return colors;
}
public Coord3d[] getCoordinates() {
return coordinates;
}
public float getWidth() {
return width;
}
/**********************************************************************/

14
jzy3d-api/src/api/org/jzy3d/plot3d/primitives/axes/AxeBox.java
View File

@ -1175,5 +1175,17 @@ public class AxeBox implements IAxe {
protected List<AxeAnnotation> annotations = new ArrayList<AxeAnnotation>();
protected SpaceTransformer spaceTransformer;
public float[][] getQuadX(){
return quadx;
}
public float[][] getQuadY(){
return quady;
}
public float[][] getQuadZ(){
return quadz;
}
public boolean[] getQuadIsHidden() {
return quadIsHidden;
}
}

2
jzy3d-depthpeeling/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<groupId>org.jzy3d</groupId>
<artifactId>jzy3d-master</artifactId>
<version>1.0.3-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<dependencies>

1
jzy3d-javafx/.classpath
View File

@ -15,6 +15,7 @@
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">

2
jzy3d-javafx/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>org.jzy3d</groupId>
<artifactId>jzy3d-master</artifactId>
<version>1.0.3-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<name>Jzy3d|FX</name>

2
jzy3d-jdt-core/.classpath
View File

@ -4,11 +4,13 @@
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/classes" path="src/main/java">

2
jzy3d-jdt-core/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.jzy3d</groupId>
<artifactId>jzy3d-master</artifactId>
<version>1.0.3-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>jzy3d-jdt-core</artifactId>

4
jzy3d-svm-mapper/pom.xml
View File

@ -5,12 +5,10 @@
<artifactId>jzy3d-svm-mapper</artifactId>
<name>Jzy3d SVM Mapper</name>
<version>1.0.3-SNAPSHOT</version>
<parent>
<groupId>org.jzy3d</groupId>
<artifactId>jzy3d-master</artifactId>
<version>1.0.3-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<properties>

1
jzy3d-swt/.classpath
View File

@ -12,6 +12,7 @@
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">

2
jzy3d-swt/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<groupId>org.jzy3d</groupId>
<artifactId>jzy3d-master</artifactId>
<version>1.0.3-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>

3
jzy3d-tester/pom.xml
View File

@ -3,13 +3,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jzy3d</groupId>
<artifactId>jzy3d-tester</artifactId>
<version>1.0.3-SNAPSHOT</version>
<name>Jzy3d Tester</name>
<parent>
<groupId>org.jzy3d</groupId>
<artifactId>jzy3d-master</artifactId>
<version>1.0.3-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<dependencies>

2
jzy3d-tools-libsvm/pom.xml
View File

@ -4,7 +4,7 @@
<groupId>org.jzy3d</groupId>
<artifactId>jzy3d-tools-libsvm</artifactId>
<name>Jzy3d LibSVM</name>
<version>1.0.3-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
<parent>
<groupId>org.jzy3d</groupId>

4
jzy3d-tutorials/.classpath
View File

@ -10,6 +10,7 @@
<classpathentry kind="src" path="/jzy3d-jdt-core"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
@ -19,8 +20,9 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Oracle JDK 14.0.1">
<attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>

2
jzy3d-tutorials/pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jzy3d</groupId>
<artifactId>jzy3d-tutorials</artifactId>
<version>1.0.3-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
<name>Jzy3d Tutorials</name>

2
pom.xml
View File

@ -3,7 +3,7 @@
<groupId>org.jzy3d</groupId>
<artifactId>jzy3d-master</artifactId>
<version>1.0.3-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Jzy3d Master Project</name>