Merge branch 'sd/assets'

dennisyangji · Mar 24, 2021 · 7554d9a · 7554d9a
2 parents 4131b7f + 463be34
commit 7554d9a
Show file tree

Hide file tree

Showing 41 changed files with 14 additions and 10,702 deletions.
diff --git a/src/GLVisualize/assets/loading.bin → assets/loading.bin b/src/GLVisualize/assets/loading.bin → assets/loading.bin
diff --git a/...sualize/assets/shader/distance_shape.frag → assets/shader/distance_shape.frag b/...sualize/assets/shader/distance_shape.frag → assets/shader/distance_shape.frag
diff --git a/src/GLVisualize/assets/shader/dots.frag → assets/shader/dots.frag b/src/GLVisualize/assets/shader/dots.frag → assets/shader/dots.frag
diff --git a/src/GLVisualize/assets/shader/dots.vert → assets/shader/dots.vert b/src/GLVisualize/assets/shader/dots.vert → assets/shader/dots.vert
diff --git a/...ualize/assets/shader/fragment_output.frag → assets/shader/fragment_output.frag b/...ualize/assets/shader/fragment_output.frag → assets/shader/fragment_output.frag
diff --git a/src/GLVisualize/assets/shader/intensity.frag → assets/shader/intensity.frag b/src/GLVisualize/assets/shader/intensity.frag → assets/shader/intensity.frag
diff --git a/...Visualize/assets/shader/line_segment.geom → assets/shader/line_segment.geom b/...Visualize/assets/shader/line_segment.geom → assets/shader/line_segment.geom
diff --git a/...Visualize/assets/shader/line_segment.vert → assets/shader/line_segment.vert b/...Visualize/assets/shader/line_segment.vert → assets/shader/line_segment.vert
diff --git a/src/GLVisualize/assets/shader/lines.frag → assets/shader/lines.frag b/src/GLVisualize/assets/shader/lines.frag → assets/shader/lines.frag
diff --git a/src/GLVisualize/assets/shader/lines.geom → assets/shader/lines.geom b/src/GLVisualize/assets/shader/lines.geom → assets/shader/lines.geom
diff --git a/src/GLVisualize/assets/shader/lines.vert → assets/shader/lines.vert b/src/GLVisualize/assets/shader/lines.vert → assets/shader/lines.vert
diff --git a/...GLVisualize/assets/shader/parametric.frag → assets/shader/parametric.frag b/...GLVisualize/assets/shader/parametric.frag → assets/shader/parametric.frag
diff --git a/...GLVisualize/assets/shader/parametric.vert → assets/shader/parametric.vert b/...GLVisualize/assets/shader/parametric.vert → assets/shader/parametric.vert
diff --git a/src/GLVisualize/assets/shader/particles.vert → assets/shader/particles.vert b/src/GLVisualize/assets/shader/particles.vert → assets/shader/particles.vert
diff --git a/...ze/assets/shader/postprocessing/SSAO.frag → assets/shader/postprocessing/SSAO.frag b/...ze/assets/shader/postprocessing/SSAO.frag → assets/shader/postprocessing/SSAO.frag
diff --git a/...sets/shader/postprocessing/SSAO_blur.frag → assets/shader/postprocessing/SSAO_blur.frag b/...sets/shader/postprocessing/SSAO_blur.frag → assets/shader/postprocessing/SSAO_blur.frag
diff --git a/...ze/assets/shader/postprocessing/copy.frag → assets/shader/postprocessing/copy.frag b/...ze/assets/shader/postprocessing/copy.frag → assets/shader/postprocessing/copy.frag
diff --git a/...ets/shader/postprocessing/fullscreen.vert → assets/shader/postprocessing/fullscreen.vert b/...ets/shader/postprocessing/fullscreen.vert → assets/shader/postprocessing/fullscreen.vert
diff --git a/...ze/assets/shader/postprocessing/fxaa.frag → assets/shader/postprocessing/fxaa.frag b/...ze/assets/shader/postprocessing/fxaa.frag → assets/shader/postprocessing/fxaa.frag
diff --git a/...ts/shader/postprocessing/postprocess.frag → ...ts/shader/postprocessing/postprocess.frag b/...ts/shader/postprocessing/postprocess.frag → ...ts/shader/postprocessing/postprocess.frag
diff --git a/src/GLVisualize/assets/shader/sprites.geom → assets/shader/sprites.geom b/src/GLVisualize/assets/shader/sprites.geom → assets/shader/sprites.geom
diff --git a/src/GLVisualize/assets/shader/sprites.vert → assets/shader/sprites.vert b/src/GLVisualize/assets/shader/sprites.vert → assets/shader/sprites.vert
diff --git a/src/GLVisualize/assets/shader/standard.frag → assets/shader/standard.frag b/src/GLVisualize/assets/shader/standard.frag → assets/shader/standard.frag
@@ -73,7 +73,8 @@ vec3 blinnphong(vec3 N, vec3 V, vec3 L, vec3 color){
     vec3 H = normalize(L + V);
 
     float spec_coeff = pow(max(dot(H, N), 0.0), shininess);
-
+    if (diff_coeff <= 0.0 || isnan(spec_coeff))
+        spec_coeff = 0.0;
     // final lighting model
     return vec3(
         ambient * color +

diff --git a/src/GLVisualize/assets/shader/standard.vert → assets/shader/standard.vert b/src/GLVisualize/assets/shader/standard.vert → assets/shader/standard.vert
diff --git a/src/GLVisualize/assets/shader/surface.vert → assets/shader/surface.vert b/src/GLVisualize/assets/shader/surface.vert → assets/shader/surface.vert
diff --git a/src/GLVisualize/assets/shader/texture.frag → assets/shader/texture.frag b/src/GLVisualize/assets/shader/texture.frag → assets/shader/texture.frag
diff --git a/src/GLVisualize/assets/shader/util.vert → assets/shader/util.vert b/src/GLVisualize/assets/shader/util.vert → assets/shader/util.vert
diff --git a/src/GLVisualize/assets/shader/uv_vert.vert → assets/shader/uv_vert.vert b/src/GLVisualize/assets/shader/uv_vert.vert → assets/shader/uv_vert.vert
diff --git a/src/GLVisualize/assets/shader/volume.frag → assets/shader/volume.frag b/src/GLVisualize/assets/shader/volume.frag → assets/shader/volume.frag
@@ -110,6 +110,8 @@ vec3 blinnphong(vec3 N, vec3 V, vec3 L, vec3 color){
     // specular coefficient
     vec3 H = normalize(L + V);
     float spec_coeff = pow(max(dot(H, N), 0.0), shininess);
+    if (diff_coeff <= 0.0 || isnan(spec_coeff))
+        spec_coeff = 0.0;
     // final lighting model
     return vec3(
         ambient * color +
@@ -309,7 +311,7 @@ void main()
 
     float steps = 0.1;
     // the algorithm numbers correspond to the order in the
-    // RaymarchAlgorithm enum defined in AbstractPlotting types.jl 
+    // RaymarchAlgorithm enum defined in AbstractPlotting types.jl
     if(algorithm == 0)
         color = isosurface(start, step_in_dir);
     else if(algorithm == 1)

diff --git a/src/GLVisualize/assets/shader/volume.vert → assets/shader/volume.vert b/src/GLVisualize/assets/shader/volume.vert → assets/shader/volume.vert
diff --git a/experiments/mesh.frag b/experiments/mesh.frag
@@ -6,7 +6,8 @@ vec3 blinnphong(vec3 N, vec3 V, vec3 L, vec3 color){
     vec3 H = normalize(L + V);
 
     float spec_coeff = pow(max(dot(H, N), 0.0), shininess);
-
+    if (diff_coeff <= 0.0 || isnan(spec_coeff))
+        spec_coeff = 0.0;
     // final lighting model
     return vec3(
         get_ambient() * color +

diff --git a/experiments/shaderabstr.jl b/experiments/shaderabstr.jl
@@ -30,15 +30,14 @@ program = disp.renderlist[1][3].vertexarray.program
 
 struct OGLContext <: ShaderAbstractions.AbstractContext end
 
-using GLMakie.GLVisualize: assetpath
 instance = ShaderAbstractions.VertexArray(posmeta, triangles_buff)
 
 ShaderAbstractions.type_string(OGLContext(), Vec2f0)
 
 p = ShaderAbstractions.Program(
     OGLContext(),
-    read(assetpath("shader", "mesh.vert"), String),
-    read(assetpath("shader", "mesh.frag"), String),
+    read(loadshader("mesh.vert"), String),
+    read(loadshader("mesh.frag"), String),
     instance;
 )
 

diff --git a/src/GLMakie.jl b/src/GLMakie.jl
@@ -25,22 +25,7 @@ end
 struct GLBackend <: AbstractPlotting.AbstractBackend
 end
 
-"""
-returns path relative to the assets folder
-"""
-assetpath(folders...) = joinpath(@__DIR__, "GLVisualize", "assets", folders...)
-
-"""
-Loads a file from the asset folder
-"""
-function loadasset(folders...; kw_args...)
-    path = assetpath(folders...)
-    isfile(path) || isdir(path) || error("Could not locate file at $path")
-    load(path; kw_args...)
-end
-
-
-const deps_path = joinpath(@__DIR__, "..", "deps", "deps.jl")
+loadshader(name) = normpath(joinpath(@__DIR__, "..", "assets", "shader", name))
 
 # don't put this into try catch, to not mess with normal errors
 include("gl_backend.jl")
@@ -58,7 +43,6 @@ function __init__()
 end
 
 export set_window_config!
-export assetpath, loadasset
 
 if Base.VERSION >= v"1.4.2"
     include("precompile.jl")

diff --git a/src/GLVisualize/GLVisualize.jl b/src/GLVisualize/GLVisualize.jl
@@ -19,16 +19,12 @@ using Base.Iterators: Repeated, repeated
 using LinearAlgebra
 
 import AbstractPlotting: to_font, glyph_uv_width!
-import ..GLMakie: get_texture!
+import ..GLMakie: get_texture!, loadshader
 
 const GLBoundingBox = FRect3D
 
-using ..GLMakie: assetpath, loadasset
-
-
 include("visualize_interface.jl")
 export visualize # Visualize an object
-export visualize_default # get the default parameter for a visualization
 
 include(joinpath("visualize", "lines.jl"))
 include(joinpath("visualize", "image_like.jl"))