Fixed the fov, simplified overlay pass

Author: phillemann

CMakeLists.txt

@@ -94,8 +94,7 @@ graphics/camera/scoped.cpp)
 SET(texture_files textures/interpolators/bernstein_polynomial.cpp
 textures/weights.cpp
 textures/blend.cpp) 
-SET(overlay_files overlay/object.cpp
-overlay/function_backend.cpp) 
+SET(overlay_files overlay/object.cpp) 
 SET(console_files console/streambuf.cpp
 console/object.cpp)
 SET(skydome_files
@@ -107,6 +106,7 @@ scene/instance.cpp
 scene/backend.cpp
 scene/manager.cpp
 scene/scoped_backend.cpp
+scene/function_backend.cpp
 scene/render_pass/scoped.cpp
 )
 SET(prop_files prop/instance.cpp

gizmo/to_mat4.hpp

@@ -0,0 +1,26 @@
+#ifndef INSULA_GIZMO_TO_MAT4_HPP_INCLUDED
+#define INSULA_GIZMO_TO_MAT4_HPP_INCLUDED
+
+#include "rotation_to_mat4.hpp"
+#include "basic.hpp"
+#include <fcppt/math/matrix/translation.hpp>
+
+namespace insula
+{
+namespace gizmo
+{
+template<typename T>
+typename
+fcppt::math::matrix::static_<T,4,4>::type
+to_mat4(
+	gizmo::basic<T,3> const &g)
+{
+	return 
+		rotation_to_mat4(g) * 
+		fcppt::math::matrix::translation(
+			-g.position());
+}
+}
+}
+
+#endif

height_map/object.cpp

@@ -15,6 +15,7 @@
 #include "../math/triangle/to_plane.hpp"
 #include "../scene/render_pass/object.hpp"
 #include "../shadow/object.hpp"
+#include "../gizmo/to_mat4.hpp"
 #include "vf/format.hpp"
 #include "vf/normal.hpp"
 #include "vf/vertex_view.hpp"
@@ -351,8 +352,9 @@ insula::height_map::object::begin(
 
 	shader_.set_uniform(
 		"shadow_mvp",
-		shadow_.mvp(
-			camera_.perspective()));
+		camera_.perspective() * 
+		gizmo::to_mat4(
+			shadow_.gizmo()));
 
 	sge::renderer::scoped_vertex_buffer const scoped_vb_(
 		renderer_,

machine.cpp

@@ -61,6 +61,7 @@
 #include "media_path.hpp"
 // Config file end
 #include <fcppt/text.hpp>
+#include <fcppt/math/deg_to_rad.hpp>
 // Viewport hack begin
 #include <sge/renderer/viewport.hpp>
 #include <sge/renderer/pixel_pos.hpp>
@@ -130,9 +131,10 @@ insula::machine::machine(
 			input_delegator_,
 			sge::renderer::aspect<graphics::scalar>(
 				systems_.renderer()->screen_size()),
-			json::find_member<graphics::scalar>(
-				config_file_,
-				FCPPT_TEXT("camera/fov")),
+			fcppt::math::deg_to_rad(
+				json::find_member<graphics::scalar>(
+					config_file_,
+					FCPPT_TEXT("camera/fov"))),
 			json::find_member<graphics::scalar>(
 				config_file_,
 				FCPPT_TEXT("camera/near")),

media/quad_fragment.glsl

@@ -2,12 +2,15 @@
 
 $$$HEADER$$$
 out vec4 frag_color;
+in vec4 screen_space;
 
 void main()
 {
 	frag_color = 
 		texture2D(
 			texture,
-			gl_FragCoord.xy / screen_size);
+			(screen_space / screen_space.w * 0.5 + 0.5).xy);
+			//gl_FragCoord.xy / screen_size);
+	//		gl_FragCoord.xy / gl_FragCoord.w);
 }
 

media/quad_vertex.glsl

@@ -1,9 +1,13 @@
 #version 140
 
 $$$HEADER$$$
+out vec4 screen_space;
 
 void main()
 {
+	gl_PointSize = float(screen_size);
+	screen_space = mvp 
+			* vec4(position,1.0);
 	gl_Position = 
 		mvp 
 			* vec4(position,1.0);

media/skydome_fragment.glsl

@@ -1,27 +1,21 @@
 #version 140
 
 $$$HEADER$$$
-/*
-uniform vec3 sun_position;
-uniform vec3 color0;
-uniform vec3 color1;
-*/
 
+in vec3 gradient_color_interp;
+in vec3 position_interp;
 out vec4 frag_color;
-in vec3 gradient_color;
-in float sun_intensity;
-in vec3 position_out;
 
 const vec4 sun_color = vec4(1.0,1.0,0.91,1.0);
 
 void main()
 {
-	float sun_intensity = 1.0 - length(position_out - sun_position)/2; 
+	float sun_intensity = 1.0 - length(position_interp - sun_position)/2; 
 	sun_intensity = sun_intensity * sun_intensity * sun_intensity;
 
 	frag_color = 
 		mix(
-			vec4(gradient_color,1.0),
+			vec4(gradient_color_interp,1.0),
 			sun_color,
 			sun_intensity);
 }

media/skydome_vertex.glsl

@@ -1,18 +1,9 @@
 #version 140
 
 $$$HEADER$$$
-/*
-uniform mat4 mvp;
-uniform vec3 sun_position;
-uniform vec3 color0;
-uniform vec3 color1;
 
-in vec3 position;
-*/
-
-out vec3 gradient_color;
-out float sun_intensity;
-out vec3 position_out;
+out vec3 gradient_color_interp;
+out vec3 position_interp;
 
 const float ypos = 0.5;
 
@@ -24,13 +15,12 @@ void main()
 			position - vec3(0,ypos,0),
 			1.0);
 
-	gradient_color = 
+	gradient_color_interp = 
 		mix(
 			color0,
 			color1,
 			position.y);
 
-	position_out = vec3(position);
-
+	position_interp = vec3(position);
 	gl_Position = result;
 }

notizen.org

@@ -10,6 +10,7 @@
 - Landschaftsgenerierung http://www.dungeonleague.com/page/2/
 - Neue AA-Methode: http://www.gamedev.net/community/forums/topic.asp?topic_id=580517
 - VSM, bestes Paper: http://http.developer.nvidia.com/GPUGems3/gpugems3_ch08.html
+- Szenegraphen: http://www.realityprime.com/articles/scenegraphs-past-present-and-future
 * Konfigurationssystem
 - Alle Daten stehen in der json-Datei
 - Alle Subsysteme kriegen ein json-Objekt