Skip to content

Commit fee7925

Browse files
skalarproduktraumskalarproduktraum
committed
Merge branch 'scenegraph' of https://github.com/tpietzsch/ClearGL into tpietzsch-scenegraph
2 parents 70653ed + 48da8e1 commit fee7925

40 files changed

+2945
-3127
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/

‎build.gradle‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ dependencies
6666
compile ('org.jogamp.jogl:jogl-all:2.3.2:natives-windows-amd64'){transitive = true}
6767
compile ('org.jogamp.jogl:jogl-all:2.3.2:natives-linux-amd64'){transitive = true}
6868

69-
compile group: "net.coremem", name: "CoreMem", version: "(,1.0.0]", changing: true
70-
7169
compile group: 'junit', name: 'junit', version: '4.12'
7270
testCompile group: 'junit', name: 'junit', version: '4.12'
7371
}
@@ -77,9 +75,6 @@ repositories
7775
mavenCentral()
7876
maven
7977
{ url "http://oss.sonatype.org/content/groups/public" }
80-
maven
81-
{ url "http://dl.bintray.com/clearcontrol/ClearControl" }
82-
8378
}
8479

8580

‎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>

‎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>1.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>

0 commit comments

Comments
 (0)