kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore Image as the default container type, with ImageBuffer underneath

Browse Source
This commit is contained in:
Joshua Granick
2014-08-01 21:50:44 -07:00
parent 1749a18ab4
commit d66f48a482
6 changed files with 210 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samples/SimpleImage/Source/Main.hx
View File

@@ -4,7 +4,7 @@ package;
import lime.app.Application;
import lime.graphics.opengl.*;
import lime.graphics.RenderContext;
import lime.media.ImageBuffer;
import lime.media.Image;
import lime.utils.Float32Array;
import lime.utils.GLUtils;
import lime.utils.Matrix4;
@@ -15,7 +15,7 @@ class Main extends Application {
private var buffer:GLBuffer;
private var image:ImageBuffer;
private var image:Image;
private var matrixUniform:GLUniformLocation;
private var program:GLProgram;
private var texture:GLTexture;
@@ -32,7 +32,7 @@ class Main extends Application {
public override function init (context:RenderContext):Void {
image = Assets.getImageBuffer ("assets/lime.png");
image = Assets.getImage ("assets/lime.png");
switch (context) {
@@ -44,10 +44,8 @@ class Main extends Application {
case DOM (element):
#if js
element.style.backgroundColor = "#" + StringTools.hex (config.background, 6);
element.appendChild (image.src);
#end
case FLASH (sprite):
@@ -119,7 +117,7 @@ class Main extends Application {
#if js
gl.texImage2D (gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, image.src);
#else
gl.texImage2D (gl.TEXTURE_2D, 0, gl.RGBA, image.width, image.height, 0, gl.RGBA, gl.UNSIGNED_BYTE, image.data);
gl.texImage2D (gl.TEXTURE_2D, 0, gl.RGBA, image.buffer.width, image.buffer.height, 0, gl.RGBA, gl.UNSIGNED_BYTE, image.data);
#end
gl.texParameteri (gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
gl.texParameteri (gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);