ps
/
Lumenarium
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

This commit is contained in:
Peter Slattery 2021-01-23 12:49:11 -08:00
parent 0916bef999 6d8d642dfb
commit c921e37df3
4 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/build_app_msvc_win32_debug.bat
View File

@ -2,6 +2,7 @@
SET MyPath=%~dp0 SET MyPath=%~dp0
SET MyPath=%MyPath:~0,-1% SET MyPath=%MyPath:~0,-1%
call %MyPath%\_prebuild_win32.bat app debug msvc call %MyPath%\_prebuild_win32.bat app debug msvc
call %MyPath%\setup_cl.bat call %MyPath%\setup_cl.bat

3
build/setup_cl.bat
View File

@ -1,5 +1,7 @@
@echo off @echo off
ECHO SETUP CL
SET "LIB=" SET "LIB="
SET VC_PATH=C:\Program Files (x86)\Microsoft Visual Studio 12.0 SET VC_PATH=C:\Program Files (x86)\Microsoft Visual Studio 12.0
@ -35,3 +37,4 @@ IF NOT DEFINED LIB (IF EXIST "%VC_PATH%" (call "%VC_PATH%\VC\Auxiliary\Build\vcv
SET VC_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional SET VC_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional
IF NOT DEFINED LIB (IF EXIST "%VC_PATH%" (call "%VC_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64)) IF NOT DEFINED LIB (IF EXIST "%VC_PATH%" (call "%VC_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64))
ECHO SETUP CL COMPLETE

18
src/app/engine/animation/foldhaus_animation.h
View File

@ -484,6 +484,24 @@ ClampFrameToRange(s32 Frame, frame_range Range)
// System // System
struct animation_system_desc
{
gs_memory_arena* Storage;
u32 AnimArrayCount;
r32 SecondsPerFrame;
};
internal animation_system
AnimationSystem_Init(animation_system_desc Desc)
{
animation_system Result = {};
Result.Storage = Desc.Storage;
Result.Animations = AnimationArray_Create(Result.Storage, Desc.AnimArrayCount);
Result.SecondsPerFrame = Desc.SecondsPerFrame;
return Result;
}
internal animation* internal animation*
AnimationSystem_GetActiveAnimation(animation_system* System) AnimationSystem_GetActiveAnimation(animation_system* System)
{ {

9
src/app/foldhaus_app.cpp
View File

@ -90,10 +90,11 @@ INITIALIZE_APPLICATION(InitializeApplication)
LoadAssembly(&State->Assemblies, &State->LedSystem, State->Transient, Context, SculpturePath, State->GlobalLog); LoadAssembly(&State->Assemblies, &State->LedSystem, State->Transient, Context, SculpturePath, State->GlobalLog);
#endif #endif
State->AnimationSystem = {}; animation_system_desc AnimSysDesc = {};
State->AnimationSystem.Storage = &State->Permanent; AnimSysDesc.Storage = &State->Permanent;
State->AnimationSystem.Animations = AnimationArray_Create(State->AnimationSystem.Storage, 32); AnimSysDesc.AnimArrayCount = 32;
State->AnimationSystem.SecondsPerFrame = 1.f / 24.f; AnimSysDesc.SecondsPerFrame = 1.0f / 24.0f;
State->AnimationSystem = AnimationSystem_Init(AnimSysDesc);
State->UserData = BlumenLumen_CustomInit(State, Context); State->UserData = BlumenLumen_CustomInit(State, Context);
} }