Inherit ProgramPosTex from ProgramBase. Add Matrix3D appendRadians

haxenme · Nov 30, 2023 · a223416 · a223416
1 parent 6497c26
commit a223416
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/nme/geom/Matrix3D.hx b/src/nme/geom/Matrix3D.hx
@@ -88,6 +88,13 @@ class Matrix3D
       this.append(m);
    }
 
+   public function appendRadians(radians:Float, axis:Vector3D, ?pivotPoint:Vector3D):Matrix3D 
+   {
+      appendRotation( radians*180/Math.PI, axis, pivotPoint);
+      return this;
+   }
+
+
    inline public function appendScale(xScale:Float, yScale:Float, zScale:Float):Void 
    {
       this.append(new Matrix3D([xScale, 0.0, 0.0, 0.0, 0.0, yScale, 0.0, 0.0, 0.0, 0.0, zScale, 0.0, 0.0, 0.0, 0.0, 1.0]));

diff --git a/src/nme/gl/ProgramPosTex.hx b/src/nme/gl/ProgramPosTex.hx
@@ -2,15 +2,13 @@ package nme.gl;
 import nme.display.BitmapData;
 import nme.utils.*;
 
-class ProgramPosTex
+class ProgramPosTex extends ProgramBase
 {
    var prog:GLProgram;
 
    var posLocation:Dynamic;
    var mvpLocation:Dynamic;
    var texLocation:Dynamic;
-   var primCount:Int;
-   var type:Int;
    public var posDims:Int;
    public var texDims:Int;
    var posBuffer:GLBuffer;
@@ -46,6 +44,7 @@ class ProgramPosTex
                        fragShader:String, samplerName:String,
                        inPosDims=2, ?inBitmap:BitmapData)
    {
+      super(GL.TRIANGLES, 0);
       prog = Utils.createProgram(vertShader,fragShader);
       posLocation = GL.getAttribLocation(prog, posName);
       texLocation = GL.getAttribLocation(prog, texName);
@@ -55,7 +54,7 @@ class ProgramPosTex
       posDims = inPosDims;
       texDims = 2;
       bitmap = inBitmap;
-      trace("-------------------- mvpLocation : " + mvpLocation);
+      //trace("-------------------- mvpLocation : " + mvpLocation);
       if (bitmap==null)
       {
          createTexture();
@@ -74,7 +73,7 @@ class ProgramPosTex
    public function setPosTex( pos:Array<Float>, texCoords:Array<Float>, inPrims:Int, inType:Int)
    {
       primCount = inPrims;
-      type = inType;
+      primType = inType;
 
       if (posBuffer==null)
          posBuffer = GL.createBuffer();
@@ -106,7 +105,7 @@ class ProgramPosTex
       GL.texImage2D(GL.TEXTURE_2D, 0, GL.RGBA, 256, 256, 0, GL.RGBA, GL.UNSIGNED_BYTE, pixels);
    }
 
-   public function dispose()
+   override public function dispose()
    {
       GL.deleteBuffer(posBuffer);
       GL.deleteBuffer(texBuffer);
@@ -124,7 +123,7 @@ class ProgramPosTex
          GL.bindTexture(GL.TEXTURE_2D, texture);
    }
 
-   public function render(?mvp:Float32Array)
+   override public function render(mvp:Float32Array)
    {
       GL.useProgram(prog);
 
@@ -142,7 +141,7 @@ class ProgramPosTex
 
       GL.enableVertexAttribArray(posLocation);
       GL.enableVertexAttribArray(texLocation);
-      GL.drawArrays(type, 0, primCount);
+      GL.drawArrays(primType, 0, primCount);
       GL.disableVertexAttribArray(texLocation);
       GL.disableVertexAttribArray(posLocation);
    }