Clay Engine: camera drawing

5 files changed, 89 insertions, 1 deletions

diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 82c9ce20a49..6ad18f4afd7 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -168,6 +168,8 @@ data_to_c_simple(shaders/gpu_shader_instance_variying_size_variying_color_vert.g
 data_to_c_simple(shaders/gpu_shader_instance_objectspace_variying_color_vert.glsl SRC)
 data_to_c_simple(shaders/gpu_shader_instance_screenspace_variying_color_vert.glsl SRC)
 data_to_c_simple(shaders/gpu_shader_instance_screen_aligned_axis_name_vert.glsl SRC)
+data_to_c_simple(shaders/gpu_shader_instance_camera_vert.glsl SRC)
+data_to_c_simple(shaders/gpu_shader_instance_distance_line_vert.glsl SRC)
 
 data_to_c_simple(shaders/gpu_shader_3D_groundline_geom.glsl SRC)
 data_to_c_simple(shaders/gpu_shader_3D_groundpoint_vert.glsl SRC)
diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h
index 31b066e7e8e..a974e2ad12f 100644
--- a/source/blender/gpu/GPU_shader.h
+++ b/source/blender/gpu/GPU_shader.h
@@ -149,6 +149,10 @@ typedef enum GPUBuiltinShader {
 	/* bone drawing */
 	GPU_SHADER_3D_OBJECTSPACE_VARIYING_COLOR,
 	GPU_SHADER_3D_OBJECTSPACE_SIMPLE_LIGHTING_VARIYING_COLOR,
+	/* camera drawing */
+	GPU_SHADER_CAMERA,
+	/* distance in front of objects */
+	GPU_SHADER_DISTANCE_LINES,
 	/* axis name */
 	GPU_SHADER_3D_INSTANCE_SCREEN_ALIGNED_AXIS,
 	/* instance */
diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c
index 629980da97b..f554d25082d 100644
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@ -79,6 +79,8 @@ extern char datatoc_gpu_shader_instance_variying_size_variying_color_vert_glsl[]
 extern char datatoc_gpu_shader_instance_objectspace_variying_color_vert_glsl[];
 extern char datatoc_gpu_shader_instance_screenspace_variying_color_vert_glsl[];
 extern char datatoc_gpu_shader_instance_screen_aligned_axis_name_vert_glsl[];
+extern char datatoc_gpu_shader_instance_camera_vert_glsl[];
+extern char datatoc_gpu_shader_instance_distance_line_vert_glsl[];
 
 extern char datatoc_gpu_shader_3D_groundpoint_vert_glsl[];
 extern char datatoc_gpu_shader_3D_groundline_geom_glsl[];
@@ -729,7 +731,12 @@ GPUShader *GPU_shader_get_builtin_shader(GPUBuiltinShader shader)
 		[GPU_SHADER_3D_SCREENSPACE_VARIYING_COLOR] = { datatoc_gpu_shader_instance_screenspace_variying_color_vert_glsl,
 		                                               datatoc_gpu_shader_flat_color_frag_glsl},
 		[GPU_SHADER_3D_INSTANCE_SCREEN_ALIGNED_AXIS] = { datatoc_gpu_shader_instance_screen_aligned_axis_name_vert_glsl,
-		                                     datatoc_gpu_shader_flat_color_frag_glsl},
+		                                                 datatoc_gpu_shader_flat_color_frag_glsl},
+
+		[GPU_SHADER_CAMERA] = { datatoc_gpu_shader_instance_camera_vert_glsl,
+		                        datatoc_gpu_shader_flat_color_frag_glsl},
+		[GPU_SHADER_DISTANCE_LINES] = { datatoc_gpu_shader_instance_distance_line_vert_glsl,
+		                                datatoc_gpu_shader_flat_color_frag_glsl},
 
 		[GPU_SHADER_2D_POINT_FIXED_SIZE_UNIFORM_COLOR] =
 			{ datatoc_gpu_shader_2D_vert_glsl, datatoc_gpu_shader_point_uniform_color_frag_glsl },
diff --git a/source/blender/gpu/shaders/gpu_shader_instance_camera_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_camera_vert.glsl
new file mode 100644
index 00000000000..7ade41c94e8
--- /dev/null
+++ b/source/blender/gpu/shaders/gpu_shader_instance_camera_vert.glsl
@@ -0,0 +1,50 @@
+
+uniform mat4 ViewProjectionMatrix;
+
+/* ---- Instanciated Attribs ---- */
+in float pos;
+
+/* ---- Per instance Attribs ---- */
+in vec3 color;
+in vec4 corners[2]; /* trouble fetching vec2 */
+in float depth;
+in vec4 tria;
+in mat4 InstanceModelMatrix;
+
+flat out vec3 finalColor;
+
+void main()
+{
+	vec3 pPos;
+
+	if (pos == 1.0) {
+		pPos = vec3(corners[0].xy, depth);
+	}
+	else if (pos == 2.0) {
+		pPos = vec3(corners[0].zw, depth);
+	}
+	else if (pos == 3.0) {
+		pPos = vec3(corners[1].xy, depth);
+	}
+	else if (pos == 4.0) {
+		pPos = vec3(corners[1].zw, depth);
+	}
+	else if (pos == 5.0) {
+		pPos = vec3(tria.xy, depth);
+	}
+	else if (pos == 6.0) {
+		vec2 ofs = tria.xy - corners[0].xy;
+		ofs.x = -ofs.x;
+		pPos = vec3(corners[1].zw + ofs, depth);
+	}
+	else if (pos == 7.0) {
+		pPos = vec3(tria.zw, depth);
+	}
+	else {
+		pPos = vec3(0.0);
+	}
+
+	gl_Position = ViewProjectionMatrix * InstanceModelMatrix * vec4(pPos, 1.0);
+
+	finalColor = color;
+}
diff --git a/source/blender/gpu/shaders/gpu_shader_instance_distance_line_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_distance_line_vert.glsl
new file mode 100644
index 00000000000..142df70e68a
--- /dev/null
+++ b/source/blender/gpu/shaders/gpu_shader_instance_distance_line_vert.glsl
@@ -0,0 +1,25 @@
+
+uniform mat4 ViewProjectionMatrix;
+
+/* ---- Instanciated Attribs ---- */
+in vec3 pos;
+
+/* ---- Per instance Attribs ---- */
+in vec3 color;
+in float start;
+in float end;
+in mat4 InstanceModelMatrix;
+
+uniform float size;
+
+flat out vec4 finalColor;
+
+void main()
+{
+	float len = end - start;
+	vec3 sta = vec3(0.0, 0.0, -start);
+
+	gl_Position = ViewProjectionMatrix * InstanceModelMatrix * vec4(pos * -len + sta, 1.0);
+	gl_PointSize = size;
+	finalColor = vec4(color, 1.0);
+}
\ No newline at end of file