v4games
/
v4k-git-backup
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of dev.v4.games:v4games/v4k

main
Vladyslav Hrytsenko 2023-10-22 19:48:35 +03:00
parent 6be54e5b74 74abec6c0f
commit e8bfb4bfb5
6 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,6 +1,3 @@
[submodule "depot"] [submodule "depot"]
path = depot path = depot
url = git@dev.v4.games:v4games/depot.git url = git@dev.v4.games:v4games/depot.git
[submodule "_mirror"]
path = _mirror
url = git@dev.v4.games:v4games/FWK-mirror.git

2
MAKE.bat
View File

@ -278,7 +278,7 @@ if "%1"=="vps" (
) )
if "%1"=="fwk" ( if "%1"=="fwk" (
pushd _mirror pushd ..\fwk-mirror
call MAKE.bat sync call MAKE.bat sync
popd popd
call MAKE.bat fwk_prep call MAKE.bat fwk_prep

1
_mirror

@ -1 +0,0 @@
Subproject commit b7dc66559ecfae5c485f883470384eaf7e9fb55f

2
demos/05-scene.c
View File

@ -81,7 +81,7 @@ int main() {
// queue model scale bounces // queue model scale bounces
float t = fmod(window_time(), 0.3) / 0.3; 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(obj1, vec3(0.20f - s,0.20f + s,0.20f - s));
object_scale(obj2, vec3(0.20f - s,0.20f + s,0.20f - s)); object_scale(obj2, vec3(0.20f - s,0.20f + s,0.20f - s));

2
depot

@ -1 +1 @@
Subproject commit b59f4d47461d94c32013220f145729f6896d5e74 Subproject commit 616f75f5bb015fefd6e3321621b0f178637535b5

2
fwk_diff.WinMerge
View File

@ -2,7 +2,7 @@
<project> <project>
<paths> <paths>
<left>C:\Projects\v4k\_fwk\</left> <left>C:\Projects\v4k\_fwk\</left>
<right>C:\Projects\v4k\_mirror\</right> <right>C:\Projects\fwk-mirror\</right>
<filter>*.cpp,*.h,*.c</filter> <filter>*.cpp,*.h,*.c</filter>
<subfolders>1</subfolders> <subfolders>1</subfolders>
<left-readonly>0</left-readonly> <left-readonly>0</left-readonly>