Skip to content

Commit 7f0e5b0

Browse files
committed
soon™
1 parent deb8d84 commit 7f0e5b0

3 files changed

Lines changed: 54 additions & 1 deletion

File tree

project.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@
138138
<haxelib name="hxvlc" if="VIDEO_CUTSCENES"/>
139139
<haxelib name="hxdiscord_rpc" if="DISCORD_RPC"/>
140140
<haxelib name="away3d" if="THREE_D_SUPPORT"/>
141+
<!--<haxelib name="foxlite" if="THREE_D_SUPPORT"/>-->
141142
<haxelib name="nape-haxe4" if="NAPE_ENABLED"/>
142143

143144
<haxelib name="hxcpp-debug-server" if="debug"/>

source/funkin/backend/scripting/Script.hx

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,46 @@ class Script extends FlxBasic implements IFlxDestroyable {
7474
"FlxAxes" => CoolUtil.getMacroAbstractClass("flixel.util.FlxAxes"),
7575
"FlxColor" => CoolUtil.getMacroAbstractClass("flixel.util.FlxColor"),
7676

77+
#if (THREE_D_SUPPORT && foxlite)
78+
// Foxlite stuff
79+
"FoxScene" => foxlite.FoxScene,
80+
"FoxCamera" => foxlite.FoxCamera,
81+
"FoxFPSCamera" => foxlite.extras.FoxFPSCamera,
82+
"FoxRenderer" => foxlite.renderer.FoxRenderer,
83+
"FoxLoaderUtil" => foxlite.loaders.FoxLoaderUtil,
84+
"FoxModel" => foxlite.FoxModel,
85+
"FoxQuadMesh" => foxlite.mesh.FoxQuadMesh,
86+
"FoxCubeMesh" => foxlite.mesh.FoxCubeMesh,
87+
"FoxMaterial" => foxlite.material.FoxMaterial,
88+
"FoxShader" => foxlite.FoxShader,
89+
"FoxTexture" => foxlite.texture.FoxTexture,
90+
"FoxCache" => foxlite.FoxCache,
91+
"FoxRenderMetrics" => foxlite.flixel.FoxRenderMetrics,
92+
"FoxFunkinSprite" => foxlite.funkin.FoxFunkinSprite,
93+
"FoxFlxSprite" => foxlite.flixel.FoxFlxSprite,
94+
"FoxPanoramaSky" => foxlite.sky.FoxPanoramaSky,
95+
"FoxStencilAction" => foxlite.stencil.FoxStencilAction,
96+
"FoxOBJLoader" => foxlite.loaders.FoxOBJLoader,
97+
"FoxMTLLoader" => foxlite.loaders.FoxMTLLoader,
98+
"FoxDirectionalLight" => foxlite.lights.FoxDirectionalLight,
99+
"FoxLayer" => CoolUtil.getMacroAbstractClass("foxlite.FoxLayer"),
100+
"FoxEaseType" => CoolUtil.getMacroAbstractClass("foxlite.animation.FoxEaseType"),
101+
"FoxInstanceUpdateMode" => CoolUtil.getMacroAbstractClass("foxlite.instancing.FoxInstanceUpdateMode"),
102+
"FoxAreaLightShape" => CoolUtil.getMacroAbstractClass("foxlite.lights.FoxAreaLightShape"),
103+
"FoxLightType" => CoolUtil.getMacroAbstractClass("foxlite.lights.FoxLightType"),
104+
"FoxBlendMode" => CoolUtil.getMacroAbstractClass("foxlite.material.FoxBlendMode"),
105+
"FoxDepthCompareMode" => CoolUtil.getMacroAbstractClass("foxlite.material.FoxDepthCompareMode"),
106+
"FoxStencilCompareMode" => CoolUtil.getMacroAbstractClass("foxlite.stencil.FoxStencilCompareMode"),
107+
"FoxTriangleFace" => CoolUtil.getMacroAbstractClass("foxlite.material.FoxTriangleFace"),
108+
"FoxMeshBufferType" => CoolUtil.getMacroAbstractClass("foxlite.mesh.FoxMeshBufferType"),
109+
"FoxQuadFace" => CoolUtil.getMacroAbstractClass("foxlite.mesh.FoxQuadFace"),
110+
"FoxStencilActionType" => CoolUtil.getMacroAbstractClass("foxlite.stencil.FoxStencilActionType"),
111+
"FoxCubemapSide" => CoolUtil.getMacroAbstractClass("foxlite.texture.FoxCubemapSide"),
112+
"FoxMipFilter" => CoolUtil.getMacroAbstractClass("foxlite.texture.FoxMipFilter"),
113+
"FoxTextureFilter" => CoolUtil.getMacroAbstractClass("foxlite.texture.FoxTextureFilter"),
114+
"FoxWrapMode" => CoolUtil.getMacroAbstractClass("foxlite.texture.FoxWrapMode"),
115+
#end
116+
77117
// Engine related stuff
78118
"engine" => {
79119
commit: Flags.COMMIT_NUMBER,

source/funkin/backend/system/macros/Macros.hx

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,19 @@ class Macros {
1919
"flixel.addons.plugin", "flixel.addons.text", "flixel.addons.tile", "flixel.addons.transition",
2020
"flixel.addons.util",
2121
// OTHER LIBRARIES & STUFF
22-
#if THREE_D_SUPPORT "away3d", "flx3d", #end
22+
#if THREE_D_SUPPORT
23+
"away3d", "flx3d", // deprecated
24+
#if foxlite
25+
"foxlite",
26+
"foxlite.animation", "foxlite.color", "foxlite.culling",
27+
"foxlite.extra", "foxlite.flixel", "foxlite.funkin",
28+
"foxlite.groups", "foxlite.instancing", "foxlite.lights",
29+
"foxlite.loaders", "foxlite.materials", "foxlite.math",
30+
"foxlite.mesh", "foxlite.polyfill", "foxlite.post",
31+
"foxlite.renderer", "foxlite.skin", "foxlite.sky",
32+
"foxlite.stencil", "foxlite.system", "foxlite.texture",
33+
#end
34+
#end
2335
#if VIDEO_CUTSCENES "hxvlc.flixel", "hxvlc.openfl", #end
2436
#if NAPE_ENABLED "nape", "flixel.addons.nape", #end
2537
// BASE HAXE

0 commit comments

Comments
 (0)