Update circular point effect

- Remove radius parameter from create_points function.

Author: bluekyu

render_pipeline/rpcore/util/primitives.hpp

@@ -7,7 +7,7 @@
 namespace rpcore {
 
 RENDER_PIPELINE_DECL NodePath create_points(const std::string& name, const std::vector<LPoint3f>& positions,
-    float radius=1.0f, GeomEnums::UsageHint buffer_hint=Geom::UsageHint::UH_static);
+    GeomEnums::UsageHint buffer_hint=Geom::UsageHint::UH_static);
 
 RENDER_PIPELINE_DECL NodePath create_cube(const std::string& name);
 RENDER_PIPELINE_DECL NodePath create_sphere(const std::string& name, unsigned int latitude, unsigned int longitude);

resources/effects/circular_points.yaml

@@ -8,9 +8,19 @@ vertex:
 
     post_transform: |
         gl_PointSize = point_radius * WINDOW_WIDTH * p3d_ProjectionMatrix[0][0] / -(p3d_ModelViewMatrix * p3d_Vertex).z;
-
-        // override normal
-        vOutput.normal = normalize((p3d_ModelMatrix * vec4(0, -1, 0, 0)).xyz);
+        vOutput.normal = vec3((gl_Position.xy / gl_Position.w + vec2(1.0f)) / 2.0f * SCREEN_SIZE,
+            gl_PointSize / 2.0f);
 
 
 fragment:
+    inout: |
+        vec2 circular_points_unit_coord;
+
+    pretest: |
+        circular_points_unit_coord = (gl_FragCoord.xy - vOutput.normal.xy) / vOutput.normal.z;
+        const float sphere_radius_square = dot(circular_points_unit_coord, circular_points_unit_coord);
+        if (sphere_radius_square > 1.0f) discard;
+
+    material: |
+        m.normal.xy = circular_points_unit_coord;
+        m.normal.z = sqrt(1.0f - dot(circular_points_unit_coord, circular_points_unit_coord));

resources/rpcore/shader/templates/envmap.frag.glsl

@@ -41,6 +41,9 @@
 layout(location = 0) out vec4 result;
 
 void main() {
+
+    %pretest%
+
     vec2 texcoord = vOutput.texcoord;
     MaterialBaseInput mInput = get_input_from_p3d(p3d_Material);
 

resources/rpcore/shader/templates/forward.frag.glsl

@@ -76,6 +76,8 @@ layout(location = 0) out vec4 color_result;
 
 void main() {
 
+    %pretest%
+
     MaterialBaseInput mInput = get_input_from_p3d(p3d_Material);
 
     vec2 texcoord = vOutput.texcoord;

resources/rpcore/shader/templates/gbuffer.frag.glsl

@@ -68,6 +68,8 @@ uniform Panda3DMaterial p3d_Material;
 
 void main() {
 
+    %pretest%
+
     MaterialBaseInput mInput = get_input_from_p3d(p3d_Material);
 
     vec2 texcoord = vOutput.texcoord;

resources/rpcore/shader/templates/shadow.frag.glsl

@@ -41,6 +41,9 @@ uniform sampler2D p3d_Texture0;
 #endif
 
 void main() {
+
+    %pretest%
+
     #if OPT_ALPHA_TESTING
 
         // Alpha tested shadows. This seems to be quite expensive, so we are

resources/rpcore/shader/templates/voxelize.frag.glsl

@@ -43,6 +43,9 @@ uniform writeonly image3D RESTRICT VoxelGridDest;
 #pragma include "includes/nonviewspace_shading_pipeline.inc.glsl"
 
 void main() {
+
+    %pretest%
+
     vec2 texcoord = vOutput.texcoord;
     MaterialBaseInput mInput = get_input_from_p3d(p3d_Material);
 

src/rpcore/util/circular_points_node.cpp

@@ -33,7 +33,7 @@ struct CircularPointsNode::Impl
 CircularPointsNode::Impl::Impl(const std::string& name, const std::vector<LPoint3f>& positions, float radius,
     const std::string& effect_path, GeomEnums::UsageHint buffer_hint)
 {
-    points_np_ = create_points(name, positions, radius);
+    points_np_ = create_points(name, positions);
     positions_ = positions;
 
     // Load the effect

src/rpcore/util/primitives.cpp

@@ -23,7 +23,7 @@ static NodePath create_geom_node(const std::string& name, Geom* geom)
     return np;
 }
 
-NodePath create_points(const std::string& name, const std::vector<LPoint3f>& positions, float radius, GeomEnums::UsageHint buffer_hint)
+NodePath create_points(const std::string& name, const std::vector<LPoint3f>& positions, GeomEnums::UsageHint buffer_hint)
 {
     const size_t count = positions.size();
 
@@ -46,9 +46,7 @@ NodePath create_points(const std::string& name, const std::vector<LPoint3f>& pos
     PT(Geom) geom = new Geom(vdata);
     geom->add_primitive(prim);
 
-    NodePath np = create_geom_node(name, geom);
-    np.set_render_mode_thickness(radius);
-    return np;
+    return create_geom_node(name, geom);
 }
 
 NodePath create_cube(const std::string& name)