Breaking release

CairoMakie/src/infrastructure.jl

@@ -150,7 +150,6 @@ to_mime(x::CairoBackend) = to_mime(x.typ)
 
 # The main entry point into the drawing pipeline
 function cairo_draw(screen::CairoScreen, scene::Scene)
-    Makie.update!(scene)
     draw_background(screen, scene)
 
     allplots = get_all_plots(scene)

CairoMakie/src/primitives.jl

@@ -311,7 +311,7 @@ end
 function draw_atomic(scene::Scene, screen::CairoScreen, primitive::Text{<:Tuple{<:G}}) where G <: Union{AbstractArray{<:Makie.GlyphCollection}, Makie.GlyphCollection}
     ctx = screen.context
     @get_attribute(primitive, (rotation, model, space, offset))
-    position = primitive.attributes[:position][]
+    position = primitive.position[]
     # use cached glyph info
     glyph_collection = to_value(primitive[1])
 
@@ -607,11 +607,11 @@ end
 
 
 function draw_atomic(scene::Scene, screen::CairoScreen, primitive::Makie.Mesh)
-    if scene.camera_controls[] isa Union{Camera2D, Makie.PixelCamera}
+    if Makie.cameracontrols(scene) isa Union{Camera2D, Makie.PixelCamera}
         draw_mesh2D(scene, screen, primitive)
     else
         if !haskey(primitive, :faceculling)
-            primitive[:faceculling] = Node(-10)
+            primitive[:faceculling] = Observable(-10)
         end
         draw_mesh3D(scene, screen, primitive)
     end
