Compare commits

...

4 Commits

Author SHA1 Message Date
teverse 83ce0d18ef Bad FXAA shader 2020-06-19 17:45:10 +01:00
teverse 4e9bfdb964 Shader fix 2020-06-19 14:12:04 +01:00
Jay e8f01cc121 0.23.1 2020-06-19 13:10:37 +01:00
Jay d58e532de6 0.23.1 api dump 2020-06-19 13:07:07 +01:00
5 changed files with 485 additions and 167 deletions

486
api.json
View File

@ -1,8 +1,8 @@
{ {
"os": "OSX", "os": "OSX",
"arch": "x64", "arch": "x64",
"version": "0.22.0", "version": "0.23.1",
"generatedAt": "05/06/2020 17:28:20", "generatedAt": "19/06/2020 13:05:51",
"sandbox": { "sandbox": {
"coroutine": { "coroutine": {
"status": "function", "status": "function",
@ -20,10 +20,10 @@
"xpcall": "function", "xpcall": "function",
"_DEVICE_PAD_BOTTOM": 0, "_DEVICE_PAD_BOTTOM": 0,
"ipairs": "function", "ipairs": "function",
"_TEV_BUILD": "0220", "_TEV_BUILD": "0231",
"colour": "cdata", "colour": "cdata",
"print": "function", "print": "function",
"_TEV_VERSION_MINOR": 22, "_TEV_VERSION_MINOR": 23,
"pcall": "function", "pcall": "function",
"gcinfo": "function", "gcinfo": "function",
"loadstring": "function", "loadstring": "function",
@ -45,13 +45,13 @@
"insert": "function" "insert": "function"
}, },
"error": "function", "error": "function",
"_TEV_VERSION": "0.22.0", "_TEV_VERSION": "0.23.1",
"quaternion": "cdata", "quaternion": "cdata",
"_DEVICE": "Mac", "_DEVICE": "Mac",
"require": "function", "require": "function",
"unpack": "function", "unpack": "function",
"_VERSION": "Lua 5.1", "_VERSION": "Lua 5.1",
"_TEV_VERSION_PATCH": 0, "_TEV_VERSION_PATCH": 1,
"next": "function", "next": "function",
"math": { "math": {
"ceil": "function", "ceil": "function",
@ -1250,6 +1250,66 @@
} }
} }
}, },
"tween": {
"methods": {
"begin": {
"parameters": [
{
"type": "variant",
"name": "object"
},
{
"type": "number",
"name": "duration"
},
{
"type": "table",
"name": "properties"
},
{
"type": "string",
"name": "easing"
},
{
"type": "function?",
"name": "tweenCallback"
}
],
"returns": [],
"description": "Creates and starts a tween"
},
"create": {
"parameters": [
{
"type": "variant",
"name": "object"
},
{
"type": "number",
"name": "duration"
},
{
"type": "table",
"name": "properties"
},
{
"type": "string",
"name": "easing"
},
{
"type": "function?",
"name": "tweenCallback"
}
],
"returns": [],
"description": "Creates a tween"
}
},
"className": "tween",
"events": [],
"constructable": false,
"properties": []
},
"guiLine": { "guiLine": {
"methods": [], "methods": [],
"className": "guiLine", "className": "guiLine",
@ -1295,13 +1355,58 @@
} }
} }
}, },
"directionalLight": { "camera": {
"methods": [], "methods": {
"className": "directionalLight", "screenToWorld": {
"parameters": [
{
"type": "vector2",
"name": "screenPos"
}
],
"returns": [
"vector3",
" number"
],
"description": "Returns a 3d vector"
},
"worldToScreen": {
"parameters": [
{
"type": "vector3",
"name": "wPos"
}
],
"returns": [
"vector2",
" number"
],
"description": "Returns a 2d screen space vector and a number representing depth"
}
},
"className": "camera",
"events": [], "events": [],
"constructable": true, "constructable": false,
"extends": "light", "properties": {
"properties": [] "fov": {
"hasGetter": true,
"type": "number",
"description": "",
"hasSetter": true
},
"position": {
"hasGetter": true,
"type": "vector3",
"description": "",
"hasSetter": true
},
"rotation": {
"hasGetter": true,
"type": "quaternion",
"description": "",
"hasSetter": true
}
}
}, },
"guiFrame": { "guiFrame": {
"methods": [], "methods": [],
@ -1429,6 +1534,136 @@
} }
} }
}, },
"block": {
"methods": {
"applyImpulse": {
"parameters": [
{
"type": "vector3",
"name": "force"
}
],
"returns": [],
"description": ""
},
"applyTorque": {
"parameters": [
{
"type": "vector3",
"name": "force"
}
],
"returns": [],
"description": ""
},
"applyForce": {
"parameters": [
{
"type": "vector3",
"name": "force"
}
],
"returns": [],
"description": ""
},
"applyForceAtPosition": {
"parameters": [
{
"type": "vector3",
"name": "force,"
}
],
"returns": [],
"description": ""
},
"applyImpulseAtPosition": {
"parameters": [
{
"type": "vector3",
"name": "force,"
}
],
"returns": [],
"description": ""
},
"applyTorqueImpulse": {
"parameters": [
{
"type": "vector3",
"name": "force"
}
],
"returns": [],
"description": ""
}
},
"className": "block",
"events": [],
"constructable": true,
"extends": "sceneObject",
"properties": {
"velocity": {
"hasGetter": true,
"type": "vector3",
"description": "",
"hasSetter": true
},
"scale": {
"hasGetter": true,
"type": "vector3",
"description": "",
"hasSetter": true
},
"colour": {
"hasGetter": true,
"type": "colour",
"description": "",
"hasSetter": true
},
"angularFactor": {
"hasGetter": true,
"type": "vector3",
"description": "",
"hasSetter": true
},
"metalness": {
"hasGetter": true,
"type": "number",
"description": "",
"hasSetter": true
},
"static": {
"hasGetter": true,
"type": "boolean",
"description": "",
"hasSetter": true
},
"mesh": {
"hasGetter": true,
"type": "string",
"description": "",
"hasSetter": true
},
"linearFactor": {
"hasGetter": true,
"type": "vector3",
"description": "",
"hasSetter": true
},
"angularVelocity": {
"hasGetter": true,
"type": "vector3",
"description": "",
"hasSetter": true
},
"roughness": {
"hasGetter": true,
"type": "number",
"description": "",
"hasSetter": true
}
}
},
"apps": { "apps": {
"methods": { "methods": {
"reset": { "reset": {
@ -1563,50 +1798,6 @@
"constructable": false, "constructable": false,
"properties": [] "properties": []
}, },
"json": {
"methods": {
"decode": {
"parameters": [
{
"type": "string",
"name": "json"
}
],
"returns": [
"table"
],
"description": ""
},
"encodeWithTypes": {
"parameters": [
{
"type": "variant",
"name": "toEncode"
}
],
"returns": [
"string"
],
"description": ""
},
"encode": {
"parameters": [
{
"type": "variant",
"name": "toEncode"
}
],
"returns": [
"string"
],
"description": ""
}
},
"className": "json",
"events": [],
"constructable": false,
"properties": []
},
"guiTextBox": { "guiTextBox": {
"methods": [], "methods": [],
"className": "guiTextBox", "className": "guiTextBox",
@ -1853,42 +2044,49 @@
} }
} }
}, },
"scene": { "json": {
"methods": { "methods": {
"child": { "decode": {
"parameters": [ "parameters": [
{ {
"type": "string", "type": "string",
"name": "name" "name": "json"
} }
], ],
"returns": [ "returns": [
"sceneObject" "table"
], ],
"description": "Returns nil if not found" "description": ""
}, },
"destroyChildren": { "encodeWithTypes": {
"parameters": [], "parameters": [
"returns": [], {
"description": "Destroys all children" "type": "variant",
"name": "toEncode"
}
],
"returns": [
"string"
],
"description": ""
},
"encode": {
"parameters": [
{
"type": "variant",
"name": "toEncode"
}
],
"returns": [
"string"
],
"description": ""
} }
}, },
"className": "scene", "className": "json",
"events": [], "events": [],
"constructable": false, "constructable": false,
"properties": { "properties": []
"camera": {
"hasGetter": true,
"type": "Undocumented",
"hasSetter": false
},
"children": {
"hasGetter": true,
"type": "table",
"description": "",
"hasSetter": false
}
}
}, },
"debug": { "debug": {
"methods": { "methods": {
@ -1944,42 +2142,52 @@
"constructable": false, "constructable": false,
"properties": [] "properties": []
}, },
"block": { "scene": {
"methods": [], "methods": {
"className": "block", "child": {
"parameters": [
{
"type": "string",
"name": "name"
}
],
"returns": [
"sceneObject"
],
"description": "Returns nil if not found"
},
"destroyChildren": {
"parameters": [],
"returns": [],
"description": "Destroys all children"
}
},
"className": "scene",
"events": [], "events": [],
"constructable": true, "constructable": false,
"extends": "sceneObject",
"properties": { "properties": {
"roughness": { "simulate": {
"hasGetter": true, "hasGetter": true,
"type": "number", "type": "bool",
"description": "", "description": "",
"hasSetter": true "hasSetter": true
}, },
"scale": { "camera": {
"hasGetter": true,
"type": "Undocumented",
"hasSetter": false
},
"children": {
"hasGetter": true,
"type": "table",
"description": "",
"hasSetter": false
},
"gravity": {
"hasGetter": true, "hasGetter": true,
"type": "vector3", "type": "vector3",
"description": "", "description": "",
"hasSetter": true "hasSetter": true
},
"colour": {
"hasGetter": true,
"type": "colour",
"description": "",
"hasSetter": true
},
"metalness": {
"hasGetter": true,
"type": "number",
"description": "",
"hasSetter": true
},
"mesh": {
"hasGetter": true,
"type": "string",
"description": "",
"hasSetter": true
} }
} }
}, },
@ -2014,72 +2222,20 @@
}, },
"localTevGit": { "localTevGit": {
"hasGetter": true, "hasGetter": true,
"type": "boolean", "type": "string",
"description": "True if a local tevgit repo is in use", "description": "Returns path to local tevgit",
"hasSetter": false "hasSetter": false
} }
} }
}, },
"tween": { "directionalLight": {
"methods": { "methods": [],
"begin": { "className": "directionalLight",
"parameters": [
{
"type": "variant",
"name": "object"
},
{
"type": "number",
"name": "duration"
},
{
"type": "table",
"name": "properties"
},
{
"type": "string",
"name": "easing"
},
{
"type": "function?",
"name": "tweenCallback"
}
],
"returns": [],
"description": "Creates and starts a tween"
},
"create": {
"parameters": [
{
"type": "variant",
"name": "object"
},
{
"type": "number",
"name": "duration"
},
{
"type": "table",
"name": "properties"
},
{
"type": "string",
"name": "easing"
},
{
"type": "function?",
"name": "tweenCallback"
}
],
"returns": [],
"description": "Creates a tween"
}
},
"className": "tween",
"events": [], "events": [],
"constructable": false, "constructable": true,
"extends": "light",
"properties": [] "properties": []
} }
}, },
"build": "0220" "build": "0231"
} }

