diff --git a/.gitmodules b/.gitmodules index 24bf995..af97222 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "depot"] path = depot url = git@dev.v4.games:v4games/depot.git -[submodule "_mirror"] - path = _mirror - url = git@dev.v4.games:v4games/FWK-mirror.git diff --git a/MAKE.bat b/MAKE.bat index 0d0e167..6833f13 100644 --- a/MAKE.bat +++ b/MAKE.bat @@ -278,7 +278,7 @@ if "%1"=="vps" ( ) if "%1"=="fwk" ( - pushd _mirror + pushd ..\fwk-mirror call MAKE.bat sync popd call MAKE.bat fwk_prep diff --git a/_mirror b/_mirror deleted file mode 160000 index b7dc665..0000000 --- a/_mirror +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b7dc66559ecfae5c485f883470384eaf7e9fb55f diff --git a/demos/05-scene.c b/demos/05-scene.c index 9af4f2a..09c2990 100644 --- a/demos/05-scene.c +++ b/demos/05-scene.c @@ -81,7 +81,7 @@ int main() { // queue model scale bounces float t = fmod(window_time(), 0.3) / 0.3; - float s = 0.01f * ease_ping_pong(t, ease_in_cubic,ease_out_cubic); + float s = 1.0;//0.01f * ease_ping_pong(t, ease_in_cubic,ease_out_cubic); object_scale(obj1, vec3(0.20f - s,0.20f + s,0.20f - s)); object_scale(obj2, vec3(0.20f - s,0.20f + s,0.20f - s)); diff --git a/depot b/depot index b59f4d4..616f75f 160000 --- a/depot +++ b/depot @@ -1 +1 @@ -Subproject commit b59f4d47461d94c32013220f145729f6896d5e74 +Subproject commit 616f75f5bb015fefd6e3321621b0f178637535b5 diff --git a/fwk_diff.WinMerge b/fwk_diff.WinMerge index f4128e6..ff33daa 100644 --- a/fwk_diff.WinMerge +++ b/fwk_diff.WinMerge @@ -2,7 +2,7 @@ C:\Projects\v4k\_fwk\ - C:\Projects\v4k\_mirror\ + C:\Projects\fwk-mirror\ *.cpp,*.h,*.c 1 0