Added PNGDecoder for futur use (Skybox)

Removed old shaders Added Skybox shaders PageManager and RenderablePage are now SceneManager and Scene -> Every "page" have been changed to "scene" SGELabelPage is now SGETitleScene AudioLogger is now SoundSystemLoggerBridge ModernShader.java has been removed. you can now extend directly from ShaderProgram DeferredRenderer: - Removed some commented code - Moved shadows render to ShadowsRenderer.java - Moved PostProcessing default pipeline to PostProcessingPipelineDefault.java - DeferredRenderer now have a setPostProcessingPipeline(PostProcessingPipeline) function to have custom post processing shaders - Post processing shaders are now an extension of DeferredShaderProgram (easier use) - Removed useless FBOs
Slaynash · Nov 12, 2017 · d633509 · d633509
1 parent f4c8062
commit d633509
Show file tree

Hide file tree

Showing 65 changed files with 580 additions and 631 deletions.
diff --git a/.classpath b/.classpath
@@ -16,5 +16,6 @@
 	<classpathentry kind="lib" path="libs/physics/jbox2d_sge_edition_0808171240.jar"/>
 	<classpathentry kind="lib" path="libs/jamepad_sge_edition_2607171819.jar"/>
 	<classpathentry kind="lib" path="libs/localizationUtils_1792f78.jar"/>
+	<classpathentry kind="lib" path="libs/PNGDecoder.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bin/slaynash/sgengine/Configuration$1.class b/bin/slaynash/sgengine/Configuration$1.class
diff --git a/bin/slaynash/sgengine/Configuration.class b/bin/slaynash/sgengine/Configuration.class
diff --git a/bin/slaynash/sgengine/SGELabelPage.class b/bin/slaynash/sgengine/SGELabelPage.class
diff --git a/bin/slaynash/sgengine/audio/AudioLogger.class b/bin/slaynash/sgengine/audio/AudioLogger.class
diff --git a/bin/slaynash/sgengine/audio/AudioManager.class b/bin/slaynash/sgengine/audio/AudioManager.class
diff --git a/bin/slaynash/sgengine/models/Renderable3dModel.class b/bin/slaynash/sgengine/models/Renderable3dModel.class
diff --git a/bin/slaynash/sgengine/objloader/ObjLoader.class b/bin/slaynash/sgengine/objloader/ObjLoader.class
diff --git a/bin/slaynash/sgengine/shaders/ModernShader.class b/bin/slaynash/sgengine/shaders/ModernShader.class
diff --git a/bin/slaynash/sgengine/shaders/ModernShader3D.class b/bin/slaynash/sgengine/shaders/ModernShader3D.class
diff --git a/bin/slaynash/sgengine/shaders/ModernShaderGUI.class b/bin/slaynash/sgengine/shaders/ModernShaderGUI.class
diff --git a/bin/slaynash/sgengine/shaders/ModernShaderLabel.class b/bin/slaynash/sgengine/shaders/ModernShaderLabel.class
diff --git a/bin/slaynash/sgengine/shaders/ModernShaderVR.class b/bin/slaynash/sgengine/shaders/ModernShaderVR.class
diff --git a/bin/slaynash/sgengine/shaders/ShaderManager.class b/bin/slaynash/sgengine/shaders/ShaderManager.class
diff --git a/bin/slaynash/sgengine/utils/DisplayManager.class b/bin/slaynash/sgengine/utils/DisplayManager.class
diff --git a/bin/slaynash/sgengine/utils/PageManager$1.class b/bin/slaynash/sgengine/utils/PageManager$1.class
diff --git a/bin/slaynash/sgengine/utils/PageManager.class b/bin/slaynash/sgengine/utils/PageManager.class
diff --git a/bin/slaynash/sgengine/utils/RenderablePage.class b/bin/slaynash/sgengine/utils/RenderablePage.class
diff --git a/bin/slaynash/sgengine/utils/pageManagerEvent/PageManagerAdapter.class b/bin/slaynash/sgengine/utils/pageManagerEvent/PageManagerAdapter.class
diff --git a/bin/slaynash/sgengine/utils/pageManagerEvent/PageManagerEvent.class b/bin/slaynash/sgengine/utils/pageManagerEvent/PageManagerEvent.class
diff --git a/bin/slaynash/sgengine/utils/pageManagerEvent/PageManagerListener.class b/bin/slaynash/sgengine/utils/pageManagerEvent/PageManagerListener.class
diff --git a/libs/PNGDecoder.jar b/libs/PNGDecoder.jar
diff --git a/res/shaders/free/free2d.fs b/res/shaders/free/free2d.fs
diff --git a/res/shaders/free/free2d.vs b/res/shaders/free/free2d.vs
diff --git a/res/shaders/free/free3d.fs b/res/shaders/free/free3d.fs
diff --git a/res/shaders/free/free3d.vs b/res/shaders/free/free3d.vs
diff --git a/res/shaders/free/freeGUI.fs b/res/shaders/free/freeGUI.fs
diff --git a/res/shaders/free/freeGUI.vs b/res/shaders/free/freeGUI.vs
diff --git a/res/shaders/free/freeLabel.fs b/res/shaders/free/freeLabel.fs
diff --git a/res/shaders/free/freeLabel.vs b/res/shaders/free/freeLabel.vs
diff --git a/res/shaders/free/freeVR.fs b/res/shaders/free/freeVR.fs
diff --git a/res/shaders/free/freeVR.vs b/res/shaders/free/freeVR.vs
diff --git a/res/shaders/skybox/skybox.fs b/res/shaders/skybox/skybox.fs
@@ -0,0 +1,10 @@
+#version 400
+
+in vec3 textureCoords;
+out vec4 out_Color;
+
+uniform samplerCube cubeMap;
+
+void main(void){
+    out_Color = texture(cubeMap, textureCoords);
+}
diff --git a/res/shaders/skybox/skybox.vs b/res/shaders/skybox/skybox.vs
@@ -0,0 +1,14 @@
+#version 400
+
+in vec3 position;
+out vec3 textureCoords;
+
+uniform mat4 projectionMatrix;
+uniform mat4 viewMatrix;
+
+void main(void){
+
+	gl_Position = projectionMatrix * viewMatrix * vec4(position, 1.0); 
+	textureCoords = position;
+
+}
diff --git a/src/slaynash/sgengine/Configuration.java b/src/slaynash/sgengine/Configuration.java
@@ -5,7 +5,7 @@
 import java.net.URLDecoder;
 
 import slaynash.sgengine.playercharacters.PlayerCharacter;
