joonsrenderer 1.2.0-java → 1.3.1-java
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.mvn/extensions.xml +1 -1
- data/.mvn/wrapper/MavenWrapperDownloader.java +117 -0
- data/.mvn/wrapper/maven-wrapper.properties +2 -1
- data/CHANGELOG.md +6 -2
- data/Rakefile +6 -1
- data/joonsrenderer.gemspec +2 -2
- data/lib/commons.compiler/module-info.class +0 -0
- data/lib/commons.compiler/module-info.java +7 -0
- data/lib/janino/module-info.class +0 -0
- data/lib/janino/module-info.java +5 -0
- data/lib/joonsrenderer/version.rb +1 -1
- data/mvnw +310 -0
- data/mvnw.cmd +182 -0
- data/pom.rb +20 -20
- data/pom.xml +28 -13
- data/src/main/java/SunflowGUI.java +2 -0
- data/src/main/java/org/sunflow/SunflowAPI.java +3 -3
- data/src/main/java/org/sunflow/core/Geometry.java +1 -1
- data/src/main/java/org/sunflow/core/accel/KDTree.java +1 -1
- data/src/main/java/org/sunflow/core/photonmap/CausticPhotonMap.java +1 -1
- data/src/main/java/org/sunflow/core/photonmap/GlobalPhotonMap.java +2 -2
- metadata +12 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ea4f982aac8886ab6cd63fc52318e3f5d8e68ca1e7e2b52c88f6781fc9d4028d
|
4
|
+
data.tar.gz: 41fdf28a02c5fa8baabd96390248786b79f0828aea2e9ade64078b0fb26855d3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0d4a1c30410ee7ea51a95e261aa3a228c46586a5466b0141d45153028ad518d6194cab5eb6646ed36564b7176043952bd69a1606e95e070e4b224a92cdd9d9ca
|
7
|
+
data.tar.gz: 308c2abbb7181d0633b2cc0b75cd713257db143017e3798abbc2061da4084a97573d2575d6f0c8ee7c50628277cf1832a17ab720ee328266c876b9c8a5cad8ad
|
data/.mvn/extensions.xml
CHANGED
@@ -0,0 +1,117 @@
|
|
1
|
+
/*
|
2
|
+
* Copyright 2007-present the original author or authors.
|
3
|
+
*
|
4
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
5
|
+
* you may not use this file except in compliance with the License.
|
6
|
+
* You may obtain a copy of the License at
|
7
|
+
*
|
8
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
9
|
+
*
|
10
|
+
* Unless required by applicable law or agreed to in writing, software
|
11
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
12
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
13
|
+
* See the License for the specific language governing permissions and
|
14
|
+
* limitations under the License.
|
15
|
+
*/
|
16
|
+
import java.net.*;
|
17
|
+
import java.io.*;
|
18
|
+
import java.nio.channels.*;
|
19
|
+
import java.util.Properties;
|
20
|
+
|
21
|
+
public class MavenWrapperDownloader {
|
22
|
+
|
23
|
+
private static final String WRAPPER_VERSION = "0.5.5";
|
24
|
+
/**
|
25
|
+
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
|
26
|
+
*/
|
27
|
+
private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
|
28
|
+
+ WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
|
29
|
+
|
30
|
+
/**
|
31
|
+
* Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
|
32
|
+
* use instead of the default one.
|
33
|
+
*/
|
34
|
+
private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
|
35
|
+
".mvn/wrapper/maven-wrapper.properties";
|
36
|
+
|
37
|
+
/**
|
38
|
+
* Path where the maven-wrapper.jar will be saved to.
|
39
|
+
*/
|
40
|
+
private static final String MAVEN_WRAPPER_JAR_PATH =
|
41
|
+
".mvn/wrapper/maven-wrapper.jar";
|
42
|
+
|
43
|
+
/**
|
44
|
+
* Name of the property which should be used to override the default download url for the wrapper.
|
45
|
+
*/
|
46
|
+
private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
|
47
|
+
|
48
|
+
public static void main(String args[]) {
|
49
|
+
System.out.println("- Downloader started");
|
50
|
+
File baseDirectory = new File(args[0]);
|
51
|
+
System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
|
52
|
+
|
53
|
+
// If the maven-wrapper.properties exists, read it and check if it contains a custom
|
54
|
+
// wrapperUrl parameter.
|
55
|
+
File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
|
56
|
+
String url = DEFAULT_DOWNLOAD_URL;
|
57
|
+
if(mavenWrapperPropertyFile.exists()) {
|
58
|
+
FileInputStream mavenWrapperPropertyFileInputStream = null;
|
59
|
+
try {
|
60
|
+
mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
|
61
|
+
Properties mavenWrapperProperties = new Properties();
|
62
|
+
mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
|
63
|
+
url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
|
64
|
+
} catch (IOException e) {
|
65
|
+
System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
|
66
|
+
} finally {
|
67
|
+
try {
|
68
|
+
if(mavenWrapperPropertyFileInputStream != null) {
|
69
|
+
mavenWrapperPropertyFileInputStream.close();
|
70
|
+
}
|
71
|
+
} catch (IOException e) {
|
72
|
+
// Ignore ...
|
73
|
+
}
|
74
|
+
}
|
75
|
+
}
|
76
|
+
System.out.println("- Downloading from: " + url);
|
77
|
+
|
78
|
+
File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
|
79
|
+
if(!outputFile.getParentFile().exists()) {
|
80
|
+
if(!outputFile.getParentFile().mkdirs()) {
|
81
|
+
System.out.println(
|
82
|
+
"- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
|
83
|
+
}
|
84
|
+
}
|
85
|
+
System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
|
86
|
+
try {
|
87
|
+
downloadFileFromURL(url, outputFile);
|
88
|
+
System.out.println("Done");
|
89
|
+
System.exit(0);
|
90
|
+
} catch (Throwable e) {
|
91
|
+
System.out.println("- Error downloading");
|
92
|
+
e.printStackTrace();
|
93
|
+
System.exit(1);
|
94
|
+
}
|
95
|
+
}
|
96
|
+
|
97
|
+
private static void downloadFileFromURL(String urlString, File destination) throws Exception {
|
98
|
+
if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
|
99
|
+
String username = System.getenv("MVNW_USERNAME");
|
100
|
+
char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
|
101
|
+
Authenticator.setDefault(new Authenticator() {
|
102
|
+
@Override
|
103
|
+
protected PasswordAuthentication getPasswordAuthentication() {
|
104
|
+
return new PasswordAuthentication(username, password);
|
105
|
+
}
|
106
|
+
});
|
107
|
+
}
|
108
|
+
URL website = new URL(urlString);
|
109
|
+
ReadableByteChannel rbc;
|
110
|
+
rbc = Channels.newChannel(website.openStream());
|
111
|
+
FileOutputStream fos = new FileOutputStream(destination);
|
112
|
+
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
|
113
|
+
fos.close();
|
114
|
+
rbc.close();
|
115
|
+
}
|
116
|
+
|
117
|
+
}
|
@@ -1 +1,2 @@
|
|
1
|
-
distributionUrl=https://
|
1
|
+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
|
2
|
+
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar
|
data/CHANGELOG.md
CHANGED
@@ -1,9 +1,13 @@
|
|
1
|
+
**v1.3.1** Bump for janino-3.1.3 and processing-4.0
|
2
|
+
|
3
|
+
**v1.3.0** Bump for janino-3.1.2, and jdk11
|
4
|
+
|
1
5
|
**v1.2.0** Bump for janino-3.0.12, plus some refactoring
|
2
6
|
|
3
7
|
**v1.1.3** Bump for processing-3.3.4
|
4
8
|
|
5
9
|
**v1.1.2** Use sunflow.util.FloatList and IntList, netbeans profiling suggest it is worth doing (there is a vanilla processing alternative, with a different interface)
|
6
10
|
|
7
|
-
**v1.1.1** Left out GLASS from fill type switch easily fixed
|
11
|
+
**v1.1.1** Left out GLASS from fill type switch easily fixed though
|
8
12
|
|
9
|
-
**v1.1.0** I'm conflicted about versioning here, this a later version than Joon Hyub Lee joonsrenderer. What is different is sunflow is integrated and updated (switch on String, try with resources etc, and importantly updated janino). I
|
13
|
+
**v1.1.0** I'm conflicted about versioning here, this a later version than Joon Hyub Lee joonsrenderer. What is different is sunflow is integrated and updated (switch on String, try with resources etc, and importantly updated janino). I have also hacked joons renderer a bit as well.
|
data/Rakefile
CHANGED
@@ -6,7 +6,7 @@ def create_manifest
|
|
6
6
|
file = File.open('MANIFEST.MF', 'w') do |f|
|
7
7
|
f.puts(title)
|
8
8
|
f.puts(version)
|
9
|
-
f.puts('Class-Path: janino-3.
|
9
|
+
f.puts('Class-Path: janino-3.1.3.jar commons-compiler-3.1.3.jar')
|
10
10
|
end
|
11
11
|
end
|
12
12
|
|
@@ -33,6 +33,11 @@ task :install do
|
|
33
33
|
sh "mv target/joonsrenderer.jar lib"
|
34
34
|
end
|
35
35
|
|
36
|
+
desc 'JDeps Tool'
|
37
|
+
task :jdeps do
|
38
|
+
system 'mvn jdeps:jdkinternals'
|
39
|
+
end
|
40
|
+
|
36
41
|
desc 'clean'
|
37
42
|
task :clean do
|
38
43
|
Dir['./**/*.%w{jar gem}'].each do |path|
|
data/joonsrenderer.gemspec
CHANGED
@@ -14,8 +14,8 @@ Gem::Specification.new do |gem|
|
|
14
14
|
gem.homepage = 'https://ruby-processing.github.io/joonsrenderer/'
|
15
15
|
gem.files = `git ls-files`.split($/)
|
16
16
|
gem.files << 'lib/joonsrenderer.jar'
|
17
|
-
gem.files << 'lib/janino-3.
|
18
|
-
gem.files << 'lib/commons-compiler-3.
|
17
|
+
gem.files << 'lib/janino-3.1.3.jar'
|
18
|
+
gem.files << 'lib/commons-compiler-3.1.3.jar'
|
19
19
|
gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
|
20
20
|
gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
|
21
21
|
gem.require_paths = ['lib']
|
Binary file
|
Binary file
|
data/mvnw
ADDED
@@ -0,0 +1,310 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
# ----------------------------------------------------------------------------
|
3
|
+
# Licensed to the Apache Software Foundation (ASF) under one
|
4
|
+
# or more contributor license agreements. See the NOTICE file
|
5
|
+
# distributed with this work for additional information
|
6
|
+
# regarding copyright ownership. The ASF licenses this file
|
7
|
+
# to you under the Apache License, Version 2.0 (the
|
8
|
+
# "License"); you may not use this file except in compliance
|
9
|
+
# with the License. You may obtain a copy of the License at
|
10
|
+
#
|
11
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
12
|
+
#
|
13
|
+
# Unless required by applicable law or agreed to in writing,
|
14
|
+
# software distributed under the License is distributed on an
|
15
|
+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
16
|
+
# KIND, either express or implied. See the License for the
|
17
|
+
# specific language governing permissions and limitations
|
18
|
+
# under the License.
|
19
|
+
# ----------------------------------------------------------------------------
|
20
|
+
|
21
|
+
# ----------------------------------------------------------------------------
|
22
|
+
# Maven2 Start Up Batch script
|
23
|
+
#
|
24
|
+
# Required ENV vars:
|
25
|
+
# ------------------
|
26
|
+
# JAVA_HOME - location of a JDK home dir
|
27
|
+
#
|
28
|
+
# Optional ENV vars
|
29
|
+
# -----------------
|
30
|
+
# M2_HOME - location of maven2's installed home dir
|
31
|
+
# MAVEN_OPTS - parameters passed to the Java VM when running Maven
|
32
|
+
# e.g. to debug Maven itself, use
|
33
|
+
# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
|
34
|
+
# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
|
35
|
+
# ----------------------------------------------------------------------------
|
36
|
+
|
37
|
+
if [ -z "$MAVEN_SKIP_RC" ] ; then
|
38
|
+
|
39
|
+
if [ -f /etc/mavenrc ] ; then
|
40
|
+
. /etc/mavenrc
|
41
|
+
fi
|
42
|
+
|
43
|
+
if [ -f "$HOME/.mavenrc" ] ; then
|
44
|
+
. "$HOME/.mavenrc"
|
45
|
+
fi
|
46
|
+
|
47
|
+
fi
|
48
|
+
|
49
|
+
# OS specific support. $var _must_ be set to either true or false.
|
50
|
+
cygwin=false;
|
51
|
+
darwin=false;
|
52
|
+
mingw=false
|
53
|
+
case "`uname`" in
|
54
|
+
CYGWIN*) cygwin=true ;;
|
55
|
+
MINGW*) mingw=true;;
|
56
|
+
Darwin*) darwin=true
|
57
|
+
# Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
|
58
|
+
# See https://developer.apple.com/library/mac/qa/qa1170/_index.html
|
59
|
+
if [ -z "$JAVA_HOME" ]; then
|
60
|
+
if [ -x "/usr/libexec/java_home" ]; then
|
61
|
+
export JAVA_HOME="`/usr/libexec/java_home`"
|
62
|
+
else
|
63
|
+
export JAVA_HOME="/Library/Java/Home"
|
64
|
+
fi
|
65
|
+
fi
|
66
|
+
;;
|
67
|
+
esac
|
68
|
+
|
69
|
+
if [ -z "$JAVA_HOME" ] ; then
|
70
|
+
if [ -r /etc/gentoo-release ] ; then
|
71
|
+
JAVA_HOME=`java-config --jre-home`
|
72
|
+
fi
|
73
|
+
fi
|
74
|
+
|
75
|
+
if [ -z "$M2_HOME" ] ; then
|
76
|
+
## resolve links - $0 may be a link to maven's home
|
77
|
+
PRG="$0"
|
78
|
+
|
79
|
+
# need this for relative symlinks
|
80
|
+
while [ -h "$PRG" ] ; do
|
81
|
+
ls=`ls -ld "$PRG"`
|
82
|
+
link=`expr "$ls" : '.*-> \(.*\)$'`
|
83
|
+
if expr "$link" : '/.*' > /dev/null; then
|
84
|
+
PRG="$link"
|
85
|
+
else
|
86
|
+
PRG="`dirname "$PRG"`/$link"
|
87
|
+
fi
|
88
|
+
done
|
89
|
+
|
90
|
+
saveddir=`pwd`
|
91
|
+
|
92
|
+
M2_HOME=`dirname "$PRG"`/..
|
93
|
+
|
94
|
+
# make it fully qualified
|
95
|
+
M2_HOME=`cd "$M2_HOME" && pwd`
|
96
|
+
|
97
|
+
cd "$saveddir"
|
98
|
+
# echo Using m2 at $M2_HOME
|
99
|
+
fi
|
100
|
+
|
101
|
+
# For Cygwin, ensure paths are in UNIX format before anything is touched
|
102
|
+
if $cygwin ; then
|
103
|
+
[ -n "$M2_HOME" ] &&
|
104
|
+
M2_HOME=`cygpath --unix "$M2_HOME"`
|
105
|
+
[ -n "$JAVA_HOME" ] &&
|
106
|
+
JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
|
107
|
+
[ -n "$CLASSPATH" ] &&
|
108
|
+
CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
|
109
|
+
fi
|
110
|
+
|
111
|
+
# For Mingw, ensure paths are in UNIX format before anything is touched
|
112
|
+
if $mingw ; then
|
113
|
+
[ -n "$M2_HOME" ] &&
|
114
|
+
M2_HOME="`(cd "$M2_HOME"; pwd)`"
|
115
|
+
[ -n "$JAVA_HOME" ] &&
|
116
|
+
JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
|
117
|
+
fi
|
118
|
+
|
119
|
+
if [ -z "$JAVA_HOME" ]; then
|
120
|
+
javaExecutable="`which javac`"
|
121
|
+
if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
|
122
|
+
# readlink(1) is not available as standard on Solaris 10.
|
123
|
+
readLink=`which readlink`
|
124
|
+
if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
|
125
|
+
if $darwin ; then
|
126
|
+
javaHome="`dirname \"$javaExecutable\"`"
|
127
|
+
javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
|
128
|
+
else
|
129
|
+
javaExecutable="`readlink -f \"$javaExecutable\"`"
|
130
|
+
fi
|
131
|
+
javaHome="`dirname \"$javaExecutable\"`"
|
132
|
+
javaHome=`expr "$javaHome" : '\(.*\)/bin'`
|
133
|
+
JAVA_HOME="$javaHome"
|
134
|
+
export JAVA_HOME
|
135
|
+
fi
|
136
|
+
fi
|
137
|
+
fi
|
138
|
+
|
139
|
+
if [ -z "$JAVACMD" ] ; then
|
140
|
+
if [ -n "$JAVA_HOME" ] ; then
|
141
|
+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
142
|
+
# IBM's JDK on AIX uses strange locations for the executables
|
143
|
+
JAVACMD="$JAVA_HOME/jre/sh/java"
|
144
|
+
else
|
145
|
+
JAVACMD="$JAVA_HOME/bin/java"
|
146
|
+
fi
|
147
|
+
else
|
148
|
+
JAVACMD="`which java`"
|
149
|
+
fi
|
150
|
+
fi
|
151
|
+
|
152
|
+
if [ ! -x "$JAVACMD" ] ; then
|
153
|
+
echo "Error: JAVA_HOME is not defined correctly." >&2
|
154
|
+
echo " We cannot execute $JAVACMD" >&2
|
155
|
+
exit 1
|
156
|
+
fi
|
157
|
+
|
158
|
+
if [ -z "$JAVA_HOME" ] ; then
|
159
|
+
echo "Warning: JAVA_HOME environment variable is not set."
|
160
|
+
fi
|
161
|
+
|
162
|
+
CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
|
163
|
+
|
164
|
+
# traverses directory structure from process work directory to filesystem root
|
165
|
+
# first directory with .mvn subdirectory is considered project base directory
|
166
|
+
find_maven_basedir() {
|
167
|
+
|
168
|
+
if [ -z "$1" ]
|
169
|
+
then
|
170
|
+
echo "Path not specified to find_maven_basedir"
|
171
|
+
return 1
|
172
|
+
fi
|
173
|
+
|
174
|
+
basedir="$1"
|
175
|
+
wdir="$1"
|
176
|
+
while [ "$wdir" != '/' ] ; do
|
177
|
+
if [ -d "$wdir"/.mvn ] ; then
|
178
|
+
basedir=$wdir
|
179
|
+
break
|
180
|
+
fi
|
181
|
+
# workaround for JBEAP-8937 (on Solaris 10/Sparc)
|
182
|
+
if [ -d "${wdir}" ]; then
|
183
|
+
wdir=`cd "$wdir/.."; pwd`
|
184
|
+
fi
|
185
|
+
# end of workaround
|
186
|
+
done
|
187
|
+
echo "${basedir}"
|
188
|
+
}
|
189
|
+
|
190
|
+
# concatenates all lines of a file
|
191
|
+
concat_lines() {
|
192
|
+
if [ -f "$1" ]; then
|
193
|
+
echo "$(tr -s '\n' ' ' < "$1")"
|
194
|
+
fi
|
195
|
+
}
|
196
|
+
|
197
|
+
BASE_DIR=`find_maven_basedir "$(pwd)"`
|
198
|
+
if [ -z "$BASE_DIR" ]; then
|
199
|
+
exit 1;
|
200
|
+
fi
|
201
|
+
|
202
|
+
##########################################################################################
|
203
|
+
# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
|
204
|
+
# This allows using the maven wrapper in projects that prohibit checking in binary data.
|
205
|
+
##########################################################################################
|
206
|
+
if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
|
207
|
+
if [ "$MVNW_VERBOSE" = true ]; then
|
208
|
+
echo "Found .mvn/wrapper/maven-wrapper.jar"
|
209
|
+
fi
|
210
|
+
else
|
211
|
+
if [ "$MVNW_VERBOSE" = true ]; then
|
212
|
+
echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
|
213
|
+
fi
|
214
|
+
if [ -n "$MVNW_REPOURL" ]; then
|
215
|
+
jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
|
216
|
+
else
|
217
|
+
jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
|
218
|
+
fi
|
219
|
+
while IFS="=" read key value; do
|
220
|
+
case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
|
221
|
+
esac
|
222
|
+
done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
|
223
|
+
if [ "$MVNW_VERBOSE" = true ]; then
|
224
|
+
echo "Downloading from: $jarUrl"
|
225
|
+
fi
|
226
|
+
wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
|
227
|
+
if $cygwin; then
|
228
|
+
wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
|
229
|
+
fi
|
230
|
+
|
231
|
+
if command -v wget > /dev/null; then
|
232
|
+
if [ "$MVNW_VERBOSE" = true ]; then
|
233
|
+
echo "Found wget ... using wget"
|
234
|
+
fi
|
235
|
+
if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
|
236
|
+
wget "$jarUrl" -O "$wrapperJarPath"
|
237
|
+
else
|
238
|
+
wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
|
239
|
+
fi
|
240
|
+
elif command -v curl > /dev/null; then
|
241
|
+
if [ "$MVNW_VERBOSE" = true ]; then
|
242
|
+
echo "Found curl ... using curl"
|
243
|
+
fi
|
244
|
+
if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
|
245
|
+
curl -o "$wrapperJarPath" "$jarUrl" -f
|
246
|
+
else
|
247
|
+
curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
|
248
|
+
fi
|
249
|
+
|
250
|
+
else
|
251
|
+
if [ "$MVNW_VERBOSE" = true ]; then
|
252
|
+
echo "Falling back to using Java to download"
|
253
|
+
fi
|
254
|
+
javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
|
255
|
+
# For Cygwin, switch paths to Windows format before running javac
|
256
|
+
if $cygwin; then
|
257
|
+
javaClass=`cygpath --path --windows "$javaClass"`
|
258
|
+
fi
|
259
|
+
if [ -e "$javaClass" ]; then
|
260
|
+
if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
|
261
|
+
if [ "$MVNW_VERBOSE" = true ]; then
|
262
|
+
echo " - Compiling MavenWrapperDownloader.java ..."
|
263
|
+
fi
|
264
|
+
# Compiling the Java class
|
265
|
+
("$JAVA_HOME/bin/javac" "$javaClass")
|
266
|
+
fi
|
267
|
+
if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
|
268
|
+
# Running the downloader
|
269
|
+
if [ "$MVNW_VERBOSE" = true ]; then
|
270
|
+
echo " - Running MavenWrapperDownloader.java ..."
|
271
|
+
fi
|
272
|
+
("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
|
273
|
+
fi
|
274
|
+
fi
|
275
|
+
fi
|
276
|
+
fi
|
277
|
+
##########################################################################################
|
278
|
+
# End of extension
|
279
|
+
##########################################################################################
|
280
|
+
|
281
|
+
export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
|
282
|
+
if [ "$MVNW_VERBOSE" = true ]; then
|
283
|
+
echo $MAVEN_PROJECTBASEDIR
|
284
|
+
fi
|
285
|
+
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
|
286
|
+
|
287
|
+
# For Cygwin, switch paths to Windows format before running java
|
288
|
+
if $cygwin; then
|
289
|
+
[ -n "$M2_HOME" ] &&
|
290
|
+
M2_HOME=`cygpath --path --windows "$M2_HOME"`
|
291
|
+
[ -n "$JAVA_HOME" ] &&
|
292
|
+
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
|
293
|
+
[ -n "$CLASSPATH" ] &&
|
294
|
+
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
|
295
|
+
[ -n "$MAVEN_PROJECTBASEDIR" ] &&
|
296
|
+
MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
|
297
|
+
fi
|
298
|
+
|
299
|
+
# Provide a "standardized" way to retrieve the CLI args that will
|
300
|
+
# work with both Windows and non-Windows executions.
|
301
|
+
MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
|
302
|
+
export MAVEN_CMD_LINE_ARGS
|
303
|
+
|
304
|
+
WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
|
305
|
+
|
306
|
+
exec "$JAVACMD" \
|
307
|
+
$MAVEN_OPTS \
|
308
|
+
-classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
|
309
|
+
"-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
|
310
|
+
${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
|
data/mvnw.cmd
ADDED
@@ -0,0 +1,182 @@
|
|
1
|
+
@REM ----------------------------------------------------------------------------
|
2
|
+
@REM Licensed to the Apache Software Foundation (ASF) under one
|
3
|
+
@REM or more contributor license agreements. See the NOTICE file
|
4
|
+
@REM distributed with this work for additional information
|
5
|
+
@REM regarding copyright ownership. The ASF licenses this file
|
6
|
+
@REM to you under the Apache License, Version 2.0 (the
|
7
|
+
@REM "License"); you may not use this file except in compliance
|
8
|
+
@REM with the License. You may obtain a copy of the License at
|
9
|
+
@REM
|
10
|
+
@REM http://www.apache.org/licenses/LICENSE-2.0
|
11
|
+
@REM
|
12
|
+
@REM Unless required by applicable law or agreed to in writing,
|
13
|
+
@REM software distributed under the License is distributed on an
|
14
|
+
@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
15
|
+
@REM KIND, either express or implied. See the License for the
|
16
|
+
@REM specific language governing permissions and limitations
|
17
|
+
@REM under the License.
|
18
|
+
@REM ----------------------------------------------------------------------------
|
19
|
+
|
20
|
+
@REM ----------------------------------------------------------------------------
|
21
|
+
@REM Maven2 Start Up Batch script
|
22
|
+
@REM
|
23
|
+
@REM Required ENV vars:
|
24
|
+
@REM JAVA_HOME - location of a JDK home dir
|
25
|
+
@REM
|
26
|
+
@REM Optional ENV vars
|
27
|
+
@REM M2_HOME - location of maven2's installed home dir
|
28
|
+
@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
|
29
|
+
@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
|
30
|
+
@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
|
31
|
+
@REM e.g. to debug Maven itself, use
|
32
|
+
@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
|
33
|
+
@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
|
34
|
+
@REM ----------------------------------------------------------------------------
|
35
|
+
|
36
|
+
@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
|
37
|
+
@echo off
|
38
|
+
@REM set title of command window
|
39
|
+
title %0
|
40
|
+
@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
|
41
|
+
@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
|
42
|
+
|
43
|
+
@REM set %HOME% to equivalent of $HOME
|
44
|
+
if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
|
45
|
+
|
46
|
+
@REM Execute a user defined script before this one
|
47
|
+
if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
|
48
|
+
@REM check for pre script, once with legacy .bat ending and once with .cmd ending
|
49
|
+
if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
|
50
|
+
if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
|
51
|
+
:skipRcPre
|
52
|
+
|
53
|
+
@setlocal
|
54
|
+
|
55
|
+
set ERROR_CODE=0
|
56
|
+
|
57
|
+
@REM To isolate internal variables from possible post scripts, we use another setlocal
|
58
|
+
@setlocal
|
59
|
+
|
60
|
+
@REM ==== START VALIDATION ====
|
61
|
+
if not "%JAVA_HOME%" == "" goto OkJHome
|
62
|
+
|
63
|
+
echo.
|
64
|
+
echo Error: JAVA_HOME not found in your environment. >&2
|
65
|
+
echo Please set the JAVA_HOME variable in your environment to match the >&2
|
66
|
+
echo location of your Java installation. >&2
|
67
|
+
echo.
|
68
|
+
goto error
|
69
|
+
|
70
|
+
:OkJHome
|
71
|
+
if exist "%JAVA_HOME%\bin\java.exe" goto init
|
72
|
+
|
73
|
+
echo.
|
74
|
+
echo Error: JAVA_HOME is set to an invalid directory. >&2
|
75
|
+
echo JAVA_HOME = "%JAVA_HOME%" >&2
|
76
|
+
echo Please set the JAVA_HOME variable in your environment to match the >&2
|
77
|
+
echo location of your Java installation. >&2
|
78
|
+
echo.
|
79
|
+
goto error
|
80
|
+
|
81
|
+
@REM ==== END VALIDATION ====
|
82
|
+
|
83
|
+
:init
|
84
|
+
|
85
|
+
@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
|
86
|
+
@REM Fallback to current working directory if not found.
|
87
|
+
|
88
|
+
set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
|
89
|
+
IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
|
90
|
+
|
91
|
+
set EXEC_DIR=%CD%
|
92
|
+
set WDIR=%EXEC_DIR%
|
93
|
+
:findBaseDir
|
94
|
+
IF EXIST "%WDIR%"\.mvn goto baseDirFound
|
95
|
+
cd ..
|
96
|
+
IF "%WDIR%"=="%CD%" goto baseDirNotFound
|
97
|
+
set WDIR=%CD%
|
98
|
+
goto findBaseDir
|
99
|
+
|
100
|
+
:baseDirFound
|
101
|
+
set MAVEN_PROJECTBASEDIR=%WDIR%
|
102
|
+
cd "%EXEC_DIR%"
|
103
|
+
goto endDetectBaseDir
|
104
|
+
|
105
|
+
:baseDirNotFound
|
106
|
+
set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
|
107
|
+
cd "%EXEC_DIR%"
|
108
|
+
|
109
|
+
:endDetectBaseDir
|
110
|
+
|
111
|
+
IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
|
112
|
+
|
113
|
+
@setlocal EnableExtensions EnableDelayedExpansion
|
114
|
+
for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
|
115
|
+
@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
|
116
|
+
|
117
|
+
:endReadAdditionalConfig
|
118
|
+
|
119
|
+
SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
|
120
|
+
set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
|
121
|
+
set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
|
122
|
+
|
123
|
+
set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
|
124
|
+
|
125
|
+
FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
|
126
|
+
IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
|
127
|
+
)
|
128
|
+
|
129
|
+
@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
|
130
|
+
@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
|
131
|
+
if exist %WRAPPER_JAR% (
|
132
|
+
if "%MVNW_VERBOSE%" == "true" (
|
133
|
+
echo Found %WRAPPER_JAR%
|
134
|
+
)
|
135
|
+
) else (
|
136
|
+
if not "%MVNW_REPOURL%" == "" (
|
137
|
+
SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
|
138
|
+
)
|
139
|
+
if "%MVNW_VERBOSE%" == "true" (
|
140
|
+
echo Couldn't find %WRAPPER_JAR%, downloading it ...
|
141
|
+
echo Downloading from: %DOWNLOAD_URL%
|
142
|
+
)
|
143
|
+
|
144
|
+
powershell -Command "&{"^
|
145
|
+
"$webclient = new-object System.Net.WebClient;"^
|
146
|
+
"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
|
147
|
+
"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
|
148
|
+
"}"^
|
149
|
+
"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
|
150
|
+
"}"
|
151
|
+
if "%MVNW_VERBOSE%" == "true" (
|
152
|
+
echo Finished downloading %WRAPPER_JAR%
|
153
|
+
)
|
154
|
+
)
|
155
|
+
@REM End of extension
|
156
|
+
|
157
|
+
@REM Provide a "standardized" way to retrieve the CLI args that will
|
158
|
+
@REM work with both Windows and non-Windows executions.
|
159
|
+
set MAVEN_CMD_LINE_ARGS=%*
|
160
|
+
|
161
|
+
%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
|
162
|
+
if ERRORLEVEL 1 goto error
|
163
|
+
goto end
|
164
|
+
|
165
|
+
:error
|
166
|
+
set ERROR_CODE=1
|
167
|
+
|
168
|
+
:end
|
169
|
+
@endlocal & set ERROR_CODE=%ERROR_CODE%
|
170
|
+
|
171
|
+
if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
|
172
|
+
@REM check for post script, once with legacy .bat ending and once with .cmd ending
|
173
|
+
if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
|
174
|
+
if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
|
175
|
+
:skipRcPost
|
176
|
+
|
177
|
+
@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
|
178
|
+
if "%MAVEN_BATCH_PAUSE%" == "on" pause
|
179
|
+
|
180
|
+
if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
|
181
|
+
|
182
|
+
exit /B %ERROR_CODE%
|
data/pom.rb
CHANGED
@@ -2,7 +2,7 @@ require 'fileutils'
|
|
2
2
|
project 'joonsrenderer' do
|
3
3
|
|
4
4
|
model_version '4.0.0'
|
5
|
-
id 'joons:joonsrenderer:1.
|
5
|
+
id 'joons:joonsrenderer:1.3.0'
|
6
6
|
packaging 'jar'
|
7
7
|
description 'joonsrenderer for propane and JRubyArt'
|
8
8
|
organization 'ruby-processing', 'https://ruby-processing.github.io'
|
@@ -18,10 +18,8 @@ project 'joonsrenderer' do
|
|
18
18
|
properties( 'source.directory' => 'src',
|
19
19
|
'joonsrenderer.basedir' => '${project.basedir}',
|
20
20
|
'polyglot.dump.pom' => 'pom.xml',
|
21
|
-
'maven.compiler.source' => '1.8',
|
22
21
|
'project.build.sourceEncoding' => 'utf-8',
|
23
|
-
'
|
24
|
-
'janino.version' => '3.0.12',
|
22
|
+
'janino.version' => '3.1.3',
|
25
23
|
'jogl.version' => '2.3.2',
|
26
24
|
'processing.version' => '3.3.7'
|
27
25
|
)
|
@@ -33,8 +31,8 @@ project 'joonsrenderer' do
|
|
33
31
|
jar('org.codehaus.janino:janino:${janino.version}')
|
34
32
|
|
35
33
|
overrides do
|
36
|
-
plugin :resources, '
|
37
|
-
plugin :dependency, '2
|
34
|
+
plugin :resources, '3.1.0'
|
35
|
+
plugin :dependency, '3.1.2' do
|
38
36
|
execute_goals( id: 'default-cli',
|
39
37
|
artifactItems:[
|
40
38
|
{ groupId: 'org.codehaus.janino',
|
@@ -52,24 +50,26 @@ project 'joonsrenderer' do
|
|
52
50
|
]
|
53
51
|
)
|
54
52
|
end
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
53
|
+
plugin(:compiler, '3.8.1',
|
54
|
+
'release' => '11')
|
55
|
+
plugin(:javadoc, '2.10.4',
|
56
|
+
'detectOfflineLinks' => 'false',
|
57
|
+
'links' => ['${processing.api}',
|
58
|
+
'${jruby.api}'])
|
59
|
+
plugin(:jar, '3.2.0',
|
60
|
+
'archive' => {
|
61
|
+
'manifestEntries' => {
|
62
|
+
'Automatic-Module-Name' => 'joonsrenderer'
|
63
|
+
}
|
64
|
+
})
|
65
|
+
plugin :jdeps, '3.1.2' do
|
66
|
+
execute_goals 'jdkinternals', 'test-jdkinternals'
|
67
|
+
end
|
68
68
|
end
|
69
69
|
|
70
70
|
build do
|
71
71
|
default_goal 'package'
|
72
|
-
source_directory '
|
72
|
+
source_directory '${source.directory}/main/java'
|
73
73
|
final_name 'joonsrenderer'
|
74
74
|
end
|
75
75
|
end
|
data/pom.xml
CHANGED
@@ -6,12 +6,12 @@ DO NOT MODIFIY - GENERATED CODE
|
|
6
6
|
|
7
7
|
|
8
8
|
-->
|
9
|
-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
|
9
|
+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
|
10
10
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
11
11
|
<modelVersion>4.0.0</modelVersion>
|
12
12
|
<groupId>joons</groupId>
|
13
13
|
<artifactId>joonsrenderer</artifactId>
|
14
|
-
<version>1.
|
14
|
+
<version>1.3.0</version>
|
15
15
|
<name>joonsrenderer</name>
|
16
16
|
<description>joonsrenderer for propane and JRubyArt</description>
|
17
17
|
<organization>
|
@@ -59,11 +59,9 @@ DO NOT MODIFIY - GENERATED CODE
|
|
59
59
|
<url>https://github.com/monkstone/joonsrenderer/issues</url>
|
60
60
|
</issueManagement>
|
61
61
|
<properties>
|
62
|
-
<janino.version>3.
|
62
|
+
<janino.version>3.1.3</janino.version>
|
63
63
|
<jogl.version>2.3.2</jogl.version>
|
64
64
|
<joonsrenderer.basedir>${project.basedir}</joonsrenderer.basedir>
|
65
|
-
<maven.compiler.source>1.8</maven.compiler.source>
|
66
|
-
<maven.compiler.target>1.8</maven.compiler.target>
|
67
65
|
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
|
68
66
|
<processing.version>3.3.7</processing.version>
|
69
67
|
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
|
@@ -97,18 +95,18 @@ DO NOT MODIFIY - GENERATED CODE
|
|
97
95
|
</dependency>
|
98
96
|
</dependencies>
|
99
97
|
<build>
|
100
|
-
<sourceDirectory
|
98
|
+
<sourceDirectory>${source.directory}/main/java</sourceDirectory>
|
101
99
|
<defaultGoal>package</defaultGoal>
|
102
100
|
<finalName>joonsrenderer</finalName>
|
103
101
|
<pluginManagement>
|
104
102
|
<plugins>
|
105
103
|
<plugin>
|
106
104
|
<artifactId>maven-resources-plugin</artifactId>
|
107
|
-
<version>
|
105
|
+
<version>3.1.0</version>
|
108
106
|
</plugin>
|
109
107
|
<plugin>
|
110
108
|
<artifactId>maven-dependency-plugin</artifactId>
|
111
|
-
<version>2
|
109
|
+
<version>3.1.2</version>
|
112
110
|
<executions>
|
113
111
|
<execution>
|
114
112
|
<id>default-cli</id>
|
@@ -135,10 +133,9 @@ DO NOT MODIFIY - GENERATED CODE
|
|
135
133
|
</plugin>
|
136
134
|
<plugin>
|
137
135
|
<artifactId>maven-compiler-plugin</artifactId>
|
138
|
-
<version>3.8.
|
136
|
+
<version>3.8.1</version>
|
139
137
|
<configuration>
|
140
|
-
<
|
141
|
-
<target>${maven.compiler.target}</target>
|
138
|
+
<release>11</release>
|
142
139
|
</configuration>
|
143
140
|
</plugin>
|
144
141
|
<plugin>
|
@@ -146,17 +143,35 @@ DO NOT MODIFIY - GENERATED CODE
|
|
146
143
|
<version>2.10.4</version>
|
147
144
|
<configuration>
|
148
145
|
<detectOfflineLinks>false</detectOfflineLinks>
|
146
|
+
<links>
|
147
|
+
<link>${processing.api}</link>
|
148
|
+
<link>${jruby.api}</link>
|
149
|
+
</links>
|
149
150
|
</configuration>
|
150
151
|
</plugin>
|
151
152
|
<plugin>
|
152
153
|
<artifactId>maven-jar-plugin</artifactId>
|
153
|
-
<version>3.0
|
154
|
+
<version>3.2.0</version>
|
154
155
|
<configuration>
|
155
156
|
<archive>
|
156
|
-
<
|
157
|
+
<manifestEntries>
|
158
|
+
<Automatic-Module-Name>joonsrenderer</Automatic-Module-Name>
|
159
|
+
</manifestEntries>
|
157
160
|
</archive>
|
158
161
|
</configuration>
|
159
162
|
</plugin>
|
163
|
+
<plugin>
|
164
|
+
<artifactId>maven-jdeps-plugin</artifactId>
|
165
|
+
<version>3.1.2</version>
|
166
|
+
<executions>
|
167
|
+
<execution>
|
168
|
+
<goals>
|
169
|
+
<goal>jdkinternals</goal>
|
170
|
+
<goal>test-jdkinternals</goal>
|
171
|
+
</goals>
|
172
|
+
</execution>
|
173
|
+
</executions>
|
174
|
+
</plugin>
|
160
175
|
</plugins>
|
161
176
|
</pluginManagement>
|
162
177
|
</build>
|
@@ -68,9 +68,9 @@ public class SunflowAPI implements SunflowAPIInterface {
|
|
68
68
|
UI.printError(Module.API, "JVM available memory is below %d MB (found %d MB only).\nPlease make sure you launched the program with the -Xmx command line options.", RECOMMENDED_MAX_SIZE, maxMb);
|
69
69
|
}
|
70
70
|
String compiler = System.getProperty("java.vm.name");
|
71
|
-
if (compiler == null || !(compiler.contains("HotSpot") && compiler.contains("Server"))) {
|
72
|
-
UI.printError(Module.API, "You do not appear to be running Sun's server JVM\nPerformance may suffer");
|
73
|
-
}
|
71
|
+
// if (compiler == null || !(compiler.contains("HotSpot") && compiler.contains("Server"))) {
|
72
|
+
// UI.printError(Module.API, "You do not appear to be running Sun's server JVM\nPerformance may suffer");
|
73
|
+
// }
|
74
74
|
UI.printDetailed(Module.API, "Java environment settings:");
|
75
75
|
UI.printDetailed(Module.API, " * Max memory available : %d MB", maxMb);
|
76
76
|
UI.printDetailed(Module.API, " * Virtual machine name : %s", compiler == null ? "<unknown" : compiler);
|
@@ -15,7 +15,7 @@ import org.sunflow.system.UI.Module;
|
|
15
15
|
*/
|
16
16
|
public class Geometry implements RenderObject {
|
17
17
|
|
18
|
-
private Tesselatable tesselatable;
|
18
|
+
private final Tesselatable tesselatable;
|
19
19
|
private PrimitiveList primitives;
|
20
20
|
private AccelerationStructure accel;
|
21
21
|
private int builtAccel;
|
@@ -471,7 +471,7 @@ public class KDTree implements AccelerationStructure {
|
|
471
471
|
// current plane
|
472
472
|
int pClosed = 0, pPlanar = 0, pOpened = 0;
|
473
473
|
long ptrMasked = ptr & (~TYPE_MASK & 0xFFFFFFFFF0000000L);
|
474
|
-
long ptrClosed = ptrMasked
|
474
|
+
long ptrClosed = ptrMasked;
|
475
475
|
long ptrPlanar = ptrMasked | PLANAR;
|
476
476
|
long ptrOpened = ptrMasked | OPENED;
|
477
477
|
while (i < nSplits && (splits[i] & 0xFFFFFFFFF0000000L) == ptrClosed) {
|
@@ -41,7 +41,7 @@ public final class CausticPhotonMap implements CausticPhotonMapInterface {
|
|
41
41
|
bounds = new BoundingBox();
|
42
42
|
maxPower = 0;
|
43
43
|
maxRadius = 0;
|
44
|
-
photonList = new ArrayList
|
44
|
+
photonList = new ArrayList<>();
|
45
45
|
photonList.add(null);
|
46
46
|
photons = null;
|
47
47
|
storedPhotons = halfStoredPhotons = 0;
|
@@ -22,7 +22,7 @@ public final class GlobalPhotonMap implements GlobalPhotonMapInterface {
|
|
22
22
|
private int log2n;
|
23
23
|
private int numGather;
|
24
24
|
private float gatherRadius;
|
25
|
-
private BoundingBox bounds;
|
25
|
+
private final BoundingBox bounds;
|
26
26
|
private boolean hasRadiance;
|
27
27
|
private float maxPower;
|
28
28
|
private float maxRadius;
|
@@ -425,7 +425,7 @@ public final class GlobalPhotonMap implements GlobalPhotonMapInterface {
|
|
425
425
|
|
426
426
|
int found;
|
427
427
|
float px, py, pz;
|
428
|
-
private int max;
|
428
|
+
private final int max;
|
429
429
|
private boolean gotHeap;
|
430
430
|
protected float[] dist2;
|
431
431
|
protected Photon[] index;
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: joonsrenderer
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.3.1
|
5
5
|
platform: java
|
6
6
|
authors:
|
7
7
|
- monkstone
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2021-01-31 00:00:00.000000000 Z
|
12
12
|
dependencies: []
|
13
13
|
description: A realistic ray tracer for propane and JRubyArt
|
14
14
|
email:
|
@@ -19,6 +19,7 @@ extra_rdoc_files: []
|
|
19
19
|
files:
|
20
20
|
- ".gitignore"
|
21
21
|
- ".mvn/extensions.xml"
|
22
|
+
- ".mvn/wrapper/MavenWrapperDownloader.java"
|
22
23
|
- ".mvn/wrapper/maven-wrapper.properties"
|
23
24
|
- CHANGELOG.md
|
24
25
|
- Gemfile
|
@@ -57,11 +58,17 @@ files:
|
|
57
58
|
- docs/feed.xml
|
58
59
|
- docs/index.html
|
59
60
|
- joonsrenderer.gemspec
|
60
|
-
- lib/commons-compiler-3.
|
61
|
-
- lib/
|
61
|
+
- lib/commons-compiler-3.1.3.jar
|
62
|
+
- lib/commons.compiler/module-info.class
|
63
|
+
- lib/commons.compiler/module-info.java
|
64
|
+
- lib/janino-3.1.3.jar
|
65
|
+
- lib/janino/module-info.class
|
66
|
+
- lib/janino/module-info.java
|
62
67
|
- lib/joonsrenderer.jar
|
63
68
|
- lib/joonsrenderer.rb
|
64
69
|
- lib/joonsrenderer/version.rb
|
70
|
+
- mvnw
|
71
|
+
- mvnw.cmd
|
65
72
|
- pom.rb
|
66
73
|
- pom.xml
|
67
74
|
- src/a_maintest.java
|
@@ -298,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
298
305
|
- !ruby/object:Gem::Version
|
299
306
|
version: '0'
|
300
307
|
requirements: []
|
301
|
-
rubygems_version: 3.
|
308
|
+
rubygems_version: 3.1.2
|
302
309
|
signing_key:
|
303
310
|
specification_version: 4
|
304
311
|
summary: From Sketch to Ray Traced Image
|