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

console: make ConsoleRenderContext an extern class

Browse Source 
Finally made ConsoleRenderContext an extern class, thanks to a workaround to
default args not working. @:overload is used in combination with the actual
default args specified in the C++ headers.

See https://github.com/HaxeFoundation/haxe/issues/3955.
This commit is contained in:
James Gray
2016-04-08 17:53:44 -05:00
parent 15b5a2dc3f
commit fe30467393
3 changed files with 23 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lime/_backend/native/NativeApplication.hx
View File

@@ -382,7 +382,7 @@ class NativeApplication {
if (renderer.backend.useHardware) { if (renderer.backend.useHardware) {
#if lime_console #if lime_console
renderer.context = CONSOLE (new ConsoleRenderContext ()); renderer.context = CONSOLE (ConsoleRenderContext.singleton);
#else #else
renderer.context = OPENGL (new GLRenderContext ()); renderer.context = OPENGL (new GLRenderContext ());
#end #end

2
lime/_backend/native/NativeRenderer.hx
View File

@@ -55,7 +55,7 @@ class NativeRenderer {
#if lime_console #if lime_console
useHardware = true; useHardware = true;
parent.context = CONSOLE (new ConsoleRenderContext ()); parent.context = CONSOLE (ConsoleRenderContext.singleton);
parent.type = CONSOLE; parent.type = CONSOLE;
#else #else

279
lime/graphics/ConsoleRenderContext.hx
View File

@@ -21,16 +21,13 @@ import lime.math.Matrix4;
import lime.utils.Float32Array; import lime.utils.Float32Array;
// TODO(james4k): we'll use this extern class when they support default args.
// https://github.com/HaxeFoundation/haxe/issues/3955
#if 0
@:include("ConsoleRenderContext.h") @:include("ConsoleRenderContext.h")
@:native("cpp::Struct<lime::ConsoleRenderContext>") @:native("cpp::Struct<lime::ConsoleRenderContext>")
extern class ConsoleRenderContext { extern class ConsoleRenderContext {
@:native("ConsoleRenderContext()")
public static var singleton:ConsoleRenderContext;
public var width (get, never):Int; public var width (get, never):Int;
public var height (get, never):Int; public var height (get, never):Int;
@@ -44,11 +41,27 @@ extern class ConsoleRenderContext {
public function lookupShader (name:String):Shader; public function lookupShader (name:String):Shader;
public function clear (r:UInt8, g:UInt8, b:UInt8, a:UInt8, depth:Float32 = 1.0, stencil:UInt8 = 0):Void; @:overload(function(r:UInt8, g:UInt8, b:UInt8, a:UInt8):Void{})
@:overload(function(r:UInt8, g:UInt8, b:UInt8, a:UInt8, depth:Float32):Void{})
public function clear (
r:UInt8, g:UInt8, b:UInt8, a:UInt8,
depth:Float32 /* = 1.0 */,
stencil:UInt8 /* = 0 */
):Void;
public function bindShader (shader:Shader):Void; public function bindShader (shader:Shader):Void;
public function setViewport (x:UInt16, y:UInt16, width:UInt16, height:UInt16, nearPlane:Float32 = 0.0, farPlane:Float32 = 1.0):Void; @:overload(function(x:UInt16, y:UInt16, width:UInt16, height:UInt16):Void{})
@:overload(function(x:UInt16, y:UInt16, width:UInt16, height:UInt16, nearPlane:Float32):Void{})
public function setViewport (
x:UInt16, y:UInt16, width:UInt16, height:UInt16,
nearPlane:Float32 /* = 0.0 */,
farPlane:Float32 /* = 1.0 */
):Void;
public function setRasterizerState (state:RasterizerState):Void;
public function setDepthStencilState (state:DepthStencilState):Void;
public function setBlendState (state:BlendState):Void;
public function setVertexShaderConstantF (startRegister:Int, vec4:Pointer<Float32>, vec4count:Int):Void; public function setVertexShaderConstantF (startRegister:Int, vec4:Pointer<Float32>, vec4count:Int):Void;
@@ -71,256 +84,6 @@ extern class ConsoleRenderContext {
#else #else
@:headerCode("#include <ConsoleRenderContext.h>")
class ConsoleRenderContext {
public function new() {
}
public var width (get, never):Int;
public var height (get, never):Int;
public function createIndexBuffer (indices:Pointer<UInt16>, count:Int):IndexBuffer {
return untyped __cpp__ (
"lime::ConsoleRenderContext().createIndexBuffer ({0}, {1})",
indices, count
);
}
public function createVertexBuffer (decl:VertexDecl, count:Int):VertexBuffer {
return untyped __cpp__ (
"lime::ConsoleRenderContext().createVertexBuffer ({0}, {1})",
decl, count
);
}
public function createTexture (format:TextureFormat, width:Int, height:Int, data:Pointer<UInt8>):Texture {
return untyped __cpp__ (
"lime::ConsoleRenderContext().createTexture ({0}, {1}, {2}, {3})",
format, width, height, data
);
}
public function destroyIndexBuffer (ib:IndexBuffer):Void {
untyped __cpp__ (
"lime::ConsoleRenderContext().destroyIndexBuffer ({0})",
ib
);
}
public function destroyVertexBuffer (vb:VertexBuffer):Void {
untyped __cpp__ (
"lime::ConsoleRenderContext().destroyVertexBuffer ({0})",
vb
);
}
public function destroyTexture (tex:Texture):Void {
untyped __cpp__ (
"lime::ConsoleRenderContext().destroyTexture ({0})",
tex
);
}
public function lookupShader (name:String):Shader {
return untyped __cpp__ (
"lime::ConsoleRenderContext().lookupShader ({0})",
name
);
}
public inline function clear (r:UInt8, g:UInt8, b:UInt8, a:UInt8, depth:Float32 = 1.0, stencil:UInt8 = 0):Void {
untyped __cpp__ (
"lime::ConsoleRenderContext().clear ({0}, {1}, {2}, {3}, {4}, {5})",
r, g, b, a, depth, stencil
);
}
public inline function bindShader (shader:Shader):Void {
untyped __cpp__ (
"lime::ConsoleRenderContext().bindShader ({0})",
shader
);
}
public function setViewport (x:UInt16, y:UInt16, width:UInt16, height:UInt16, nearPlane:Float32 = 0.0, farPlane:Float32 = 1.0):Void {
untyped __cpp__ (
"lime::ConsoleRenderContext().setViewport ({0}, {1}, {2}, {3}, {4}, {5})",
x, y, width, height, nearPlane, farPlane
);
}
public function setRasterizerState (state:RasterizerState):Void {
untyped __cpp__ (
"lime::ConsoleRenderContext().setRasterizerState ({0})",
state
);
}
public function setDepthStencilState (state:DepthStencilState):Void {
untyped __cpp__ (
"lime::ConsoleRenderContext().setDepthStencilState ({0})",
state
);
}
public function setBlendState (state:BlendState):Void {
untyped __cpp__ (
"lime::ConsoleRenderContext().setBlendState ({0})",
state
);
}
public inline function setVertexShaderConstantF (startRegister:Int, vec4:cpp.Pointer<Float32>, vec4count:Int):Void {
untyped __cpp__ (
"lime::ConsoleRenderContext().setVertexShaderConstantF ({0}, (float *){1}, {2})",
startRegister,
vec4,
vec4count
);
}
public inline function setVertexSource (vb:VertexBuffer):Void {
untyped __cpp__ (
"lime::ConsoleRenderContext().setVertexSource ({0})",
vb
);
}
public inline function setIndexSource (ib:IndexBuffer):Void {
untyped __cpp__ (
"lime::ConsoleRenderContext().setIndexSource ({0})",
ib
);
}
public inline function setTexture (sampler:Int, texture:Texture):Void {
untyped __cpp__ (
"lime::ConsoleRenderContext().setTexture ({0}, {1})",
sampler, texture
);
}
public inline function setTextureFilter (sampler:Int, min:TextureFilter, mag:TextureFilter):Void {
untyped __cpp__ (
"lime::ConsoleRenderContext().setTextureFilter ({0}, {1}, {2})",
sampler, min, mag
);
}
public inline function setTextureAddressMode (sampler:Int, u:TextureAddressMode, v:TextureAddressMode):Void {
untyped __cpp__ (
"lime::ConsoleRenderContext().setTextureAddressMode ({0}, {1}, {2})",
sampler, u, v
);
}
public inline function draw (primitive:Primitive, startVertex:UInt32, primitiveCount:UInt32):Void {
untyped __cpp__ (
"lime::ConsoleRenderContext().draw ({0}, {1}, {2})",
primitive, startVertex, primitiveCount
);
}
public inline function drawIndexed (primitive:Primitive, vertexCount:UInt32, startIndex:UInt32, primitiveCount:UInt32):Void {
untyped __cpp__ (
"lime::ConsoleRenderContext().drawIndexed ({0}, {1}, {2}, {3})",
primitive, vertexCount, startIndex, primitiveCount
);
}
private inline function get_width ():Int {
return untyped __cpp__ ("lime::ConsoleRenderContext().get_width ()");
}
private inline function get_height ():Int {
return untyped __cpp__ ("lime::ConsoleRenderContext().get_height ()");
}
}
#end
#else
import lime.graphics.console.Shader; import lime.graphics.console.Shader;
import lime.graphics.console.Primitive; import lime.graphics.console.Primitive;
import lime.graphics.console.IndexBuffer; import lime.graphics.console.IndexBuffer;