hide some more gl functions from APIs

ChronosTeam · Feb 25, 2017 · 19758dd · 19758dd
1 parent 1771af5
commit 19758dd
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 20 deletions.
diff --git a/example/animation/animation.dart b/example/animation/animation.dart
@@ -75,7 +75,7 @@ void main() {
       new StatsFps(HTML.document.getElementById("stats"), "blue", "gray");
   HTML.CanvasElement canvas = HTML.document.querySelector('#webgl-canvas');
   ChronosGL chronosGL = new ChronosGL(canvas);
-  chronosGL.gl.enable(WEBGL.CULL_FACE);
+  chronosGL.enable(WEBGL.CULL_FACE);
   OrbitCamera orbit = new OrbitCamera(5000.0);
   Perspective perspective = new Perspective(orbit, 1.0, 10000.0);
 

diff --git a/example/bubble/bubble.dart b/example/bubble/bubble.dart
@@ -43,7 +43,7 @@ void main() {
       new StatsFps(HTML.document.getElementById("stats"), "blue", "gray");
   HTML.CanvasElement canvas = HTML.document.querySelector('#webgl-canvas');
   ChronosGL chronosGL = new ChronosGL(canvas);
-  chronosGL.gl.enable(WEBGL.CULL_FACE);
+  chronosGL.enable(WEBGL.CULL_FACE);
 
   OrbitCamera orbit = new OrbitCamera(5.0, 10.0);
   Perspective perspective = new Perspective(orbit);

diff --git a/example/light/light.dart b/example/light/light.dart
@@ -37,7 +37,8 @@ void main() {
       new StatsFps(HTML.document.getElementById("stats"), "blue", "gray");
   HTML.CanvasElement canvas = HTML.document.querySelector('#webgl-canvas');
   ChronosGL chronosGL = new ChronosGL(canvas);
-  chronosGL.gl.enable(WEBGL.CULL_FACE);
+  chronosGL.enable(WEBGL.CULL_FACE);
+
   OrbitCamera orbit = new OrbitCamera(50.0, 10.0);
   orbit.setPos(0.0, 0.0, 56.0);
   Perspective perspective = new Perspective(orbit, 0.1, 10000.0);

diff --git a/example/wireframe/wireframe.dart b/example/wireframe/wireframe.dart
@@ -13,6 +13,7 @@ void main() {
 
   HTML.CanvasElement canvas = HTML.document.querySelector('#webgl-canvas');
   ChronosGL chronosGL = new ChronosGL(canvas);
+  chronosGL.enable(WEBGL.CULL_FACE);
 
   var ext = GetGlExtensionStandardDerivatives(chronosGL);
   if (ext == null) HTML.window.alert("OES_standard_derivatives not supported");
@@ -96,8 +97,6 @@ void main() {
   resolutionChange(null);
   HTML.window.onResize.listen(resolutionChange);
 
-  chronosGL.gl.enable(WEBGL.CULL_FACE);
-
   double _lastTimeMs = 0.0;
   void animate(timeMs) {
     timeMs = 0.0 + timeMs;

diff --git a/example/wireframe2/wireframe2.dart b/example/wireframe2/wireframe2.dart
@@ -13,6 +13,7 @@ void main() {
 
   HTML.CanvasElement canvas = HTML.document.querySelector('#webgl-canvas');
   ChronosGL chronosGL = new ChronosGL(canvas);
+  chronosGL.enable(WEBGL.CULL_FACE);
 
   OrbitCamera orbit = new OrbitCamera(25.0, 10.0);
   Perspective perspective = new Perspective(orbit);
@@ -91,8 +92,6 @@ void main() {
   resolutionChange(null);
   HTML.window.onResize.listen(resolutionChange);
 
-  chronosGL.gl.enable(WEBGL.CULL_FACE);
-
   double _lastTimeMs = 0.0;
   void animate(timeMs) {
     timeMs = 0.0 + timeMs;

diff --git a/lib/src/core/chronosgl.dart b/lib/src/core/chronosgl.dart
@@ -70,7 +70,24 @@ class ChronosGL {
     return b;
   }
 
+  void bindFramebuffer(int kind, dynamic framebuffer) {
+    gl.bindFramebuffer(kind, framebuffer);
+  }
+
+  void enable(int kind) {
+    gl.enable(kind);
+  }
+
+  void disable(int kind) {
+    gl.disable(kind);
+  }
+
+  void clear(int kind) {
+    gl.clear(kind);
+  }
+
   void setLineWidth(int w) {
     gl.lineWidth(w);
   }
+
 }
diff --git a/lib/src/core/framebuffer.dart b/lib/src/core/framebuffer.dart
@@ -19,20 +19,20 @@ class ChronosFramebuffer {
         WEBGL.DEPTH_COMPONENT, WEBGL.UNSIGNED_SHORT);
     //depthTexture.Install();
 
-    _cgl.gl.bindFramebuffer(WEBGL.FRAMEBUFFER, framebuffer);
+    _cgl.bindFramebuffer(WEBGL.FRAMEBUFFER, framebuffer);
     _cgl.gl.framebufferTexture2D(WEBGL.FRAMEBUFFER, WEBGL.COLOR_ATTACHMENT0,
         WEBGL.TEXTURE_2D, colorTexture.GetTexture(), 0);
     _cgl.gl.framebufferTexture2D(WEBGL.FRAMEBUFFER, WEBGL.DEPTH_ATTACHMENT,
         WEBGL.TEXTURE_2D, depthTexture.GetTexture(), 0);
 
     _cgl.gl.bindTexture(WEBGL.TEXTURE_2D, null);
-    _cgl.gl.bindFramebuffer(WEBGL.FRAMEBUFFER, null);
+    _cgl.bindFramebuffer(WEBGL.FRAMEBUFFER, null);
   }
 
   ChronosFramebuffer.FromTexture(this._cgl, this.colorTexture) {
     framebuffer = _cgl.gl.createFramebuffer();
 
-    _cgl.gl.bindFramebuffer(WEBGL.FRAMEBUFFER, framebuffer);
+    _cgl.bindFramebuffer(WEBGL.FRAMEBUFFER, framebuffer);
     _cgl.gl.framebufferTexture2D(WEBGL.FRAMEBUFFER, WEBGL.COLOR_ATTACHMENT0,
         WEBGL.TEXTURE_2D, colorTexture.GetTexture(), 0);
 
@@ -48,7 +48,7 @@ class ChronosFramebuffer {
     if (err != WEBGL.FRAMEBUFFER_COMPLETE) {
       throw "Error Incomplete Framebuffer: ${err}";
     }
-    _cgl.gl.bindFramebuffer(WEBGL.FRAMEBUFFER, null);
+    _cgl.bindFramebuffer(WEBGL.FRAMEBUFFER, null);
   }
 
   bool ready() {
@@ -63,7 +63,7 @@ class ChronosFramebuffer {
   // e.g. into Float32List
   // BROKEN: https://github.com/dart-lang/sdk/issues/11614
   void ExtractData(var buf, int x, int y, int w, int h) {
-    _cgl.gl.bindFramebuffer(WEBGL.FRAMEBUFFER, framebuffer);
+    _cgl.bindFramebuffer(WEBGL.FRAMEBUFFER, framebuffer);
     // RGB (3 values per pixel), RGBA (4 values per pixel)
     // see TypeToNumChannels
     int implFormat = _cgl.gl
@@ -74,7 +74,7 @@ class ChronosFramebuffer {
         .getParameter(WEBGL.RenderingContext.IMPLEMENTATION_COLOR_READ_TYPE);
     print("impl type: ${implType}");
     _cgl.gl.readPixels(x, y, w, h, implFormat, implType, buf);
-    _cgl.gl.bindFramebuffer(WEBGL.FRAMEBUFFER, null);
+    _cgl.bindFramebuffer(WEBGL.FRAMEBUFFER, null);
   }
 }
 

diff --git a/lib/src/core/render_phase.dart b/lib/src/core/render_phase.dart
@@ -22,9 +22,9 @@ class RenderPhase extends NamedEntity {
 
   void draw(List<RenderInputProvider> inputs, [List<DrawStats> stats = null]) {
     if (_framebuffer == null) {
-      _cgl.gl.bindFramebuffer(WEBGL.FRAMEBUFFER, null);
+      _cgl.bindFramebuffer(WEBGL.FRAMEBUFFER, null);
     } else {
-      _cgl.gl.bindFramebuffer(WEBGL.FRAMEBUFFER, _framebuffer.framebuffer);
+      _cgl.bindFramebuffer(WEBGL.FRAMEBUFFER, _framebuffer.framebuffer);
     }
     assert(viewPortW > 0 && viewPortH > 0);
     _cgl.gl.viewport(viewPortX, viewPortY, viewPortW, viewPortH);
@@ -33,7 +33,7 @@ class RenderPhase extends NamedEntity {
       int mode = 0;
       if (clearColorBuffer) mode |= WEBGL.COLOR_BUFFER_BIT;
       if (clearDepthBuffer) mode |= WEBGL.DEPTH_BUFFER_BIT;
-      _cgl.gl.clear(mode);
+      _cgl.clear(mode);
     }
 
     for (RenderProgram prg in _programs) {

diff --git a/lib/src/core/shader_program.dart b/lib/src/core/shader_program.dart
@@ -74,19 +74,19 @@ class ShaderProgram extends RenderProgram {
         break;
       case cDepthTest:
         if (val == true) {
-          _cgl.gl.enable(WEBGL.DEPTH_TEST);
+          _cgl.enable(WEBGL.DEPTH_TEST);
         } else {
-          _cgl.gl.disable(WEBGL.DEPTH_TEST);
+          _cgl.disable(WEBGL.DEPTH_TEST);
         }
         break;
       case cDepthWrite:
         _cgl.gl.depthMask(val);
         break;
       case cBlend:
         if (val == true) {
-          _cgl.gl.enable(WEBGL.BLEND);
+          _cgl.enable(WEBGL.BLEND);
         } else {
-          _cgl.gl.disable(WEBGL.BLEND);
+          _cgl.disable(WEBGL.BLEND);
         }
         break;
       case cBlendEquation: