separate sphere generation from drawing

Author: mohawk2

lib/PDL/Graphics/OpenGLQ.pd

@@ -60,19 +60,18 @@ pp_addhdr('
 my @internal = (Doc => 'internal', NoPthread => 1);
 
 pp_def(
-  'gl_spheres',
+  'gl_sphere',
   GenericTypes => $F,
-  Pars => 'coords(tri=3,n);
-    float [t] vertices(tri,nVert=CALC(calc_nVert($COMP(slices),$COMP(stacks))));
-    float [t] normals(tri,nVert);
-    uint [t] stripIdx(nIdx=CALC(calc_nIdx($COMP(slices),$COMP(stacks))));',
+  Pars => '
+    [o] vertices(tri=3,nVert=CALC(calc_nVert($COMP(slices),$COMP(stacks))));
+    [o] normals(tri,nVert);
+    uint [o] stripIdx(nIdx=CALC(calc_nIdx($COMP(slices),$COMP(stacks))));',
   OtherPars => 'float radius; int slices; int stacks;',
   CHeader => <<'EOF',
 char *fghGenerateSphere(GLfloat radius, GLint slices, GLint stacks, GLfloat *vertices, GLfloat *normals, int nVert);
 void calc_strip_idx(GLuint  *stripIdx, GLint slices, GLint stacks, int nVert);
 int calc_nVert(GLint slices, GLint stacks);
 int calc_nIdx(GLint slices, GLint stacks);
-int calc_numVertIdxsPerPart(GLint slices);
 EOF
   Code => <<'EOF',
 /* Generate vertices and normals */
@@ -83,6 +82,19 @@ if (err) $CROAK("%s", err);
  * strip.
  */
 calc_strip_idx($P(stripIdx), $COMP(slices), $COMP(stacks), $SIZE(nVert));
+EOF
+  @internal
+);
+
+pp_def(
+  'gl_spheres',
+  GenericTypes => $F,
+  Pars => 'coords(tri=3,n); vertices(tri,nVert); normals(tri,nVert); uint stripIdx(nIdx);',
+  OtherPars => 'int slices; int stacks;',
+  CHeader => <<'EOF',
+int calc_numVertIdxsPerPart(GLint slices);
+EOF
+  Code => <<'EOF',
 glEnableClientState(GL_VERTEX_ARRAY);
 glEnableClientState(GL_NORMAL_ARRAY);
 glVertexPointer(3, GL_FLOAT, 0, $P(vertices));

lib/PDL/Graphics/TriD/GL.pm

@@ -302,10 +302,22 @@ sub PDL::Graphics::TriD::Lines::primitive {OpenGL::Modern::GL_LINES}
 { package PDL::Graphics::TriD::Spheres;
 use OpenGL::Modern qw(glShadeModel GL_SMOOTH);
 use PDL::Graphics::OpenGLQ;
+my %SPHERE;
+my @KEYS = qw(vertices normals idx);
+sub togl_setup {
+  my ($this,$points) = @_;
+  print "togl_setup $this\n" if $PDL::Graphics::TriD::verbose;
+  if (!keys %SPHERE) {
+    @SPHERE{@KEYS} = gl_sphere(0.025, 15, 15);
+  }
+  @{ $this->{Impl} }{@KEYS} = @SPHERE{@KEYS};
+}
 sub gdraw {
-   my($this,$points) = @_;
-   glShadeModel(GL_SMOOTH);
-   PDL::gl_spheres($points, 0.025, 15, 15);
+  my($this,$points) = @_;
+  $this->togl_bind;
+  glShadeModel(GL_SMOOTH);
+  PDL::gl_spheres($points, @{ $this->{Impl} }{@KEYS}, 15, 15);
+  $this->togl_unbind;
 }
 }