Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Lua_helper.add_callback(lua, -> funk.set( #15366

Open
wants to merge 5 commits into
base: experimental
Choose a base branch
from
+243 −246
Open

Lua_helper.add_callback(lua, -> funk.set( #15366

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1ddfc5f
`Lua_helper.add_callback(lua, ` -> `funk.set(`
mcagabe19 Aug 20, 2024
eac46fe
:whar:
mcagabe19 Aug 20, 2024
c9d13b2
thanks to leer
mcagabe19 Aug 21, 2024
cca6b34
Merge branch 'experimental' into patch-4
mcagabe19 Sep 16, 2024
1a91f0d
a
mcagabe19 Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'experimental' into patch-4
  • Loading branch information
@mcagabe19
mcagabe19 committed Sep 16, 2024
commit cca6b34f892d8727469686c34c5761ccae49ad4f
30 changes: 15 additions & 15 deletions source/psychlua/ShaderFunctions.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ class ShaderFunctions
public static function implement(funk:FunkinLua)
{
// shader shit
funk.addLocalCallback("initLuaShader", function(name:String, ?glslVersion:Int = 120) {
funk.addLocalCallback("initLuaShader", function(name:String) {
if(!ClientPrefs.data.shaders) return false;

#if (!flash && sys)
return funk.initLuaShader(name, glslVersion);
return funk.initLuaShader(name);
#else
FunkinLua.luaTrace("initLuaShader: Platform unsupported for Runtime Shaders!", false, false, FlxColor.RED);
#end
Expand Down Expand Up @@ -62,7 +62,7 @@ class ShaderFunctions


funk.set("getShaderBool", function(obj:String, prop:String) {
#if (!flash && MODS_ALLOWED && sys)
#if (!flash && sys)
var shader:FlxRuntimeShader = getShader(obj);
if (shader == null)
{
Expand All @@ -76,7 +76,7 @@ class ShaderFunctions
#end
});
funk.set("getShaderBoolArray", function(obj:String, prop:String) {
#if (!flash && MODS_ALLOWED && sys)
#if (!flash && sys)
var shader:FlxRuntimeShader = getShader(obj);
if (shader == null)
{
Expand All @@ -90,7 +90,7 @@ class ShaderFunctions
#end
});
funk.set("getShaderInt", function(obj:String, prop:String) {
#if (!flash && MODS_ALLOWED && sys)
#if (!flash && sys)
var shader:FlxRuntimeShader = getShader(obj);
if (shader == null)
{
Expand All @@ -104,7 +104,7 @@ class ShaderFunctions
#end
});
funk.set("getShaderIntArray", function(obj:String, prop:String) {
#if (!flash && MODS_ALLOWED && sys)
#if (!flash && sys)
var shader:FlxRuntimeShader = getShader(obj);
if (shader == null)
{
Expand All @@ -118,7 +118,7 @@ class ShaderFunctions
#end
});
funk.set("getShaderFloat", function(obj:String, prop:String) {
#if (!flash && MODS_ALLOWED && sys)
#if (!flash && sys)
var shader:FlxRuntimeShader = getShader(obj);
if (shader == null)
{
Expand All @@ -132,7 +132,7 @@ class ShaderFunctions
#end
});
funk.set("getShaderFloatArray", function(obj:String, prop:String) {
#if (!flash && MODS_ALLOWED && sys)
#if (!flash && sys)
var shader:FlxRuntimeShader = getShader(obj);
if (shader == null)
{
Expand All @@ -148,7 +148,7 @@ class ShaderFunctions


funk.set("setShaderBool", function(obj:String, prop:String, value:Bool) {
#if (!flash && MODS_ALLOWED && sys)
#if (!flash && sys)
var shader:FlxRuntimeShader = getShader(obj);
if(shader == null)
{
Expand All @@ -163,7 +163,7 @@ class ShaderFunctions
#end
});
funk.set("setShaderBoolArray", function(obj:String, prop:String, values:Dynamic) {
#if (!flash && MODS_ALLOWED && sys)
#if (!flash && sys)
var shader:FlxRuntimeShader = getShader(obj);
if(shader == null)
{
Expand All @@ -178,7 +178,7 @@ class ShaderFunctions
#end
});
funk.set("setShaderInt", function(obj:String, prop:String, value:Int) {
#if (!flash && MODS_ALLOWED && sys)
#if (!flash && sys)
var shader:FlxRuntimeShader = getShader(obj);
if(shader == null)
{
Expand All @@ -193,7 +193,7 @@ class ShaderFunctions
#end
});
funk.set("setShaderIntArray", function(obj:String, prop:String, values:Dynamic) {
#if (!flash && MODS_ALLOWED && sys)
#if (!flash && sys)
var shader:FlxRuntimeShader = getShader(obj);
if(shader == null)
{
Expand All @@ -208,7 +208,7 @@ class ShaderFunctions
#end
});
funk.set("setShaderFloat", function(obj:String, prop:String, value:Float) {
#if (!flash && MODS_ALLOWED && sys)
#if (!flash && sys)
var shader:FlxRuntimeShader = getShader(obj);
if(shader == null)
{
Expand All @@ -223,7 +223,7 @@ class ShaderFunctions
#end
});
funk.set("setShaderFloatArray", function(obj:String, prop:String, values:Dynamic) {
#if (!flash && MODS_ALLOWED && sys)
#if (!flash && sys)
var shader:FlxRuntimeShader = getShader(obj);
if(shader == null)
{
Expand All @@ -240,7 +240,7 @@ class ShaderFunctions
});

funk.set("setShaderSampler2D", function(obj:String, prop:String, bitmapdataPath:String) {
#if (!flash && MODS_ALLOWED && sys)
#if (!flash && sys)
var shader:FlxRuntimeShader = getShader(obj);
if(shader == null)
{
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.