Merge pull request #41 from JuliaGL/sd/images

changes for new images

Author: SimonDanisch

src/GLWindow.jl

@@ -13,11 +13,16 @@ using FixedSizeArrays
 using Compat
 using FileIO
 
-import GLFW.Window
-import GLFW.Monitor
+import GLFW: Window, Monitor
 import GLAbstraction.render
 import GeometryTypes.widths
 
+if isdefined(FixedPointNumbers, :N0f8)
+    import FixedPointNumbers: N0f8
+else
+    const N0f8 = FixedPointNumbers.UFixed8
+end
+
 include("types.jl")
 
 include("core.jl")

src/screen.jl

@@ -454,6 +454,10 @@ function Base.delete!(screen::Screen, robj::RenderObject)
         deleted, i = delete_robj!(renderlist, robj)
         deleted && return true
     end
+    for renderlist in screen.renderlist_fxaa
+        deleted, i = delete_robj!(renderlist, robj)
+        deleted && return true
+    end
     false
 end
 

src/types.jl

@@ -19,10 +19,10 @@ end
 typealias PostProcessROBJ RenderObject{PostprocessPrerender}
 type GLFramebuffer
     id         ::NTuple{2, GLuint}
-    color      ::Texture{RGBA{UFixed8}, 2}
+    color      ::Texture{RGBA{N0f8}, 2}
     objectid   ::Texture{Vec{2, GLushort}, 2}
     depth      ::GLuint
-    color_luma ::Texture{RGBA{UFixed8}, 2}
+    color_luma ::Texture{RGBA{N0f8}, 2}
     postprocess::NTuple{3, PostProcessROBJ}
 end
 Base.size(fb::GLFramebuffer) = size(fb.color) # it's guaranteed, that they all have the same size
@@ -85,7 +85,7 @@ function GLFramebuffer(fb_size)
     glBindFramebuffer(GL_FRAMEBUFFER, render_framebuffer)
 
     buffersize      = tuple(value(fb_size)...)
-    color_buffer    = Texture(RGBA{UFixed8},    buffersize, minfilter=:nearest, x_repeat=:clamp_to_edge)
+    color_buffer    = Texture(RGBA{N0f8},    buffersize, minfilter=:nearest, x_repeat=:clamp_to_edge)
     objectid_buffer = Texture(Vec{2, GLushort}, buffersize, minfilter=:nearest, x_repeat=:clamp_to_edge)
     depth_stencil_rb = Ref{GLuint}()
     glGenRenderbuffers(1, depth_stencil_rb)
@@ -100,7 +100,7 @@ function GLFramebuffer(fb_size)
     status = glCheckFramebufferStatus(GL_FRAMEBUFFER)
     @assert status == GL_FRAMEBUFFER_COMPLETE
 
-    color_luma = Texture(RGBA{UFixed8}, buffersize, minfilter=:linear, x_repeat=:clamp_to_edge)
+    color_luma = Texture(RGBA{N0f8}, buffersize, minfilter=:linear, x_repeat=:clamp_to_edge)
     color_luma_framebuffer = glGenFramebuffers()
     glBindFramebuffer(GL_FRAMEBUFFER, color_luma_framebuffer)
     attach_framebuffer(color_luma, GL_COLOR_ATTACHMENT0)