juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-18 11:02:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conflicts after merge with master

Browse Source
This commit is contained in:
Enrico Turri
2019-04-12 08:41:59 +02:00
parent a8fd1ceca0 59758fea55
commit 3e902ecfbd
20 changed files with 445 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
resources/shaders/gouraud.fs
View File

@@ -8,16 +8,22 @@ varying vec2 intensity;
varying vec3 delta_box_min;
varying vec3 delta_box_max;
varying float world_z;
varying vec3 world_pos;
uniform vec4 uniform_color;
// x = min z, y = max z;
uniform vec2 z_range;
// clipping plane (general orientation):
uniform vec4 clipping_plane;
void main()
{
if ((world_z < z_range.x) || (z_range.y < world_z))
if ((world_pos.z < z_range.x) || (z_range.y < world_pos.z))
discard;
if (world_pos.x*clipping_plane.x + world_pos.y*clipping_plane.y + world_pos.z*clipping_plane.z + clipping_plane.w < 0.0 )
discard;
// if the fragment is outside the print volume -> use darker color

4
resources/shaders/gouraud.vs
View File

@@ -34,7 +34,7 @@ varying vec2 intensity;
varying vec3 delta_box_min;
varying vec3 delta_box_max;
varying float world_z;
varying vec3 world_pos;
void main()
{
@@ -69,5 +69,5 @@ void main()
}
gl_Position = ftransform();
world_z = vec3(print_box.volume_world_matrix * gl_Vertex).z;
world_pos = vec3(print_box.volume_world_matrix * gl_Vertex);
}