-import slaynash.sgengine.utils.PageManager;
+import slaynash.sgengine.utils.SceneManager;
 
 public class Configuration {
 
@@ -107,7 +107,11 @@ public static void loadDefault3DRPGConfigurations() {
 		setSelfEntitiesUpdateEnabled(true);
 		setHandRendered(false);
 	}
-
+
+	/**
+	 * @return The install path of the game.<br>
+	 * Default location: jar file location
+	 */
 	public static String getAbsoluteInstallPath() {
 		if(installPath.equals("")){
 			try {
@@ -116,6 +120,7 @@ public static String getAbsoluteInstallPath() {
 				LogSystem.out_println("[Configuration] Root directory: "+installPath);
 			}catch (UnsupportedEncodingException e1) {e1.printStackTrace(LogSystem.getErrStream());}
 		}
+		if(!installPath.endsWith("\\") && !installPath.endsWith("/")) installPath += "/";
 		return installPath;
 	}
 
@@ -188,7 +193,7 @@ public static void setZFar(float zfar){
 	}
 
     public static void enableVR(boolean enable){
-    	if(!PageManager.isInitialized()){
+    	if(!SceneManager.isInitialized()){
     		vr = enable;
     	}
     	else LogSystem.out_println("[PageManager] Display manager already initialized ! Please enable or disable VR before !");
@@ -327,7 +332,7 @@ public static void setHandRendered(boolean handrendered) {
 		Configuration.handRendered = handrendered;
 	}
 
-	public static boolean isDeferredRenderBloomEnabled() {
+	public static boolean isPostProcessingEnabled() {
 		return deferredRenderBloom;
 	}
 

diff --git a/src/slaynash/sgengine/SGELabelPage.java → src/slaynash/sgengine/SGETitleScene.java b/src/slaynash/sgengine/SGELabelPage.java → src/slaynash/sgengine/SGETitleScene.java
@@ -17,12 +17,12 @@
 import slaynash.sgengine.textureUtils.TextureManager;
 import slaynash.sgengine.utils.DisplayManager;
 import slaynash.sgengine.utils.MatrixUtils;
-import slaynash.sgengine.utils.RenderablePage;
+import slaynash.sgengine.utils.Scene;
 import slaynash.sgengine.utils.VRUtils;
 import slaynash.sgengine.utils.vr.VRController;
 import slaynash.sgengine.world3d.loader.Ent_PointLight;
 
-public class SGELabelPage extends RenderablePage {
+public class SGETitleScene extends Scene {
 
 	private float startTime;
 	private TextureDef background;

diff --git a/src/slaynash/sgengine/audio/AudioManager.java b/src/slaynash/sgengine/audio/AudioManager.java
@@ -50,7 +50,7 @@ public static void init() {
 			return;
 		}
 		random = new Random();
-		SoundSystemConfig.setLogger(new AudioLogger());
+		SoundSystemConfig.setLogger(new SoundSystemLoggerBridge());
 		boolean aLCompatible = SoundSystem.libraryCompatible( LibraryLWJGLOpenAL.class ); 
 		try {
 			Class<? extends Library> libraryType = Library.class;

diff --git a/src/slaynash/sgengine/audio/AudioLogger.java → ...engine/audio/SoundSystemLoggerBridge.java b/src/slaynash/sgengine/audio/AudioLogger.java → ...engine/audio/SoundSystemLoggerBridge.java
@@ -3,7 +3,7 @@
 import paulscode.sound.SoundSystemLogger;
 import slaynash.sgengine.LogSystem;
 
-public class AudioLogger extends SoundSystemLogger {
+public class SoundSystemLoggerBridge extends SoundSystemLogger {
 	@Override
 	public void message( String message, int indent )
     {