Cmake versioning automatization

also fixed DOF
WAUthethird · Feb 5, 2020 · 7b37b5c · 7b37b5c
1 parent c525ec3
commit 7b37b5c
Show file tree

Hide file tree

Showing 17 changed files with 1,566 additions and 206 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,9 @@
-cmake_minimum_required(VERSION 3.0)
-project(MarbleMarcher)
+cmake_minimum_required(VERSION 3.8)
+project(MarbleMarcher VERSION "1.4.3")
 set(CMAKE_CXX_STANDARD 17)
-set(MM_VERSION 1.4.1)
+
+configure_file(src/config.h.in config.h)
+
 if (WIN32)
 	#CHECK THE BITNESS
 	if(CMAKE_SIZEOF_VOID_P EQUAL 8)
@@ -52,9 +54,12 @@ target_include_directories(MarbleMarcherSources PUBLIC
   ${GLEW_INCLUDE_DIRS}
   ${OpenGL_INCLUDE_DIRS}
   ${GLM_INCLUDE_DIR}
+  ${PROJECT_BINARY_DIR}
 )
 
+include_directories(${PROJECT_BINARY_DIR})
 include_directories(${GLM_INCLUDE_DIR})
+
 if(WIN32)
 	target_include_directories(MarbleMarcherSources PUBLIC
 	  ${SFML_INCLUDE_DIR}

diff --git a/assets/icon.ico b/assets/icon.ico
diff --git a/game_folder/images/icon.ico b/game_folder/images/icon.ico
diff --git a/game_folder/levels/scores.bin b/game_folder/levels/scores.bin
diff --git a/game_folder/locals/English.loc b/game_folder/locals/English.loc
@@ -60,7 +60,7 @@ Back To Main Menu
 #CreateNewLvl
 Create a new level
 #About
-©2019 Original by CodeParade, 1.4.1 beta, Community Edition
+Original by CodeParade, Community Edition
 Music by PettyTheft
 #DetailControls
 Roll      WASD or Arrows

diff --git a/game_folder/locals/German.loc b/game_folder/locals/German.loc
@@ -61,7 +61,7 @@ Zurück zum Hauptmenü
 #CreateNewLvl
 Erstelle ein neues Level
 #About
-©2019 Original by CodeParade, 1.4.1 beta, Community Edition
+Original by CodeParade, Community Edition
 Music von PettyTheft
 #DetailControls
 Rollen    WASD oder Pfeiltasten

diff --git a/game_folder/locals/Japanese.loc b/game_folder/locals/Japanese.loc
@@ -60,7 +60,7 @@ Back To Main Menu
 #CreateNewLvl
 Create a new level
 #About
-©2019 Original by CodeParade, 1.4.1 beta, Community Edition
+Original by CodeParade, Community Edition
 Music by PettyTheft
 #DetailControls
 Roll      WASD or Arrows

diff --git a/game_folder/locals/Polish.loc b/game_folder/locals/Polish.loc
@@ -60,7 +60,7 @@ Powrót do menu
 #CreateNewLvl
 Stwórz nowy poziom
 #About
-©2019 Original by CodeParade, 1.4.1 beta, Community Edition
+Original by CodeParade, Community Edition
 Muzyka zrobiona przez PettyTheft
 #DetailControls
 Toczenie się      WASD lub Strzałki

diff --git a/game_folder/locals/Russian.loc b/game_folder/locals/Russian.loc
diff --git a/game_folder/locals/Ukrainian.loc b/game_folder/locals/Ukrainian.loc
@@ -60,7 +60,7 @@ Michael Moroz - англійська, українська та російськ
 #CreateNewLvl
 Створити новий рівень
 #About
-©2019 Original by CodeParade, 1.4.1 beta, Community Edition
+Original by CodeParade, Community Edition
 Музика PettyTheft
 #DetailControls
 Котитися          WASD or Arrows

diff --git a/game_folder/shaders/compute/PTGI/GI.glsl b/game_folder/shaders/compute/PTGI/GI.glsl
@@ -26,7 +26,7 @@ void main() {
 	vec2 pimg_size = vec2(imageSize(DE_input));
 	vec2 step_scale = img_size/pimg_size;
 
-	vec2 uv = (vec2(global_pos)+hash22(vec2(global_pos))-0.5)/img_size;
+	vec2 uv = (vec2(global_pos)+0.5*(hash22(vec2(global_pos))-0.5))/img_size;
 	ray rr = get_ray(uv);
 	ivec2 prev_pos = min(ivec2(round(uv*pimg_size)),ivec2(pimg_size)-1);
 	vec4 pos = vec4(rr.pos,0);
@@ -64,7 +64,11 @@ void main() {
 	pill *= removeK;
 	pdir *= removeK;
 
-	if(pos.w < max(2*fovray*td, MIN_DIST))
+	if(pos.w < -max(2*fovray*td, MIN_DIST))
+	{
+		pill = vec4(0.,0.,0.,1.);
+	}
+	else if(pos.w < max(2*fovray*td, MIN_DIST))
 	{
 		float seed = dot(global_pos,vec2(1., SQRT3)) + float(iFrame%1000)*123.5;
 

diff --git a/game_folder/shaders/compute/main/Final_step.glsl b/game_folder/shaders/compute/main/Final_step.glsl
@@ -17,7 +17,7 @@ layout(rgba32f, binding = 6) uniform image2D color_HDR1;
 #define DOF_samples 50
 #define DOF
 
-#define RA 5.
+#define RA 5
 const float GA = 2.399; 
 const mat2 rot = mat2(cos(GA),sin(GA),-sin(GA),cos(GA));
 
@@ -36,11 +36,11 @@ float convol_kernel(float w1, float w2, float rad)
     return pow(r2,-0.5)*(this_p*cent_p+step(r1,r2)*step(w2,w1)*this_p);
 }
 
-vec4 loadDOFsample(ivec2 c)
+vec4 loadDOFsample(ivec2 c, vec2 imgs)
 {
-	float td = getTD(imageLoad(DE_input, c).xyz, c);
+	c = clamp(c, ivec2(0), ivec2(imgs)-1);
 	vec4 colorsamp = imageLoad(color_HDR1, c);
-	return vec4(colorsamp.xyz/colorsamp.w, td);
+	return vec4(colorsamp.xyz/colorsamp.w, getTD(imageLoad(DE_input, c).xyz, vec2(c)/imgs));
 }
 
 vec3 dof(vec2 uv)
@@ -49,15 +49,15 @@ vec3 dof(vec2 uv)
 	vec2 img_size = vec2(imageSize(color_HDR1));
     vec2 pixel=vec2(img_size.x)*0.001, angle=vec2(0,rad);
     vec4 acc=vec4(0);
-    vec4 center = loadDOFsample(ivec2(uv+pixel*(rad-1.)*angle));
+    vec4 center = loadDOFsample(ivec2(uv+pixel*(rad-1.)*angle), img_size);
     acc += convol_kernel(center.w, center.w, rad)*vec4(center.xyz,1.);
     rad=1.;
 	if(Camera.bokeh > 0.1) for (int j=0;j<DOF_samples;j++)
     {
         rad += 1./rad;
 	    angle *= rot;
 
-        vec4 col = loadDOFsample(ivec2(uv+pixel*(rad-1.)*angle));
+        vec4 col = loadDOFsample(ivec2(uv+pixel*(rad-1.)*angle),img_size);
 
         acc += convol_kernel(center.w, col.w, rad)*vec4(col.xyz,1.);  
     }