Skip to content

Commit aaf2807

Browse files
author
Loic Royer
committed
Conflicts: src/java/cleargl/ClearGLWindow.java
2 parents 1409edd + bb9ee7d commit aaf2807

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+4900
-3562
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ hs_err_pid*
1010
old/
1111
src/clearvolume/demo/databig/
1212
cleargl.iml
13+
/target/

‎.travis.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ language: java
22
script: "gradle build"
33
jdk:
44
- oraclejdk8
5-
- oraclejdk7
65
install: gradle assemble --stacktrace

‎README.md‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# ClearGL #
1+
# ClearGL 2.0.0-SNAPSHOT
22

3-
Facade API on top of JOGL (http://jogamp.org/jogl/www/)
4-
offering a more pleasant and object-oriented API for
5-
JOGL in Java.
3+
Facade API on top of JOGL (http://jogamp.org/jogl/www/) offering a simple interface for creating OpenGL contexts/windows, GLSL shader programs, and textures. Use it in your favourite JVM-based language.
4+
5+
_If you are looking for version 1.x, please check out the [**1-STABLE** branch](https://github.com/ClearVolume/ClearGL/tree/1-STABLE)._
66

77
### How to build project with Gradle
88

@@ -14,5 +14,8 @@ JOGL in Java.
1414

1515
### Contributors ###
1616

17-
* Loic Royer (royer -at- mpi-cbg -point- de)
18-
* ... add yourself
17+
* [Loic Royer](https://github.com/royerloic)
18+
* [Ulrik Günther](https://github.com/skalarproduktraum)
19+
* [Tobias Pietzsch](https://github.com/tpietzsch)
20+
* [Martin Weigert](https://github.com/mweigert)
21+
* [Florian Jug](https://github.com/fjug)

‎build.gradle‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
buildscript {
2+
repositories {
3+
mavenCentral()
4+
}
5+
}
6+
17
plugins {
28
id "com.jfrog.bintray" version "1.2"
39
}
@@ -17,22 +23,22 @@ sourceSets
1723
main
1824
{
1925
java
20-
{ srcDir 'src/java' }
26+
{ srcDirs = ['src/main/java'] }
2127
resources
22-
{ srcDir 'src/java' }
28+
{ srcDirs = ['src/main/resources'] }
2329
}
2430
test
2531
{
2632
java
27-
{ srcDir 'src/java' }
33+
{ srcDirs = ['src/test/java'] }
2834
resources
29-
{ srcDir 'src/java' }
35+
{ srcDirs = ['src/test/resources'] }
3036
}
3137
}
3238

3339

3440
sourceCompatibility = 1.8
35-
41+
targetCompatibility = 1.8
3642

3743
test
3844
{
@@ -48,40 +54,26 @@ test
4854

4955
dependencies
5056
{
51-
compile group: 'commons-collections', name: 'commons-collections', version: '3.2.1'
52-
compile group: 'commons-lang', name: 'commons-lang', version: '2.6'
53-
compile group: 'commons-io', name: 'commons-io', version: '2.4'
54-
compile group: 'org.apache.commons', name: 'commons-math3', version: '3.4.1'
55-
compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.1'
56-
compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.1'
57-
58-
compile 'com.miglayout:miglayout:3.7.4'
59-
compile 'net.sf.trove4j:trove4j:3.0.3'
60-
6157
compile ('org.jogamp.gluegen:gluegen-rt:2.3.2'){transitive = true}
6258
compile ('org.jogamp.gluegen:gluegen-rt:2.3.2:natives-macosx-universal'){transitive = true}
6359
compile ('org.jogamp.gluegen:gluegen-rt:2.3.2:natives-windows-amd64'){transitive = true}
6460
compile ('org.jogamp.gluegen:gluegen-rt:2.3.2:natives-linux-amd64'){transitive = true}
6561

6662

67-
compile ('org.jogamp.jogl:jogl-all:2.3.2'){transitive = true}
68-
//compile ('org.jogamp.jogl:jogl-all-main:2.3.2'){transitive = true}
63+
compile ('org.jogamp.jogl:jogl-all:2.3.2'){transitive = false}
6964
compile ('org.jogamp.jogl:jogl-all:2.3.2:natives-macosx-universal'){transitive = true}
7065
compile ('org.jogamp.jogl:jogl-all:2.3.2:natives-windows-amd64'){transitive = true}
7166
compile ('org.jogamp.jogl:jogl-all:2.3.2:natives-linux-amd64'){transitive = true}
7267

73-
compile group: "net.coremem", name: "CoreMem", version: "(,1.0.0]", changing: true
74-
7568
compile group: 'junit', name: 'junit', version: '4.12'
7669
testCompile group: 'junit', name: 'junit', version: '4.12'
7770
}
7871

7972
repositories
8073
{
8174
mavenCentral()
82-
maven { url "http://oss.sonatype.org/content/groups/public" }
83-
maven { url "http://dl.bintray.com/clearcontrol/ClearControl" }
84-
75+
maven
76+
{ url "http://oss.sonatype.org/content/groups/public" }
8577
}
8678

8779

@@ -136,7 +128,13 @@ def getVersionName = { ->
136128
}
137129

138130
group = 'net.clearvolume'
139-
version = getVersionName()
131+
archivesBaseName = 'cleargl'
132+
133+
if(project.hasProperty('releasebuild')) {
134+
version = getVersionName()
135+
} else {
136+
version = "2.0.0-SNAPSHOT"
137+
}
140138

141139
artifacts
142140
{

‎cleargl-eclipse-formatter.xml‎

Lines changed: 295 additions & 0 deletions
Large diffs are not rendered by default.

‎cleargl-intellij-codestyle.xml‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<code_scheme name="cleargl">
2+
<option name="AUTODETECT_INDENTS" value="false" />
3+
<option name="GENERATE_FINAL_LOCALS" value="true" />
4+
<option name="GENERATE_FINAL_PARAMETERS" value="true" />
5+
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="1000" />
6+
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="1000" />
7+
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
8+
<value />
9+
</option>
10+
<option name="IMPORT_LAYOUT_TABLE">
11+
<value>
12+
<package name="" withSubpackages="true" static="false" />
13+
<emptyLine />
14+
<package name="" withSubpackages="true" static="true" />
15+
</value>
16+
</option>
17+
<JavaCodeStyleSettings>
18+
<option name="SPACES_WITHIN_ANGLE_BRACKETS" value="true" />
19+
</JavaCodeStyleSettings>
20+
<JetCodeStyleSettings>
21+
<option name="SPACE_AROUND_RANGE" value="true" />
22+
<option name="SPACE_BEFORE_TYPE_COLON" value="true" />
23+
<option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="99" />
24+
<option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="99" />
25+
</JetCodeStyleSettings>
26+
<XML>
27+
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
28+
</XML>
29+
<codeStyleSettings language="Groovy">
30+
<indentOptions>
31+
<option name="USE_TAB_CHARACTER" value="true" />
32+
</indentOptions>
33+
</codeStyleSettings>
34+
<codeStyleSettings language="JAVA">
35+
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
36+
<option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
37+
<option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="3" />
38+
<option name="KEEP_BLANK_LINES_IN_CODE" value="3" />
39+
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="3" />
40+
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
41+
<option name="ALIGN_MULTILINE_RESOURCES" value="false" />
42+
<option name="CALL_PARAMETERS_WRAP" value="1" />
43+
<option name="METHOD_PARAMETERS_WRAP" value="1" />
44+
<option name="RESOURCE_LIST_WRAP" value="5" />
45+
<option name="EXTENDS_LIST_WRAP" value="1" />
46+
<option name="THROWS_LIST_WRAP" value="1" />
47+
<option name="EXTENDS_KEYWORD_WRAP" value="1" />
48+
<option name="THROWS_KEYWORD_WRAP" value="1" />
49+
<option name="METHOD_CALL_CHAIN_WRAP" value="1" />
50+
<option name="BINARY_OPERATION_WRAP" value="1" />
51+
<option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
52+
<option name="TERNARY_OPERATION_WRAP" value="5" />
53+
<option name="ARRAY_INITIALIZER_WRAP" value="1" />
54+
<option name="METHOD_ANNOTATION_WRAP" value="0" />
55+
<option name="CLASS_ANNOTATION_WRAP" value="0" />
56+
<option name="FIELD_ANNOTATION_WRAP" value="0" />
57+
<indentOptions>
58+
<option name="USE_TAB_CHARACTER" value="true" />
59+
</indentOptions>
60+
</codeStyleSettings>
61+
<codeStyleSettings language="kotlin">
62+
<indentOptions>
63+
<option name="USE_TAB_CHARACTER" value="true" />
64+
</indentOptions>
65+
</codeStyleSettings>
66+
</code_scheme>

‎gradle.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
local=true
12
org.gradle.daemon=true
2-
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
3+
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

‎pom.xml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
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 http://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>10.6.0</version>
9+
</parent>
10+
11+
<groupId>net.clearvolume</groupId>
12+
<artifactId>cleargl</artifactId>
13+
<version>2.0.0-SNAPSHOT</version>
14+
15+
<name>ClearGL</name>
16+
<description>jogl convenience wrapper</description>
17+
18+
<properties>
19+
<scijava.jvm.version>1.8</scijava.jvm.version>
20+
<enforcer.skip>true</enforcer.skip>
21+
</properties>
22+
23+
<scm>
24+
<connection>scm:git:git://github.com/ClearVolume/ClearGL</connection>
25+
<developerConnection>scm:git:[email protected]:imglib/imglib2</developerConnection>
26+
<tag>HEAD</tag>
27+
<url>https://github.com/ClearVolume/ClearGL</url>
28+
</scm>
29+
<issueManagement>
30+
<system>GitHub</system>
31+
<url>https://github.com/ClearVolume/ClearGL/issues</url>
32+
</issueManagement>
33+
<ciManagement>
34+
<system>Jenkins</system>
35+
<url>http://jenkins.imagej.net/job/ClearGL/</url>
36+
</ciManagement>
37+
38+
<dependencies>
39+
<dependency>
40+
<groupId>org.jogamp.gluegen</groupId>
41+
<artifactId>gluegen-rt-main</artifactId>
42+
</dependency>
43+
<dependency>
44+
<groupId>org.jogamp.jogl</groupId>
45+
<artifactId>jogl-all-main</artifactId>
46+
</dependency>
47+
48+
<!-- Test dependencies -->
49+
<dependency>
50+
<groupId>junit</groupId>
51+
<artifactId>junit</artifactId>
52+
<scope>test</scope>
53+
</dependency>
54+
</dependencies>
55+
56+
<repositories>
57+
<repository>
58+
<id>imagej.public</id>
59+
<url>http://maven.imagej.net/content/groups/public</url>
60+
</repository>
61+
</repositories>
62+
</project>

‎src/java/cleargl/ClearGLDefaultEventListener.java‎

Lines changed: 0 additions & 89 deletions
This file was deleted.

0 commit comments

Comments
 (0)