@@ -679,12 +679,8 @@ function draw_mesh3D(
     model = primitive.model[]
     view = scene.camera.view[]
     projection = scene.camera.projection[]
-    normalmatrix = get(
-        scene.attributes, :normalmatrix, let
-            i = SOneTo(3)
-            transpose(inv(view[i, i] * model[i, i]))
-        end
-    )
+    i = SOneTo(3)
+    normalmatrix = transpose(inv(view[i, i] * model[i, i]))
 
     # Mesh data
     # transform to view/camera space
@@ -722,7 +718,7 @@ function draw_mesh3D(
             p_0_to_1 = (p_yflip .+ 1f0) / 2f0
         end
         p = p_0_to_1 .* scene.camera.resolution[]
-        Vec3f(p[1], p[2], clip[3])
+        return Vec3f(p[1], p[2], clip[3])
     end
 
     # Approximate zorder
@@ -789,7 +785,7 @@ function draw_atomic(scene::Scene, screen::CairoScreen, primitive::Makie.Surface
         primitive[:color] = primitive[3]
     end
     if !haskey(primitive, :faceculling)
-        primitive[:faceculling] = Node(-10)
+        primitive[:faceculling] = Observable(-10)
     end
     draw_mesh3D(scene, screen, primitive, mesh=mesh)
     primitive[:color] = old

CairoMakie/test/runtests.jl

@@ -62,6 +62,7 @@ excludes = Set([
     "Connected Sphere",
     # markers too big, close otherwise, needs to be assimilated with glmakie
     "Unicode Marker",
+    "Depth Shift"
 ])
 excludes2 = Set(["short_tests_90", "short_tests_111", "short_tests_35", "short_tests_13", "short_tests_3"])
 

GLMakie/assets/shader/dots.vert

@@ -9,6 +9,7 @@ struct Nothing{ //Nothing type, to encode if some variable doesn't contain any d
 {{color_norm_type}} color_norm;
 {{color_map_type}}  color_map;
 uniform uint objectid;
+uniform float depth_shift;
 
 flat out vec4 o_color;
 flat out uvec2 o_objectid;
@@ -37,4 +38,5 @@ void main(){
 	colorize(color_map, color, color_norm);
     o_objectid  = uvec2(objectid, gl_VertexID+1);
 	gl_Position = projectionview * model * _position(vertex);
+    gl_Position.z += gl_Position.w * depth_shift;
 }

GLMakie/assets/shader/heatmap.vert

@@ -7,6 +7,7 @@ in vec2 vertices;
 
 uniform mat4 projection, view, model;
 uniform uint objectid;
+uniform float depth_shift;
 
 out vec2 o_uv;
 flat out uvec2 o_objectid;
@@ -38,4 +39,5 @@ void main(){
     float y = texelFetch(position_y, index2D.y, 0).x;
 
     gl_Position = projection * view * model * vec4(x, y, 0, 1);
+    gl_Position.z += gl_Position.w * depth_shift;
 }

GLMakie/assets/shader/image.vert

@@ -6,6 +6,7 @@ in vec2 texturecoordinates;
 
 uniform mat4 projection, view, model;
 uniform uint objectid;
+uniform float depth_shift;
 
 out vec2 o_uv;
 flat out uvec2 o_objectid;
@@ -23,4 +24,5 @@ void main(){
     o_uv = texturecoordinates;
     o_objectid = uvec2(objectid, gl_VertexID+1);
     gl_Position = projection * view * model * _position(vertices);
+    gl_Position.z += gl_Position.w * depth_shift;
 }

GLMakie/assets/shader/line_segment.vert

@@ -34,11 +34,14 @@ vec4 to_color(float color, sampler1D color_map, vec2 color_norm, int index){
     return color_lookup(color, color_map, color_norm);
 }
 
+uniform float depth_shift;
+
 void main()
 {
     int index = gl_VertexID;
     g_id = uvec2(objectid, index+1);
     g_color = to_color(color, color_map, color_norm, index);
     g_thickness = thickness;
     gl_Position = projectionview * model * to_vec4(vertex);
+    gl_Position.z += gl_Position.w * depth_shift;
 }

GLMakie/assets/shader/lines.vert

@@ -39,13 +39,16 @@ vec4 to_vec4(vec2 v){return vec4(v, 0, 1);}
 int get_valid_vertex(float se){return int(se);}
 int get_valid_vertex(Nothing se){return 1;}
 
+uniform float depth_shift;
 
 void main()
 {
     g_lastlen = lastlen;
     int index = gl_VertexID;
     g_id = uvec2(objectid, index+1);
     g_valid_vertex = get_valid_vertex(valid_vertex);
+
     g_color = _color(color, intensity, color_map, color_norm, index, total_length);
     gl_Position = projection*view*model*to_vec4(vertex);
+    gl_Position.z += gl_Position.w * depth_shift;
 }

GLMakie/assets/shader/parametric.vert

@@ -9,10 +9,12 @@ out vec2 aa_scale;
 uniform vec2 resolution;
 uniform float AntiAliasScale = 0.75;
 uniform float Zoom = 1.;
+uniform float depth_shift;
 
 uniform mat4 projection, projectionview, model;
 void main(){
     o_uv = texturecoordinates;
     aa_scale = vec2(projection[0][0],projection[1][1])*(1.0/resolution)*AntiAliasScale/Zoom;
     gl_Position = projectionview * model * vec4(vertices, 0, 1);
+    gl_Position.z += gl_Position.w * depth_shift;
 }

GLMakie/assets/shader/sprites.geom

@@ -38,6 +38,7 @@ uniform float stroke_width;
 uniform float glow_width;
 uniform int shape; // for RECTANGLE hack below
 uniform vec2 resolution;
+uniform float depth_shift;
 
 in int g_primitive_index[];
 in vec4 g_uv_texture_bbox[];
@@ -79,6 +80,7 @@ float get_distancefield_scale(Nothing distancefield){
 void emit_vertex(vec4 vertex, vec2 uv)
 {
     gl_Position       = vertex;
+    gl_Position.z     += gl_Position.w * depth_shift;
     f_uv              = uv;
     f_uv_texture_bbox = g_uv_texture_bbox[0];
     f_primitive_index = g_primitive_index[0];

GLMakie/assets/shader/util.vert

@@ -234,6 +234,7 @@ out vec3 o_camdir;
 uniform mat3 normalmatrix;
 uniform vec3 lightposition;
 uniform vec3 eyeposition;
+uniform float depth_shift;
 
 
 void render(vec4 position_world, vec3 normal, mat4 view, mat4 projection, vec3 lightposition)
@@ -244,6 +245,7 @@ void render(vec4 position_world, vec3 normal, mat4 view, mat4 projection, vec3 l
     o_view_pos = view * position_world;
     // position in clip space (w/ depth)
     gl_Position = projection * o_view_pos;
+    gl_Position.z += gl_Position.w * depth_shift;
     // direction to light
     o_lightdir = normalize(view*vec4(lightposition, 1.0) - o_view_pos).xyz;
     // direction to camera

GLMakie/assets/shader/volume.frag

@@ -25,6 +25,8 @@ uniform int algorithm;
 uniform float isovalue;
 uniform float isorange;
 
+uniform mat4 model, projectionview;
+
 const float max_distance = 1.3;
 
 const int num_samples = 200;
@@ -206,11 +208,17 @@ vec4 contours(vec3 front, vec3 dir)
     vec3 Lo = vec3(0.0);
     int i = 0;
     vec3 camdir = normalize(-dir);
+    {{depth_init}}
+    // may write: float depth = 100000.0;
     for (i; i < num_samples; ++i) {
         float intensity = texture(volumedata, pos).x;
         vec4 density = color_lookup(intensity, color_map, color_norm, color);
         float opacity = density.a;
         if(opacity > 0.0){
+            {{depth_main}}
+            // may write
+            // vec4 frag_coord = projectionview * model * vec4(pos, 1);
+            // depth = min(depth, frag_coord.z / frag_coord.w);
             vec3 N = gennormal(pos, step_size);
             vec3 L = normalize(o_light_dir - pos);
             vec3 opaque = blinnphong(N, camdir, L, density.rgb);
@@ -221,6 +229,9 @@ vec4 contours(vec3 front, vec3 dir)
         }
         pos += dir;
     }
+    {{depth_write}}
+    // may write:
+    // gl_FragDepth = depth == 100000.0 ? gl_FragDepth : 0.5 * depth + 0.5;
     return vec4(Lo, 1-T);
 }
 
@@ -231,9 +242,15 @@ vec4 isosurface(vec3 front, vec3 dir)
     int i = 0;
     vec4 diffuse_color = color_lookup(isovalue, color_map, color_norm, color);
     vec3 camdir = normalize(-dir);
+    {{depth_init}}
+    // may write: float depth = 100000.0;
     for (i; i < num_samples; ++i){
         float density = texture(volumedata, pos).x;
         if(abs(density - isovalue) < isorange){
+            {{depth_main}}
+            // may write:
+            // vec4 frag_coord = projectionview * model * vec4(pos, 1);
+            // depth = min(depth, frag_coord.z / frag_coord.w);
             vec3 N = gennormal(pos, step_size);
             vec3 L = normalize(o_light_dir - pos);
             // back & frontface...
@@ -244,6 +261,9 @@ vec4 isosurface(vec3 front, vec3 dir)
         }
         pos += dir;
     }
+    {{depth_write}}
+    // may write:
+    // gl_FragDepth = depth == 100000.0 ? gl_FragDepth : 0.5 * depth + 0.5;
     return c;
 }
 

GLMakie/assets/shader/volume.vert

@@ -8,6 +8,7 @@ out vec3 o_light_dir;
 uniform mat4 projectionview, model;
 uniform vec3 lightposition;
 uniform mat4 modelinv;
+uniform float depth_shift;
 
 out vec4 o_view_pos;
 out vec3 o_normal;
@@ -21,4 +22,5 @@ void main()
     frag_vert = world_vert.xyz;
     o_light_dir = vec3(modelinv * vec4(lightposition, 1));
     gl_Position = projectionview * world_vert;
+    gl_Position.z += gl_Position.w * depth_shift;
 }

GLMakie/src/GLAbstraction/AbstractGPUArray.jl

@@ -206,7 +206,7 @@ gpu_setindex!(t) = error("gpu_setindex! not implemented for: $(typeof(t)). This
 max_dim(t)       = error("max_dim not implemented for: $(typeof(t)). This happens, when you call setindex! on an array, without implementing the GPUArray interface")
 
 
-function (::Type{T})(x::Node; kw...) where T <: GPUArray
+function (::Type{T})(x::Observable; kw...) where T <: GPUArray
     gpu_mem = T(x[]; kw...)
     on(x-> update!(gpu_mem, x), x)
     gpu_mem

GLMakie/src/GLAbstraction/GLAbstraction.jl

@@ -15,8 +15,6 @@ using ShaderAbstractions: current_context, is_context_active, context_alive
 
 import FixedPointNumbers: N0f8, N0f16, N0f8, Normed
 
-import Makie: update!
-
 import Base: merge, resize!, similar, length, getindex, setindex!
 
 include("AbstractGPUArray.jl")

GLMakie/src/GLAbstraction/GLRenderObject.jl

@@ -1,6 +1,6 @@
 function RenderObject(
         data::Dict{Symbol}, program, pre,
-        bbs=Node(Rect3f(Vec3f(0), Vec3f(1))),
+        bbs=Observable(Rect3f(Vec3f(0), Vec3f(1))),
         main=nothing
     )
     RenderObject(convert(Dict{Symbol,Any}, data), program, pre, bbs, main)
@@ -22,16 +22,16 @@ Base.setindex!(obj::RenderObject, value, symbol::Symbol, x::Function)     = seti
 Base.setindex!(obj::RenderObject, value, ::Val{:prerender}, x::Function)  = obj.prerenderfunctions[x] = value
 Base.setindex!(obj::RenderObject, value, ::Val{:postrender}, x::Function) = obj.postrenderfunctions[x] = value
 
-const empty_signal = Node(false)
+const empty_signal = Observable(false)
 post_empty() = push!(empty_signal, false)
 
 
 """
 Represents standard sets of function applied before rendering
 """
 struct StandardPrerender
-    transparency::Node{Bool}
-    overdraw::Node{Bool}
+    transparency::Observable{Bool}
+    overdraw::Observable{Bool}
 end
 
 function (sp::StandardPrerender)()
@@ -73,14 +73,14 @@ end
 export EmptyPrerender
 export prerendertype
 
-function instanced_renderobject(data, program, bb=Node(Rect3f(Vec3f(0), Vec3f(1))), primitive::GLenum=GL_TRIANGLES, main=nothing)
+function instanced_renderobject(data, program, bb=Observable(Rect3f(Vec3f(0), Vec3f(1))), primitive::GLenum=GL_TRIANGLES, main=nothing)
     pre = StandardPrerender()
     robj = RenderObject(convert(Dict{Symbol,Any}, data), program, pre, nothing, bb, main)
     robj.postrenderfunction = StandardPostrenderInstanced(main, robj.vertexarray, primitive)
     robj
 end
 
-function std_renderobject(data, program, bb=Node(Rect3f(Vec3f(0), Vec3f(1))), primitive=GL_TRIANGLES, main=nothing)
+function std_renderobject(data, program, bb=Observable(Rect3f(Vec3f(0), Vec3f(1))), primitive=GL_TRIANGLES, main=nothing)
     pre = StandardPrerender()
     robj = RenderObject(convert(Dict{Symbol,Any}, data), program, pre, nothing, bb, main)
     robj.postrenderfunction = StandardPostrender(robj.vertexarray, primitive)
@@ -89,4 +89,3 @@ end
 
 prerendertype(::Type{RenderObject{Pre}}) where {Pre} = Pre
 prerendertype(::RenderObject{Pre}) where {Pre} = Pre
-

GLMakie/src/GLAbstraction/GLTypes.jl

@@ -1,5 +1,5 @@
 ############################################################################
-const TOrSignal{T} = Union{Node{T},T}
+const TOrSignal{T} = Union{Observable{T},T}
 
 const ArrayOrSignal{T,N} = TOrSignal{X} where X <: AbstractArray{T,N}
 const VecOrSignal{T} = ArrayOrSignal{T,1}
@@ -109,7 +109,7 @@ struct FrameBuffer{T}
     id::GLuint
     attachments::Vector{Any}
     context::GLContext
-    function FrameBuffer{T}(dimensions::Node) where T
+    function FrameBuffer{T}(dimensions::Observable) where T
         fb = glGenFramebuffers()
         glBindFramebuffer(GL_FRAMEBUFFER, fb)
         new(id, attachments, current_context())
@@ -303,7 +303,7 @@ end
 function RenderObject(
         data::Dict{Symbol,Any}, program,
         pre::Pre, post,
-        bbs=Node(Rect3f(Vec3f(0), Vec3f(1))),
+        bbs=Observable(Rect3f(Vec3f(0), Vec3f(1))),
         main=nothing
     ) where Pre
     targets = get(data, :gl_convert_targets, Dict())