102
shaders/fxaa/fragment.sc Normal file
View File

@ -0,0 +1,102 @@
/*
Portions of this file are subject to the following licenes
Copyright (c) 2011 by Armin Ronacher.
Some rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
* The names of the contributors may not be used to endorse or
promote products derived from this software without specific
prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
$input v_texcoord0, v_rgbNW, v_rgbNE, v_rgbSW, v_rgbSE, v_rgbM
#include <teverse.sh>
SAMPLER2D(sColour, 0);
#ifndef FXAA_REDUCE_MIN
#define FXAA_REDUCE_MIN (1.0/ 64.0)
#endif
#ifndef FXAA_REDUCE_MUL
#define FXAA_REDUCE_MUL (1.0 / 4.0)
#endif
#ifndef FXAA_SPAN_MAX
#define FXAA_SPAN_MAX 4.0
#endif
//optimized version for mobile, where dependent
//texture reads can be a bottleneck
vec4 fxaa(sampler2D tex, vec2 fragCoord, vec2 resolution,
vec2 v_rgbNW, vec2 v_rgbNE,
vec2 v_rgbSW, vec2 v_rgbSE,
vec2 v_rgbM) {
vec4 color;
mediump vec2 inverseVP = vec2(1.0 / resolution.x, 1.0 / resolution.y);
vec3 rgbNW = texture2D(tex, v_rgbNW).xyz;
vec3 rgbNE = texture2D(tex, v_rgbNE).xyz;
vec3 rgbSW = texture2D(tex, v_rgbSW).xyz;
vec3 rgbSE = texture2D(tex, v_rgbSE).xyz;
vec4 texColor = texture2D(tex, v_rgbM);
vec3 rgbM = texColor.xyz;
vec3 luma = vec3(0.299, 0.587, 0.114);
float lumaNW = dot(rgbNW, luma);
float lumaNE = dot(rgbNE, luma);
float lumaSW = dot(rgbSW, luma);
float lumaSE = dot(rgbSE, luma);
float lumaM = dot(rgbM, luma);
float lumaMin = min(lumaM, min(min(lumaNW, lumaNE), min(lumaSW, lumaSE)));
float lumaMax = max(lumaM, max(max(lumaNW, lumaNE), max(lumaSW, lumaSE)));
mediump vec2 dir;
dir.x = -((lumaNW + lumaNE) - (lumaSW + lumaSE));
dir.y = ((lumaNW + lumaSW) - (lumaNE + lumaSE));
float dirReduce = max((lumaNW + lumaNE + lumaSW + lumaSE) *
(0.25 * FXAA_REDUCE_MUL), FXAA_REDUCE_MIN);
float rcpDirMin = 1.0 / (min(abs(dir.x), abs(dir.y)) + dirReduce);
dir = min(vec2(FXAA_SPAN_MAX, FXAA_SPAN_MAX),
max(vec2(-FXAA_SPAN_MAX, -FXAA_SPAN_MAX),
dir * rcpDirMin)) * inverseVP;
vec3 rgbA = 0.5 * (
texture2D(tex, fragCoord * inverseVP + dir * (1.0 / 3.0 - 0.5)).xyz +
texture2D(tex, fragCoord * inverseVP + dir * (2.0 / 3.0 - 0.5)).xyz);
vec3 rgbB = rgbA * 0.5 + 0.25 * (
texture2D(tex, fragCoord * inverseVP + dir * -0.5).xyz +
texture2D(tex, fragCoord * inverseVP + dir * 0.5).xyz);
float lumaB = dot(rgbB, luma);
if ((lumaB < lumaMin) || (lumaB > lumaMax))
color = vec4(rgbA, texColor.a);
else
color = vec4(rgbB, texColor.a);
return color;
}
void main()
{
vec2 resolution = u_viewRect.zw;
vec2 fragCoord = v_texcoord0 * resolution;
gl_FragColor = fxaa(sColour, fragCoord, resolution, v_rgbNW, v_rgbNE, v_rgbSW, v_rgbSE, v_rgbM);
}

View File

@ -0,0 +1,9 @@
vec2 v_texcoord0 : TEXCOORD0 = vec2(0.0, 0.0);
vec2 v_rgbNW : TEXCOORD1 = vec2(0.0, 0.0);
vec2 v_rgbNE : TEXCOORD2 = vec2(0.0, 0.0);
vec2 v_rgbSW : TEXCOORD3 = vec2(0.0, 0.0);
vec2 v_rgbSE : TEXCOORD4 = vec2(0.0, 0.0);
vec2 v_rgbM : TEXCOORD5 = vec2(0.0, 0.0);
vec3 a_position : POSITION;
vec2 a_texcoord0 : TEXCOORD0;

51
shaders/fxaa/vertex.sc Normal file
View File

@ -0,0 +1,51 @@
/*
Portions of this file are subject to the following licenes
Copyright (c) 2011 by Armin Ronacher.
Some rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
* The names of the contributors may not be used to endorse or
promote products derived from this software without specific
prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
$input a_position, a_texcoord0
$output v_texcoord0, v_rgbNW, v_rgbNE, v_rgbSW, v_rgbSE, v_rgbM
#include <teverse.sh>
void main()
{
vec2 resolution = u_viewRect.zw;
gl_Position = mul(u_modelViewProj, vec4(a_position, 1.0) );
v_texcoord0 = a_texcoord0;
vec2 fragCoord = v_texcoord0 * resolution;
vec2 inverseVP = 1.0 / resolution.xy;
v_rgbNW = (fragCoord + vec2(-1.0, -1.0)) * inverseVP;
v_rgbNE = (fragCoord + vec2(1.0, -1.0)) * inverseVP;
v_rgbSW = (fragCoord + vec2(-1.0, 1.0)) * inverseVP;
v_rgbSE = (fragCoord + vec2(1.0, 1.0)) * inverseVP;
v_rgbM = vec2(fragCoord * inverseVP);
}

View File

@ -88,7 +88,7 @@ void main()
vec3 V = normalize(uniformCameraPosition.xyz - wpos); vec3 V = normalize(uniformCameraPosition.xyz - wpos);
vec3 F0 = vec3(0.04); vec3 F0 = vec3(0.04, 0.04, 0.04);
F0 = mix(F0, colour, metallic); F0 = mix(F0, colour, metallic);
vec3 L = lightDir; vec3 L = lightDir;
@ -100,7 +100,7 @@ void main()
vec3 F = fresnelSchlick(max(dot(H, V), 0.0), F0); vec3 F = fresnelSchlick(max(dot(H, V), 0.0), F0);
vec3 kS = F; vec3 kS = F;
vec3 kD = vec3(1.0) - kS; vec3 kD = vec3(1.0, 1.0, 1.0) - kS;
kD *= 1.0 - metallic; kD *= 1.0 - metallic;
vec3 numerator = NDF * G * F; vec3 numerator = NDF * G * F;