PP vertex_normals for efficient vertex-normal calculation

Author: mohawk2

lib/PDL/Graphics/OpenGLQ.pd

@@ -23,11 +23,11 @@ only for internal use - see source
 
 =head1 AUTHOR
 
-Copyright (C) 1997,1998 Tuomas J. Lukka.  
+Copyright (C) 1997,1998 Tuomas J. Lukka.
 All rights reserved. There is no warranty. You are allowed
 to redistribute this software / documentation under certain
-conditions. For details, see the file COPYING in the PDL 
-distribution. If this file is separated from the PDL distribution, 
+conditions. For details, see the file COPYING in the PDL
+distribution. If this file is separated from the PDL distribution,
 the copyright notice should be included in the file.
 
 =cut
@@ -188,7 +188,7 @@ pp_def('gl_arrows',
 		float tmp2[3] = { 0.000001, -0.0001, 1 };
 		broadcastloop %{
 			PDL_Indx a = $indsa(), b = $indsb();
-			float tmp1[3]; 
+			float tmp1[3];
 			float norm[3];
 			float norm2[3];
 			float normlen,origlen,norm2len;
@@ -276,4 +276,19 @@ pp_def('gl_arrows',
 	@internal
 );
 
+pp_def('vertex_normals',
+  Pars => 'vertices(tri=3,v); facenormals(tri,f); uint faceidx(trivert=3,f); [o] vertnorm(tri,v)',
+  GenericTypes => $F,
+  Code => <<'EOF',
+loop(v,tri) %{ $vertnorm() = 0.0f; %}
+loop(f,trivert) %{
+  PDL_ULong vertidx = $faceidx();
+  if (vertidx >= $SIZE(v))
+    $CROAK("faceidx number %"IND_FLAG",%"IND_FLAG" out of range: %"IND_FLAG" > %"IND_FLAG, f, trivert, vertidx, $SIZE(v)-1);
+  loop(tri) %{ $vertnorm(v=>vertidx) += $facenormals(); %}
+%}
+EOF
+  @internal,
+);
+
 pp_done();

lib/PDL/Graphics/TriD/Objects.pm

@@ -136,6 +136,7 @@ sub get_valid_options { +{
 }}
 
 package PDL::Graphics::TriD::Trigrid;
+use PDL::Graphics::OpenGLQ;
 use base qw/PDL::Graphics::TriD::GObject/;
 use fields qw/Faceidx FaceNormals Normals/;
 sub new {
@@ -155,17 +156,14 @@ sub get_valid_options { +{
   ShowNormals => 0,
   Lighting => 1,
 }}
-sub cdummies { # called with (type,colors,points)
-  return $_[1]->dummy(1,$_[2]->getdim(1)); }
+sub cdummies { $_[1]->dummy(1,$_[2]->getdim(1)); }
 sub smoothn { my ($this, $faces) = @_;
   my ($points, $faceidx) = @$this{qw(Points Faceidx)};
   # faces is 3D pdl slices of points, giving cart coords of face verts
   my @p = $faces->mv(1,-1)->dog;
   my $fn = ($p[1]-$p[0])->crossp($p[2]-$p[1])->norm; # flat faces, >= 3 points
   $this->{FaceNormals} = $fn if $this->{Options}{ShowNormals};
-  PDL::cat(
-    map $fn->dice_axis(1,($faceidx==$_)->whichND->slice('(1)'))->mv(1,0)->sumover->norm,
-        0..($points->dim(1)-1) );
+  vertex_normals($this->{Points}, $fn, $faceidx)->norm;
 }
 
 package PDL::Graphics::TriD::Lattice;