halotroop
/
Ginger3D
1
0
Fork 0
Code Pull Requests Packages Releases Activity

add vulkan to pom.xml

pull/12/head
hYdos 2020-03-02 17:03:14 +10:00
parent 4f57639aeb
commit b747ba2c48
4 changed files with 44 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.classpath
View File

@ -1,19 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"> <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes> <attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>

73
pom.xml
View File

@ -10,17 +10,31 @@
<description>A voxel game implementation of the Ginger3D engine by hYdos</description> <description>A voxel game implementation of the Ginger3D engine by hYdos</description>
<url>http://maven.apache.org</url> <url>http://maven.apache.org</url>
<properties> <properties>
<maven.compiler.target>11</maven.compiler.target> <maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source> <maven.compiler.source>11</maven.compiler.source>
<lwjgl.version>3.2.3</lwjgl.version> <lwjgl.version>3.2.4-SNAPSHOT</lwjgl.version>
<joml.version>1.9.20</joml.version> <joml.version>1.9.20</joml.version>
</properties> </properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.lwjgl</groupId>
<artifactId>lwjgl-bom</artifactId>
<version>${lwjgl.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>
<profiles> <profiles>
<profile> <profile>
<id>lwjgl-natives-linux</id> <id>lwjgl-natives-linux</id>
<activation> <activation>
<os><family>unix</family></os> <os>
<family>unix</family>
</os>
</activation> </activation>
<properties> <properties>
<lwjgl.natives>natives-linux</lwjgl.natives> <lwjgl.natives>natives-linux</lwjgl.natives>
@ -29,7 +43,9 @@
<profile> <profile>
<id>lwjgl-natives-macos</id> <id>lwjgl-natives-macos</id>
<activation> <activation>
<os><family>mac</family></os> <os>
<family>mac</family>
</os>
</activation> </activation>
<properties> <properties>
<lwjgl.natives>natives-macos</lwjgl.natives> <lwjgl.natives>natives-macos</lwjgl.natives>
@ -38,7 +54,9 @@
<profile> <profile>
<id>lwjgl-natives-windows</id> <id>lwjgl-natives-windows</id>
<activation> <activation>
<os><family>windows</family></os> <os>
<family>windows</family>
</os>
</activation> </activation>
<properties> <properties>
<lwjgl.natives>natives-windows</lwjgl.natives> <lwjgl.natives>natives-windows</lwjgl.natives>
@ -74,12 +92,12 @@
<repositories> <repositories>
<repository> <repository>
<id>jitpack.io</id> <id>jitpack.io</id>
<url>https://jitpack.io</url> <url>https://jitpack.io</url>
</repository> </repository>
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.joml</groupId> <groupId>org.joml</groupId>
<artifactId>joml</artifactId> <artifactId>joml</artifactId>
@ -89,191 +107,162 @@
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-par</artifactId> <artifactId>lwjgl-par</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.lwjgl</groupId>
<artifactId>lwjgl-vulkan</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl</artifactId> <artifactId>lwjgl</artifactId>
<version>${lwjgl.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-assimp</artifactId> <artifactId>lwjgl-assimp</artifactId>
<version>${lwjgl.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-bgfx</artifactId> <artifactId>lwjgl-bgfx</artifactId>
<version>${lwjgl.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-glfw</artifactId> <artifactId>lwjgl-glfw</artifactId>
<version>${lwjgl.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-nanovg</artifactId> <artifactId>lwjgl-nanovg</artifactId>
<version>${lwjgl.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-nuklear</artifactId> <artifactId>lwjgl-nuklear</artifactId>
<version>${lwjgl.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-openal</artifactId> <artifactId>lwjgl-openal</artifactId>
<version>${lwjgl.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-opengl</artifactId> <artifactId>lwjgl-opengl</artifactId>
<version>${lwjgl.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-openvr</artifactId> <artifactId>lwjgl-openvr</artifactId>
<version>${lwjgl.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-par</artifactId> <artifactId>lwjgl-par</artifactId>
<version>${lwjgl.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-stb</artifactId> <artifactId>lwjgl-stb</artifactId>
<version>${lwjgl.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl</artifactId> <artifactId>lwjgl</artifactId>
<version>${lwjgl.version}</version>
<classifier>natives-windows</classifier> <classifier>natives-windows</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-assimp</artifactId> <artifactId>lwjgl-assimp</artifactId>
<version>${lwjgl.version}</version>
<classifier>natives-windows</classifier> <classifier>natives-windows</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-bgfx</artifactId> <artifactId>lwjgl-bgfx</artifactId>
<version>${lwjgl.version}</version>
<classifier>natives-windows</classifier> <classifier>natives-windows</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-glfw</artifactId> <artifactId>lwjgl-glfw</artifactId>
<version>${lwjgl.version}</version>
<classifier>natives-windows</classifier> <classifier>natives-windows</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-nanovg</artifactId> <artifactId>lwjgl-nanovg</artifactId>
<version>${lwjgl.version}</version>
<classifier>natives-windows</classifier> <classifier>natives-windows</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-nuklear</artifactId> <artifactId>lwjgl-nuklear</artifactId>
<version>${lwjgl.version}</version>
<classifier>natives-windows</classifier> <classifier>natives-windows</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-openal</artifactId> <artifactId>lwjgl-openal</artifactId>
<version>${lwjgl.version}</version>
<classifier>natives-windows</classifier> <classifier>natives-windows</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-opengl</artifactId> <artifactId>lwjgl-opengl</artifactId>
<version>${lwjgl.version}</version>
<classifier>natives-windows</classifier> <classifier>natives-windows</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-openvr</artifactId> <artifactId>lwjgl-openvr</artifactId>
<version>${lwjgl.version}</version>
<classifier>natives-windows</classifier> <classifier>natives-windows</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-par</artifactId> <artifactId>lwjgl-par</artifactId>
<version>${lwjgl.version}</version>
<classifier>natives-windows</classifier> <classifier>natives-windows</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-stb</artifactId> <artifactId>lwjgl-stb</artifactId>
<version>${lwjgl.version}</version>
<classifier>natives-windows</classifier> <classifier>natives-windows</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl</artifactId> <artifactId>lwjgl</artifactId>
<version>${lwjgl.version}</version>
<classifier>natives-macos</classifier> <classifier>natives-macos</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-assimp</artifactId> <artifactId>lwjgl-assimp</artifactId>
<version>${lwjgl.version}</version>
<classifier>natives-macos</classifier> <classifier>natives-macos</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-bgfx</artifactId> <artifactId>lwjgl-bgfx</artifactId>
<version>${lwjgl.version}</version>
<classifier>natives-macos</classifier> <classifier>natives-macos</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-glfw</artifactId> <artifactId>lwjgl-glfw</artifactId>
<version>${lwjgl.version}</version>
<classifier>natives-macos</classifier> <classifier>natives-macos</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-nanovg</artifactId> <artifactId>lwjgl-nanovg</artifactId>
<version>${lwjgl.version}</version>
<classifier>natives-macos</classifier> <classifier>natives-macos</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-nuklear</artifactId> <artifactId>lwjgl-nuklear</artifactId>
<version>${lwjgl.version}</version>
<classifier>natives-macos</classifier> <classifier>natives-macos</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-openal</artifactId> <artifactId>lwjgl-openal</artifactId>
<version>${lwjgl.version}</version>
<classifier>natives-macos</classifier> <classifier>natives-macos</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-opengl</artifactId> <artifactId>lwjgl-opengl</artifactId>
<version>${lwjgl.version}</version>
<classifier>natives-macos</classifier> <classifier>natives-macos</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-openvr</artifactId> <artifactId>lwjgl-openvr</artifactId>
<version>${lwjgl.version}</version>
<classifier>natives-macos</classifier> <classifier>natives-macos</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-par</artifactId> <artifactId>lwjgl-par</artifactId>
<version>${lwjgl.version}</version>
<classifier>natives-macos</classifier> <classifier>natives-macos</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-stb</artifactId> <artifactId>lwjgl-stb</artifactId>
<version>${lwjgl.version}</version>
<classifier>natives-macos</classifier> <classifier>natives-macos</classifier>
</dependency> </dependency>
<dependency> <dependency>

2
src/main/java/com/github/hydos/ginger/engine/vulkan/api/GingerV.java → src/main/java/com/github/hydos/ginger/engine/vulkan/api/VKGinger.java
View File

@ -1,5 +1,5 @@
package com.github.hydos.ginger.engine.vulkan.api; package com.github.hydos.ginger.engine.vulkan.api;
public class GingerV { public class VKGinger {
} }

9
src/main/java/com/github/hydos/ginger/engine/vulkan/utils/VLoader.java → src/main/java/com/github/hydos/ginger/engine/vulkan/utils/VKLoader.java
View File

@ -1,10 +1,15 @@
package com.github.hydos.ginger.engine.vulkan.utils; package com.github.hydos.ginger.engine.vulkan.utils;
/** /**
* *
* @author hayden * @author hydos
* used to load vulkan related objects such as textures * used to load vulkan related objects such as textures
* *
*/ */
public class VLoader { public class VKLoader {
public void setupVulkan() {
}
} }