diff --git a/.vscode/settings.json b/.vscode/settings.json index bd12a54..962e220 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,10 @@ { "dotnet.defaultSolution": "disable", - "C_Cpp.errorSquiggles": "disabled" + "C_Cpp.errorSquiggles": "disabled", + "files.associations": { + "*.rc": "c", + "*.tmsl": "hlsl", + "*.gspec": "go", + "fsm.h": "c" + } } \ No newline at end of file diff --git a/demos/art/models/alien/Alien.fbx@animlist.txt b/demos/art/models/alien/Alien.fbx@animlist.txt index 81d2a6e..ab8c99e 100644 --- a/demos/art/models/alien/Alien.fbx@animlist.txt +++ b/demos/art/models/alien/Alien.fbx@animlist.txt @@ -1,14 +1,14 @@ -frame: 0-50 AlienArmature|Alien_Clapping -frame: 51-106 AlienArmature|Alien_Death -frame: 107-207 AlienArmature|Alien_Idle -frame: 208-308 AlienArmature|Alien_IdleHold -frame: 309-334 AlienArmature|Alien_Jump -frame: 335-357 AlienArmature|Alien_Punch -frame: 358-379 AlienArmature|Alien_Run -frame: 380-401 AlienArmature|Alien_RunHold -frame: 402-432 AlienArmature|Alien_RunningJump -frame: 433-459 AlienArmature|Alien_Sitting -frame: 460-475 AlienArmature|Alien_Standing -frame: 476-508 AlienArmature|Alien_Swimming -frame: 509-534 AlienArmature|Alien_SwordSlash -frame: 535-560 AlienArmature|Alien_Walk +frame: 0-50 AlienArmature|Alien_Clapping +frame: 51-106 AlienArmature|Alien_Death +frame: 107-207 AlienArmature|Alien_Idle +frame: 208-308 AlienArmature|Alien_IdleHold +frame: 309-334 AlienArmature|Alien_Jump +frame: 335-357 AlienArmature|Alien_Punch +frame: 358-379 AlienArmature|Alien_Run +frame: 380-401 AlienArmature|Alien_RunHold +frame: 402-432 AlienArmature|Alien_RunningJump +frame: 433-459 AlienArmature|Alien_Sitting +frame: 460-475 AlienArmature|Alien_Standing +frame: 476-508 AlienArmature|Alien_Swimming +frame: 509-534 AlienArmature|Alien_SwordSlash +frame: 535-560 AlienArmature|Alien_Walk diff --git a/demos/art/models/alien/Alien_Helmet.fbx@animlist.txt b/demos/art/models/alien/Alien_Helmet.fbx@animlist.txt index 81d2a6e..ab8c99e 100644 --- a/demos/art/models/alien/Alien_Helmet.fbx@animlist.txt +++ b/demos/art/models/alien/Alien_Helmet.fbx@animlist.txt @@ -1,14 +1,14 @@ -frame: 0-50 AlienArmature|Alien_Clapping -frame: 51-106 AlienArmature|Alien_Death -frame: 107-207 AlienArmature|Alien_Idle -frame: 208-308 AlienArmature|Alien_IdleHold -frame: 309-334 AlienArmature|Alien_Jump -frame: 335-357 AlienArmature|Alien_Punch -frame: 358-379 AlienArmature|Alien_Run -frame: 380-401 AlienArmature|Alien_RunHold -frame: 402-432 AlienArmature|Alien_RunningJump -frame: 433-459 AlienArmature|Alien_Sitting -frame: 460-475 AlienArmature|Alien_Standing -frame: 476-508 AlienArmature|Alien_Swimming -frame: 509-534 AlienArmature|Alien_SwordSlash -frame: 535-560 AlienArmature|Alien_Walk +frame: 0-50 AlienArmature|Alien_Clapping +frame: 51-106 AlienArmature|Alien_Death +frame: 107-207 AlienArmature|Alien_Idle +frame: 208-308 AlienArmature|Alien_IdleHold +frame: 309-334 AlienArmature|Alien_Jump +frame: 335-357 AlienArmature|Alien_Punch +frame: 358-379 AlienArmature|Alien_Run +frame: 380-401 AlienArmature|Alien_RunHold +frame: 402-432 AlienArmature|Alien_RunningJump +frame: 433-459 AlienArmature|Alien_Sitting +frame: 460-475 AlienArmature|Alien_Standing +frame: 476-508 AlienArmature|Alien_Swimming +frame: 509-534 AlienArmature|Alien_SwordSlash +frame: 535-560 AlienArmature|Alien_Walk diff --git a/demos/art/models/kgirl/kgirls01.fbx@animlist.txt b/demos/art/models/kgirl/kgirls01.fbx@animlist.txt index aee1a8e..5ef639b 100644 --- a/demos/art/models/kgirl/kgirls01.fbx@animlist.txt +++ b/demos/art/models/kgirl/kgirls01.fbx@animlist.txt @@ -1 +1 @@ -frame: 0-506 Take 001 +frame: 0-506 Take 001 diff --git a/demos/art/models/robots/George.fbx@animlist.txt b/demos/art/models/robots/George.fbx@animlist.txt index ef58faf..a0bf87a 100644 --- a/demos/art/models/robots/George.fbx@animlist.txt +++ b/demos/art/models/robots/George.fbx@animlist.txt @@ -1,40 +1,40 @@ -frame: 0-100 Idle -frame: 101-125 Dance -frame: 126-169 Death -frame: 170-215 Hello -frame: 216-228 HitRecieve_1 -frame: 229-241 HitRecieve_2 -frame: 242-268 Jump -frame: 269-310 No -frame: 311-353 Pickup -frame: 354-371 Punch -frame: 372-397 Run -frame: 398-423 Run_Holding -frame: 424-449 Run_Tall -frame: 450-465 Shoot -frame: 466-484 SwordSlash -frame: 485-510 Walk -frame: 511-536 Walk_Holding -frame: 537-562 Walk_Tall -frame: 563-604 Yes -frame: 605-623 Kick -frame: 624-648 RobotArmature|Dance -frame: 649-692 RobotArmature|Death -frame: 693-738 RobotArmature|Hello -frame: 739-751 RobotArmature|HitRecieve_1 -frame: 752-764 RobotArmature|HitRecieve_2 -frame: 765-865 RobotArmature|Idle -frame: 866-892 RobotArmature|Jump -frame: 893-911 RobotArmature|Kick -frame: 912-953 RobotArmature|No -frame: 954-996 RobotArmature|Pickup -frame: 997-1014 RobotArmature|Punch -frame: 1015-1040 RobotArmature|Run -frame: 1041-1066 RobotArmature|Run_Holding -frame: 1067-1092 RobotArmature|Run_Tall -frame: 1093-1108 RobotArmature|Shoot -frame: 1109-1127 RobotArmature|SwordSlash -frame: 1128-1153 RobotArmature|Walk -frame: 1154-1179 RobotArmature|Walk_Holding -frame: 1180-1205 RobotArmature|Walk_Tall -frame: 1206-1247 RobotArmature|Yes +frame: 0-100 Idle +frame: 101-125 Dance +frame: 126-169 Death +frame: 170-215 Hello +frame: 216-228 HitRecieve_1 +frame: 229-241 HitRecieve_2 +frame: 242-268 Jump +frame: 269-310 No +frame: 311-353 Pickup +frame: 354-371 Punch +frame: 372-397 Run +frame: 398-423 Run_Holding +frame: 424-449 Run_Tall +frame: 450-465 Shoot +frame: 466-484 SwordSlash +frame: 485-510 Walk +frame: 511-536 Walk_Holding +frame: 537-562 Walk_Tall +frame: 563-604 Yes +frame: 605-623 Kick +frame: 624-648 RobotArmature|Dance +frame: 649-692 RobotArmature|Death +frame: 693-738 RobotArmature|Hello +frame: 739-751 RobotArmature|HitRecieve_1 +frame: 752-764 RobotArmature|HitRecieve_2 +frame: 765-865 RobotArmature|Idle +frame: 866-892 RobotArmature|Jump +frame: 893-911 RobotArmature|Kick +frame: 912-953 RobotArmature|No +frame: 954-996 RobotArmature|Pickup +frame: 997-1014 RobotArmature|Punch +frame: 1015-1040 RobotArmature|Run +frame: 1041-1066 RobotArmature|Run_Holding +frame: 1067-1092 RobotArmature|Run_Tall +frame: 1093-1108 RobotArmature|Shoot +frame: 1109-1127 RobotArmature|SwordSlash +frame: 1128-1153 RobotArmature|Walk +frame: 1154-1179 RobotArmature|Walk_Holding +frame: 1180-1205 RobotArmature|Walk_Tall +frame: 1206-1247 RobotArmature|Yes diff --git a/demos/art/models/robots/Leela.fbx@animlist.txt b/demos/art/models/robots/Leela.fbx@animlist.txt index d4c2522..eeedcd0 100644 --- a/demos/art/models/robots/Leela.fbx@animlist.txt +++ b/demos/art/models/robots/Leela.fbx@animlist.txt @@ -1,36 +1,36 @@ -frame: 0-24 Dance -frame: 25-68 Death -frame: 69-114 Hello -frame: 115-127 HitRecieve_1 -frame: 128-140 HitRecieve_2 -frame: 141-241 Idle -frame: 242-268 Jump -frame: 269-287 Kick -frame: 288-329 No -frame: 330-372 Pickup -frame: 373-390 Punch -frame: 391-416 Run -frame: 417-442 Run_Tall -frame: 443-458 Shoot -frame: 459-477 SwordSlash -frame: 478-503 Walk -frame: 504-529 Walk_Tall -frame: 530-572 Yes -frame: 573-597 RobotArmature|Dance -frame: 598-641 RobotArmature|Death -frame: 642-687 RobotArmature|Hello -frame: 688-700 RobotArmature|HitRecieve_1 -frame: 701-713 RobotArmature|HitRecieve_2 -frame: 714-814 RobotArmature|Idle -frame: 815-841 RobotArmature|Jump -frame: 842-860 RobotArmature|Kick -frame: 861-902 RobotArmature|No -frame: 903-945 RobotArmature|Pickup -frame: 946-963 RobotArmature|Punch -frame: 964-989 RobotArmature|Run -frame: 990-1015 RobotArmature|Run_Tall -frame: 1016-1031 RobotArmature|Shoot -frame: 1032-1050 RobotArmature|SwordSlash -frame: 1051-1076 RobotArmature|Walk -frame: 1077-1102 RobotArmature|Walk_Tall -frame: 1103-1145 RobotArmature|Yes +frame: 0-24 Dance +frame: 25-68 Death +frame: 69-114 Hello +frame: 115-127 HitRecieve_1 +frame: 128-140 HitRecieve_2 +frame: 141-241 Idle +frame: 242-268 Jump +frame: 269-287 Kick +frame: 288-329 No +frame: 330-372 Pickup +frame: 373-390 Punch +frame: 391-416 Run +frame: 417-442 Run_Tall +frame: 443-458 Shoot +frame: 459-477 SwordSlash +frame: 478-503 Walk +frame: 504-529 Walk_Tall +frame: 530-572 Yes +frame: 573-597 RobotArmature|Dance +frame: 598-641 RobotArmature|Death +frame: 642-687 RobotArmature|Hello +frame: 688-700 RobotArmature|HitRecieve_1 +frame: 701-713 RobotArmature|HitRecieve_2 +frame: 714-814 RobotArmature|Idle +frame: 815-841 RobotArmature|Jump +frame: 842-860 RobotArmature|Kick +frame: 861-902 RobotArmature|No +frame: 903-945 RobotArmature|Pickup +frame: 946-963 RobotArmature|Punch +frame: 964-989 RobotArmature|Run +frame: 990-1015 RobotArmature|Run_Tall +frame: 1016-1031 RobotArmature|Shoot +frame: 1032-1050 RobotArmature|SwordSlash +frame: 1051-1076 RobotArmature|Walk +frame: 1077-1102 RobotArmature|Walk_Tall +frame: 1103-1145 RobotArmature|Yes diff --git a/demos/art/models/robots/Mike.fbx@animlist.txt b/demos/art/models/robots/Mike.fbx@animlist.txt index 02b0242..2afec46 100644 --- a/demos/art/models/robots/Mike.fbx@animlist.txt +++ b/demos/art/models/robots/Mike.fbx@animlist.txt @@ -1,36 +1,36 @@ -frame: 0-100 Idle -frame: 101-125 Dance -frame: 126-169 Death -frame: 170-215 Hello -frame: 216-228 HitRecieve_1 -frame: 229-241 HitRecieve_2 -frame: 242-268 Jump -frame: 269-311 No -frame: 312-354 Pickup -frame: 355-372 Punch -frame: 373-398 Run -frame: 399-424 Run_Holding -frame: 425-440 Shoot -frame: 441-459 SwordSlash -frame: 460-485 Walk -frame: 486-528 Yes -frame: 529-547 Kick -frame: 548-573 Walk_Holding -frame: 574-598 RobotArmature|Dance -frame: 599-642 RobotArmature|Death -frame: 643-688 RobotArmature|Hello -frame: 689-701 RobotArmature|HitRecieve_1 -frame: 702-714 RobotArmature|HitRecieve_2 -frame: 715-815 RobotArmature|Idle -frame: 816-842 RobotArmature|Jump -frame: 843-861 RobotArmature|Kick -frame: 862-904 RobotArmature|No -frame: 905-947 RobotArmature|Pickup -frame: 948-965 RobotArmature|Punch -frame: 966-991 RobotArmature|Run -frame: 992-1017 RobotArmature|Run_Holding -frame: 1018-1033 RobotArmature|Shoot -frame: 1034-1052 RobotArmature|SwordSlash -frame: 1053-1078 RobotArmature|Walk -frame: 1079-1104 RobotArmature|Walk_Holding -frame: 1105-1147 RobotArmature|Yes +frame: 0-100 Idle +frame: 101-125 Dance +frame: 126-169 Death +frame: 170-215 Hello +frame: 216-228 HitRecieve_1 +frame: 229-241 HitRecieve_2 +frame: 242-268 Jump +frame: 269-311 No +frame: 312-354 Pickup +frame: 355-372 Punch +frame: 373-398 Run +frame: 399-424 Run_Holding +frame: 425-440 Shoot +frame: 441-459 SwordSlash +frame: 460-485 Walk +frame: 486-528 Yes +frame: 529-547 Kick +frame: 548-573 Walk_Holding +frame: 574-598 RobotArmature|Dance +frame: 599-642 RobotArmature|Death +frame: 643-688 RobotArmature|Hello +frame: 689-701 RobotArmature|HitRecieve_1 +frame: 702-714 RobotArmature|HitRecieve_2 +frame: 715-815 RobotArmature|Idle +frame: 816-842 RobotArmature|Jump +frame: 843-861 RobotArmature|Kick +frame: 862-904 RobotArmature|No +frame: 905-947 RobotArmature|Pickup +frame: 948-965 RobotArmature|Punch +frame: 966-991 RobotArmature|Run +frame: 992-1017 RobotArmature|Run_Holding +frame: 1018-1033 RobotArmature|Shoot +frame: 1034-1052 RobotArmature|SwordSlash +frame: 1053-1078 RobotArmature|Walk +frame: 1079-1104 RobotArmature|Walk_Holding +frame: 1105-1147 RobotArmature|Yes diff --git a/demos/art/models/robots/Stan.fbx@animlist.txt b/demos/art/models/robots/Stan.fbx@animlist.txt index 02b0242..2afec46 100644 --- a/demos/art/models/robots/Stan.fbx@animlist.txt +++ b/demos/art/models/robots/Stan.fbx@animlist.txt @@ -1,36 +1,36 @@ -frame: 0-100 Idle -frame: 101-125 Dance -frame: 126-169 Death -frame: 170-215 Hello -frame: 216-228 HitRecieve_1 -frame: 229-241 HitRecieve_2 -frame: 242-268 Jump -frame: 269-311 No -frame: 312-354 Pickup -frame: 355-372 Punch -frame: 373-398 Run -frame: 399-424 Run_Holding -frame: 425-440 Shoot -frame: 441-459 SwordSlash -frame: 460-485 Walk -frame: 486-528 Yes -frame: 529-547 Kick -frame: 548-573 Walk_Holding -frame: 574-598 RobotArmature|Dance -frame: 599-642 RobotArmature|Death -frame: 643-688 RobotArmature|Hello -frame: 689-701 RobotArmature|HitRecieve_1 -frame: 702-714 RobotArmature|HitRecieve_2 -frame: 715-815 RobotArmature|Idle -frame: 816-842 RobotArmature|Jump -frame: 843-861 RobotArmature|Kick -frame: 862-904 RobotArmature|No -frame: 905-947 RobotArmature|Pickup -frame: 948-965 RobotArmature|Punch -frame: 966-991 RobotArmature|Run -frame: 992-1017 RobotArmature|Run_Holding -frame: 1018-1033 RobotArmature|Shoot -frame: 1034-1052 RobotArmature|SwordSlash -frame: 1053-1078 RobotArmature|Walk -frame: 1079-1104 RobotArmature|Walk_Holding -frame: 1105-1147 RobotArmature|Yes +frame: 0-100 Idle +frame: 101-125 Dance +frame: 126-169 Death +frame: 170-215 Hello +frame: 216-228 HitRecieve_1 +frame: 229-241 HitRecieve_2 +frame: 242-268 Jump +frame: 269-311 No +frame: 312-354 Pickup +frame: 355-372 Punch +frame: 373-398 Run +frame: 399-424 Run_Holding +frame: 425-440 Shoot +frame: 441-459 SwordSlash +frame: 460-485 Walk +frame: 486-528 Yes +frame: 529-547 Kick +frame: 548-573 Walk_Holding +frame: 574-598 RobotArmature|Dance +frame: 599-642 RobotArmature|Death +frame: 643-688 RobotArmature|Hello +frame: 689-701 RobotArmature|HitRecieve_1 +frame: 702-714 RobotArmature|HitRecieve_2 +frame: 715-815 RobotArmature|Idle +frame: 816-842 RobotArmature|Jump +frame: 843-861 RobotArmature|Kick +frame: 862-904 RobotArmature|No +frame: 905-947 RobotArmature|Pickup +frame: 948-965 RobotArmature|Punch +frame: 966-991 RobotArmature|Run +frame: 992-1017 RobotArmature|Run_Holding +frame: 1018-1033 RobotArmature|Shoot +frame: 1034-1052 RobotArmature|SwordSlash +frame: 1053-1078 RobotArmature|Walk +frame: 1079-1104 RobotArmature|Walk_Holding +frame: 1105-1147 RobotArmature|Yes diff --git a/demos/art/pbrs/scutum/Scutum_low.fbx@animlist.txt b/demos/art/pbrs/scutum/Scutum_low.fbx@animlist.txt index c187bfd..ba2b040 100644 --- a/demos/art/pbrs/scutum/Scutum_low.fbx@animlist.txt +++ b/demos/art/pbrs/scutum/Scutum_low.fbx@animlist.txt @@ -1 +1 @@ -frame: 0-0 Idle +frame: 0-0 Idle diff --git a/engine/art/skyboxes/skysphere.fbx@animlist.txt b/engine/art/skyboxes/skysphere.fbx@animlist.txt index c187bfd..ba2b040 100644 --- a/engine/art/skyboxes/skysphere.fbx@animlist.txt +++ b/engine/art/skyboxes/skysphere.fbx@animlist.txt @@ -1 +1 @@ -frame: 0-0 Idle +frame: 0-0 Idle diff --git a/engine/v4k.c b/engine/v4k.c index 271f575..cb12374 100644 --- a/engine/v4k.c +++ b/engine/v4k.c @@ -27200,9 +27200,11 @@ bool window_create_from_handle(void *handle, float scale, unsigned flags) { if( flag("--fullscreen") ) scale = 100; scale = (scale < 1 ? scale * 100 : scale); - bool FLAGS_FULLSCREEN = scale > 100; + bool FLAGS_FULLSCREEN = scale > 101; + bool FLAGS_FULLSCREEN_BORDERLESS = scale == 101; bool FLAGS_FULLSCREEN_DESKTOP = scale == 100; - bool FLAGS_WINDOWED = scale < 100; + bool FLAGS_WINDOWED = scale < 100 || FLAGS_FULLSCREEN_BORDERLESS; + flags |= FLAGS_FULLSCREEN_BORDERLESS == 1 ? WINDOW_BORDERLESS : 0; bool FLAGS_TRANSPARENT = flag("--transparent") || (flags & WINDOW_TRANSPARENT); if( FLAGS_TRANSPARENT ) FLAGS_FULLSCREEN = 0, FLAGS_FULLSCREEN_DESKTOP = 0, FLAGS_WINDOWED = 1; scale = (scale > 100 ? 100 : scale) / 100.f;