Skip to content

Commit 9619d10

Browse files
ctruedenctrueden
committed
Update to ClearGL 2.2.11 and JOGL 2.5.0
I was unable to make the Gradle build system work, so I added a Maven POM. (The only code that actually gets deployed is Java code, so using Maven with the pom-scijava BOM works out of the box.) Unfortunately, when I run this with the latest imglib2-clearvolume plugin in an up-to-date Fiji, I see there are rotation bugs, probably introduced by my hasty changes to ClearGL earlier today. Also: ClearVolume does not work with Java 21.
1 parent 6522c9b commit 9619d10

File tree

5 files changed

+198
-9
lines changed

5 files changed

+198
-9
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/target/
12
bin/
23
build/
34
.project

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ dependencies
104104
api 'net.clearvolume:clearaudio:1.0.2'
105105

106106
//ClearGL:
107-
implementation ('net.clearvolume:cleargl:2.2.6') {transitive= true; changing= true}
107+
implementation ('net.clearvolume:cleargl:2.2.11') {transitive= true; changing= true}
108108

109109
implementation group: 'junit', name: 'junit', version: '4.12'
110110
testImplementation group: 'junit', name: 'junit', version: '4.12'

‎pom.xml

Lines changed: 188 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>org.scijava</groupId>
7+
<artifactId>pom-scijava</artifactId>
8+
<version>40.0.0</version>
9+
<relativePath />
10+
</parent>
11+
12+
<groupId>net.clearvolume</groupId>
13+
<artifactId>clearvolume</artifactId>
14+
<version>1.4.4-SNAPSHOT</version>
15+
16+
<name>clearvolume</name>
17+
<description>ClearVolume library for real-time live 3D visualization.</description>
18+
<url>https://github.com/ClearVolume/clearvolume</url>
19+
<inceptionYear>2013</inceptionYear>
20+
<organization>
21+
<name>ClearVolume</name>
22+
<url>https://clearvolume.github.io/</url>
23+
</organization>
24+
<licenses>
25+
<license>
26+
<name>GNU Lesser General Public License v3+</name>
27+
<url>https://www.gnu.org/licenses/lgpl-3.0.html</url>
28+
<distribution>repo</distribution>
29+
</license>
30+
</licenses>
31+
32+
<developers>
33+
<!-- See https://imagej.net/Team -->
34+
<developer>
35+
<id>FIXME</id>
36+
<name>Noma Onomatopoeia</name>
37+
<url>https://mycompany.com/people/noma-onomatopoeia</url>
38+
<roles>
39+
<role>founder</role>
40+
<role>lead</role>
41+
<role>developer</role>
42+
<role>debugger</role>
43+
<role>reviewer</role>
44+
<role>support</role>
45+
<role>maintainer</role>
46+
</roles>
47+
</developer>
48+
</developers>
49+
<contributors>
50+
<contributor>
51+
<name>None</name>
52+
</contributor>
53+
</contributors>
54+
55+
<mailingLists>
56+
<mailingList>
57+
<name>Image.sc Forum</name>
58+
<archive>https://forum.image.sc/tag/clearvolume</archive>
59+
</mailingList>
60+
</mailingLists>
61+
62+
<scm>
63+
<connection>scm:git:https://github.com/ClearVolume/clearvolume</connection>
64+
<developerConnection>scm:git:[email protected]:ClearVolume/clearvolume</developerConnection>
65+
<tag>HEAD</tag>
66+
<url>https://github.com/ClearVolume/clearvolume</url>
67+
</scm>
68+
<issueManagement>
69+
<system>GitHub Issues</system>
70+
<url>https://github.com/ClearVolume/clearvolume/issues</url>
71+
</issueManagement>
72+
<ciManagement>
73+
<system>None</system>
74+
</ciManagement>
75+
76+
<properties>
77+
<package-name>clearvolume</package-name>
78+
<license.licenseName>lgpl_v3</license.licenseName>
79+
<license.copyrightOwners>ClearVolume developers.</license.copyrightOwners>
80+
81+
<!--
82+
NB: javacl is an unshaded-uberjar, which clashes with bridj,
83+
opencl4java and javacl-core. It even depends on the latter!
84+
For now, let's ignore this issue, since it may not be safe
85+
to exclude javacl as a whole...
86+
-->
87+
<allowedDuplicateClasses>${scijava.allowedDuplicateClasses},junit.*,com.nativelibs4java.opencl.*,com.nativelibs4java.util.*,com.ochafik.util.string.StringUtils,org.bridj.*</allowedDuplicateClasses>
88+
89+
<!-- NB: Deploy releases to the SciJava Maven repository. -->
90+
<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>
91+
92+
<clearcl.version>0.5.2</clearcl.version>
93+
<clearaudio.version>1.0.2</clearaudio.version>
94+
<cleargl.version>2.2.11</cleargl.version>
95+
<orange-extensions.version>1.3.0</orange-extensions.version>
96+
</properties>
97+
98+
<repositories>
99+
<repository>
100+
<id>scijava.public</id>
101+
<url>https://maven.scijava.org/content/groups/public</url>
102+
</repository>
103+
</repositories>
104+
105+
<dependencies>
106+
<dependency>
107+
<groupId>commons-lang</groupId>
108+
<artifactId>commons-lang</artifactId>
109+
</dependency>
110+
<dependency>
111+
<groupId>commons-io</groupId>
112+
<artifactId>commons-io</artifactId>
113+
</dependency>
114+
<dependency>
115+
<groupId>net.sf.trove4j</groupId>
116+
<artifactId>trove4j</artifactId>
117+
</dependency>
118+
<dependency>
119+
<groupId>args4j</groupId>
120+
<artifactId>args4j</artifactId>
121+
</dependency>
122+
<dependency>
123+
<groupId>com.miglayout</groupId>
124+
<artifactId>miglayout-core</artifactId>
125+
</dependency>
126+
<dependency>
127+
<groupId>com.miglayout</groupId>
128+
<artifactId>miglayout-swing</artifactId>
129+
</dependency>
130+
<dependency>
131+
<groupId>com.miglayout</groupId>
132+
<artifactId>miglayout-swt</artifactId>
133+
</dependency>
134+
135+
<dependency>
136+
<groupId>net.clearvolume</groupId>
137+
<artifactId>clearcl</artifactId>
138+
<version>${clearcl.version}</version>
139+
</dependency>
140+
<dependency>
141+
<groupId>net.clearvolume</groupId>
142+
<artifactId>clearaudio</artifactId>
143+
<version>${clearaudio.version}</version>
144+
</dependency>
145+
<dependency>
146+
<groupId>net.clearvolume</groupId>
147+
<artifactId>cleargl</artifactId>
148+
</dependency>
149+
150+
<!-- Provided scope dependencies -->
151+
<dependency>
152+
<groupId>com.yuvimasory</groupId>
153+
<artifactId>orange-extensions</artifactId>
154+
<version>${orange-extensions.version}</version>
155+
<scope>provided</scope>
156+
</dependency>
157+
158+
<dependency>
159+
<groupId>junit</groupId>
160+
<artifactId>junit</artifactId>
161+
<scope>compile</scope>
162+
</dependency>
163+
</dependencies>
164+
165+
<build>
166+
<sourceDirectory>${project.basedir}/src/java</sourceDirectory>
167+
<testSourceDirectory>${project.basedir}/src/java</testSourceDirectory>
168+
<resources>
169+
<resource>
170+
<directory>${project.basedir}/src/java</directory>
171+
<excludes>
172+
<exclude>**/*.java</exclude>
173+
<exclude>**/package.html</exclude>
174+
</excludes>
175+
</resource>
176+
</resources>
177+
<testResources>
178+
<testResource>
179+
<directory>${project.basedir}/src/java</directory>
180+
<excludes>
181+
<exclude>**/*.java</exclude>
182+
<exclude>**/package.html</exclude>
183+
</excludes>
184+
</testResource>
185+
</testResources>
186+
187+
</build>
188+
</project>

‎src/java/clearvolume/controller/QuaternionRotationControllerBase.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ public void setQuaternion(final Quaternion pQuaternion)
5050
{
5151
synchronized (mQuaternionUpdateLock)
5252
{
53-
mQuaternion.setX(pQuaternion.getX());
54-
mQuaternion.setY(pQuaternion.getY());
55-
mQuaternion.setZ(pQuaternion.getZ());
56-
mQuaternion.setW(pQuaternion.getW());
53+
mQuaternion.setX(pQuaternion.x());
54+
mQuaternion.setY(pQuaternion.y());
55+
mQuaternion.setZ(pQuaternion.z());
56+
mQuaternion.setW(pQuaternion.w());
5757
}
5858
}
5959

‎src/java/clearvolume/renderer/ClearVolumeRendererBase.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,10 +1498,10 @@ public void setQuaternion(Quaternion pQuaternion)
14981498
try
14991499
{
15001500
if (mLastAppliedQuaternion == null
1501-
|| pQuaternion.getX() != mLastAppliedQuaternion.getX()
1502-
|| pQuaternion.getY() != mLastAppliedQuaternion.getY()
1503-
|| pQuaternion.getZ() != mLastAppliedQuaternion.getZ()
1504-
|| pQuaternion.getW() != mLastAppliedQuaternion.getW())
1501+
|| pQuaternion.x() != mLastAppliedQuaternion.x()
1502+
|| pQuaternion.y() != mLastAppliedQuaternion.y()
1503+
|| pQuaternion.z() != mLastAppliedQuaternion.z()
1504+
|| pQuaternion.w() != mLastAppliedQuaternion.w())
15051505
{
15061506
mRotationQuaternion.set(pQuaternion);
15071507
notifyChangeOfVolumeRenderingParameters();

0 commit comments

Comments
 (0)