diff --git a/.gitignore b/.gitignore index e0b37ef..68f492d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ x86 gameenv/imgui.ini docs/game/build docs/internal/client -gameenv/data/cache \ No newline at end of file +gameenv/data/cache +techdemo/data/textures \ No newline at end of file diff --git a/mpfw/main.cpp b/mpfw/main.cpp index 2013fe5..be39d49 100644 --- a/mpfw/main.cpp +++ b/mpfw/main.cpp @@ -262,36 +262,36 @@ int main() { ClearBackground(BLACK); if(IsCursorHidden() && !consoleOn){ - - if (chr.cvars["math_3d_floor_collision_work"] == "true") { - float potentialNewFloor = -FLT_MAX; - for (int b = 0; b < collisionMap.collisionSets.size(); b++) { - BoundingBox bb; - bb.min = collisionMap.collisionSets[b].size.min; - bb.max = collisionMap.collisionSets[b].size.max; - if (CheckCollisionBoxSphere(bb, camera.position, 10)) { - MPFW::Physics::CollisionSet cs = collisionMap.collisionSets[b]; - for (int i = 0; i < cs.collisionFaces.size(); i++) { - for (int t = 2; t < cs.collisionFaces[i].polygon.size(); t++) { - Vector3 a = cs.collisionFaces[i].polygon[0]; - Vector3 b = cs.collisionFaces[i].polygon[t]; - Vector3 c = cs.collisionFaces[i].polygon[t - 1]; - Ray r; - r.position = camera.position; - r.direction = { 0,-1,0 }; - RayCollision coll = GetRayCollisionTriangle(r, a, b, c); - if (coll.hit) { - if (coll.point.y > potentialNewFloor) potentialNewFloor = coll.point.y; + if(framebuffer > 5){ + if (chr.cvars["math_3d_floor_collision_work"] == "true") { + float potentialNewFloor = -FLT_MAX; + for (int b = 0; b < collisionMap.collisionSets.size(); b++) { + BoundingBox bb; + bb.min = collisionMap.collisionSets[b].size.min; + bb.max = collisionMap.collisionSets[b].size.max; + if (CheckCollisionBoxSphere(bb, camera.position, 10)) { + MPFW::Physics::CollisionSet cs = collisionMap.collisionSets[b]; + for (int i = 0; i < cs.collisionFaces.size(); i++) { + for (int t = 2; t < cs.collisionFaces[i].polygon.size(); t++) { + Vector3 a = cs.collisionFaces[i].polygon[0]; + Vector3 b = cs.collisionFaces[i].polygon[t]; + Vector3 c = cs.collisionFaces[i].polygon[t - 1]; + Ray r; + r.position = camera.position; + r.direction = { 0,-1,0 }; + RayCollision coll = GetRayCollisionTriangle(r, a, b, c); + if (coll.hit) { + if (coll.point.y > potentialNewFloor) potentialNewFloor = coll.point.y; + } } } } - } + } + if (potentialNewFloor != -FLT_MAX) collisionFloor = potentialNewFloor + DISTANCE_FROM_FLOOR; + else collisionFloor = camera.position.y - DISTANCE_FROM_FLOOR; } - if (potentialNewFloor != -FLT_MAX) collisionFloor = potentialNewFloor + DISTANCE_FROM_FLOOR; - else collisionFloor = camera.position.y - DISTANCE_FROM_FLOOR; } - Look(); Vector3 wishVel = { 0,0,0 }; wishSpeed = 320; @@ -329,7 +329,7 @@ int main() { } velocity *= {GetFrameTime(), 1, GetFrameTime()}; - + if (chr.cvars["math_3d_collision_work"] == "true") { for (int b = 0; b < collisionMap.collisionSets.size(); b++) { BoundingBox bb; @@ -488,12 +488,12 @@ int main() { } - for (int i = 0; i < collisionMap.collisionSets.size(); i++) { + /*for (int i = 0; i < collisionMap.collisionSets.size(); i++) { BoundingBox b; b.min = collisionMap.collisionSets[i].size.min; b.max = collisionMap.collisionSets[i].size.max; DrawBoundingBox(b, RED); - } + }*/ EndMode3D(); } diff --git a/mpfw/mpfw.vcxproj b/mpfw/mpfw.vcxproj index 648a78c..d151f08 100644 --- a/mpfw/mpfw.vcxproj +++ b/mpfw/mpfw.vcxproj @@ -112,7 +112,8 @@ true $(SOLUTIONDIR)deps/lib raylib.lib;winmm.lib;gdi32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - MSVCRT + + @@ -133,7 +134,8 @@ true $(SOLUTIONDIR)deps/lib raylib.lib;winmm.lib;gdi32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - MSVCRT + + diff --git a/mpfw/mpfw.vcxproj.user b/mpfw/mpfw.vcxproj.user index d011c1f..b5b7d95 100644 --- a/mpfw/mpfw.vcxproj.user +++ b/mpfw/mpfw.vcxproj.user @@ -1,11 +1,11 @@  - $(SolutionDir)/gameenv + $(SolutionDir)/techdemo WindowsLocalDebugger - $(SolutionDir)/gameenv + $(SolutionDir)/techdemo WindowsLocalDebugger \ No newline at end of file diff --git a/techdemo/data/cfg/startup.cfg b/techdemo/data/cfg/startup.cfg new file mode 100644 index 0000000..769f65a --- /dev/null +++ b/techdemo/data/cfg/startup.cfg @@ -0,0 +1,5 @@ +echo "MPFW Quake Tech Demo" +echo "Test Startup Script" + +mode 1 +map "data/maps/mpfwstart.bsp" diff --git a/techdemo/data/fonts/RobotoMono/LICENSE.txt b/techdemo/data/fonts/RobotoMono/LICENSE.txt new file mode 100644 index 0000000..38d9750 --- /dev/null +++ b/techdemo/data/fonts/RobotoMono/LICENSE.txt @@ -0,0 +1,91 @@ +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/techdemo/data/fonts/RobotoMono/RobotoMono-Bold.ttf b/techdemo/data/fonts/RobotoMono/RobotoMono-Bold.ttf new file mode 100644 index 0000000..bef439f Binary files /dev/null and b/techdemo/data/fonts/RobotoMono/RobotoMono-Bold.ttf differ diff --git a/techdemo/data/fonts/RobotoMono/RobotoMono-BoldItalic.ttf b/techdemo/data/fonts/RobotoMono/RobotoMono-BoldItalic.ttf new file mode 100644 index 0000000..642dd05 Binary files /dev/null and b/techdemo/data/fonts/RobotoMono/RobotoMono-BoldItalic.ttf differ diff --git a/techdemo/data/fonts/RobotoMono/RobotoMono-ExtraLight.ttf b/techdemo/data/fonts/RobotoMono/RobotoMono-ExtraLight.ttf new file mode 100644 index 0000000..8cc41ca Binary files /dev/null and b/techdemo/data/fonts/RobotoMono/RobotoMono-ExtraLight.ttf differ diff --git a/techdemo/data/fonts/RobotoMono/RobotoMono-ExtraLightItalic.ttf b/techdemo/data/fonts/RobotoMono/RobotoMono-ExtraLightItalic.ttf new file mode 100644 index 0000000..47e4a4f Binary files /dev/null and b/techdemo/data/fonts/RobotoMono/RobotoMono-ExtraLightItalic.ttf differ diff --git a/techdemo/data/fonts/RobotoMono/RobotoMono-Italic.ttf b/techdemo/data/fonts/RobotoMono/RobotoMono-Italic.ttf new file mode 100644 index 0000000..781eff8 Binary files /dev/null and b/techdemo/data/fonts/RobotoMono/RobotoMono-Italic.ttf differ diff --git a/techdemo/data/fonts/RobotoMono/RobotoMono-Light.ttf b/techdemo/data/fonts/RobotoMono/RobotoMono-Light.ttf new file mode 100644 index 0000000..b6fb475 Binary files /dev/null and b/techdemo/data/fonts/RobotoMono/RobotoMono-Light.ttf differ diff --git a/techdemo/data/fonts/RobotoMono/RobotoMono-LightItalic.ttf b/techdemo/data/fonts/RobotoMono/RobotoMono-LightItalic.ttf new file mode 100644 index 0000000..48fec00 Binary files /dev/null and b/techdemo/data/fonts/RobotoMono/RobotoMono-LightItalic.ttf differ diff --git a/techdemo/data/fonts/RobotoMono/RobotoMono-Medium.ttf b/techdemo/data/fonts/RobotoMono/RobotoMono-Medium.ttf new file mode 100644 index 0000000..53fdd40 Binary files /dev/null and b/techdemo/data/fonts/RobotoMono/RobotoMono-Medium.ttf differ diff --git a/techdemo/data/fonts/RobotoMono/RobotoMono-MediumItalic.ttf b/techdemo/data/fonts/RobotoMono/RobotoMono-MediumItalic.ttf new file mode 100644 index 0000000..6916e76 Binary files /dev/null and b/techdemo/data/fonts/RobotoMono/RobotoMono-MediumItalic.ttf differ diff --git a/techdemo/data/fonts/RobotoMono/RobotoMono-Regular.ttf b/techdemo/data/fonts/RobotoMono/RobotoMono-Regular.ttf new file mode 100644 index 0000000..3806bfb Binary files /dev/null and b/techdemo/data/fonts/RobotoMono/RobotoMono-Regular.ttf differ diff --git a/techdemo/data/fonts/RobotoMono/RobotoMono-SemiBold.ttf b/techdemo/data/fonts/RobotoMono/RobotoMono-SemiBold.ttf new file mode 100644 index 0000000..b828c3a Binary files /dev/null and b/techdemo/data/fonts/RobotoMono/RobotoMono-SemiBold.ttf differ diff --git a/techdemo/data/fonts/RobotoMono/RobotoMono-SemiBoldItalic.ttf b/techdemo/data/fonts/RobotoMono/RobotoMono-SemiBoldItalic.ttf new file mode 100644 index 0000000..06032b5 Binary files /dev/null and b/techdemo/data/fonts/RobotoMono/RobotoMono-SemiBoldItalic.ttf differ diff --git a/techdemo/data/fonts/RobotoMono/RobotoMono-Thin.ttf b/techdemo/data/fonts/RobotoMono/RobotoMono-Thin.ttf new file mode 100644 index 0000000..71f1a46 Binary files /dev/null and b/techdemo/data/fonts/RobotoMono/RobotoMono-Thin.ttf differ diff --git a/techdemo/data/fonts/RobotoMono/RobotoMono-ThinItalic.ttf b/techdemo/data/fonts/RobotoMono/RobotoMono-ThinItalic.ttf new file mode 100644 index 0000000..a1b2e5a Binary files /dev/null and b/techdemo/data/fonts/RobotoMono/RobotoMono-ThinItalic.ttf differ diff --git a/techdemo/data/maps/mpfwstart.bsp b/techdemo/data/maps/mpfwstart.bsp new file mode 100644 index 0000000..b22c295 Binary files /dev/null and b/techdemo/data/maps/mpfwstart.bsp differ diff --git a/techdemo/data/maps/mpfwstart.jmf b/techdemo/data/maps/mpfwstart.jmf new file mode 100644 index 0000000..5418e91 Binary files /dev/null and b/techdemo/data/maps/mpfwstart.jmf differ diff --git a/techdemo/data/maps/mpfwstart.jmx b/techdemo/data/maps/mpfwstart.jmx new file mode 100644 index 0000000..5418e91 Binary files /dev/null and b/techdemo/data/maps/mpfwstart.jmx differ diff --git a/techdemo/data/maps/mpfwstart.map b/techdemo/data/maps/mpfwstart.map new file mode 100644 index 0000000..06340b8 --- /dev/null +++ b/techdemo/data/maps/mpfwstart.map @@ -0,0 +1,58 @@ +{ +"classname" "worldspawn" +"mapversion" "220" +"wad" "c:/program files (x86)/steam/steamapps/common/Quake/Id1/quake.wad;E:/mpfw/gameenv/data/textures/TexturesForAuthoring.wad;E:/mpfw/techdemo/data/textures/1ktextures.wad" +"_generator" "J.A.C.K. 1.1.3773 Freeware (vpQuake)" +{ +( 256 -256 160 ) ( 256 -256 0 ) ( 256 256 160 ) BRICKS101 [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( 288 256 160 ) ( 288 256 0 ) ( 288 -256 160 ) BRICKS101 [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( 256 256 160 ) ( 256 256 0 ) ( 288 256 160 ) BRICKS101 [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( 288 -256 160 ) ( 288 -256 0 ) ( 256 -256 160 ) BRICKS101 [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( 256 256 0 ) ( 256 -256 0 ) ( 288 256 0 ) BRICKS101 [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 0.062 0.062 +( 288 -256 160 ) ( 256 -256 160 ) ( 288 256 160 ) BRICKS101 [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 0.062 0.062 +} +{ +( -288 -256 160 ) ( -288 -256 0 ) ( -288 256 160 ) C1A0_WX [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( -256 256 160 ) ( -256 256 0 ) ( -256 -256 160 ) BRICKS101 [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( -288 256 160 ) ( -288 256 0 ) ( -256 256 160 ) C1A0_WX [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( -256 -256 160 ) ( -256 -256 0 ) ( -288 -256 160 ) C1A0_WX [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( -288 256 0 ) ( -288 -256 0 ) ( -256 256 0 ) C1A0_WX [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( -256 -256 160 ) ( -288 -256 160 ) ( -256 256 160 ) C1A0_WX [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +} +{ +( -256 256 160 ) ( -256 256 0 ) ( -256 288 160 ) C1A0_WX [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( 256 288 160 ) ( 256 288 0 ) ( 256 256 160 ) C1A0_WX [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( -256 288 160 ) ( -256 288 0 ) ( 256 288 160 ) C1A0_WX [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( 256 256 160 ) ( 256 256 0 ) ( -256 256 160 ) BRICKS101 [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( -256 288 0 ) ( -256 256 0 ) ( 256 288 0 ) C1A0_WX [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( 256 256 160 ) ( -256 256 160 ) ( 256 288 160 ) C1A0_WX [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +} +{ +( 256 -256 160 ) ( 256 -256 0 ) ( 256 -288 160 ) BRICKS101 [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( -256 -288 160 ) ( -256 -288 0 ) ( -256 -256 160 ) BRICKS101 [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( 256 -288 160 ) ( 256 -288 0 ) ( -256 -288 160 ) BRICKS101 [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( -256 -256 160 ) ( -256 -256 0 ) ( 256 -256 160 ) BRICKS101 [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( 256 -288 160 ) ( -256 -288 160 ) ( 256 -256 160 ) BRICKS101 [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 0.062 0.062 +( -256 -256 0 ) ( -256 -288 0 ) ( 256 -256 0 ) BRICKS101 [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 0.062 0.062 +} +{ +( -256 -256 192 ) ( -256 -256 160 ) ( -256 256 192 ) WOOD006 [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( 256 256 192 ) ( 256 256 160 ) ( 256 -256 192 ) WOOD006 [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( -256 256 192 ) ( -256 256 160 ) ( 256 256 192 ) WOOD006 [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( 256 -256 192 ) ( 256 -256 160 ) ( -256 -256 192 ) WOOD006 [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( -256 256 160 ) ( -256 -256 160 ) ( 256 256 160 ) WOOD006 [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 0.062 0.062 +( 256 -256 192 ) ( -256 -256 192 ) ( 256 256 192 ) WOOD006 [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 0.062 0.062 +} +{ +( -256 -256 0 ) ( -256 -256 -32 ) ( -256 256 0 ) ASPHALT025C [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( 256 256 0 ) ( 256 256 -32 ) ( 256 -256 0 ) ASPHALT025C [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( -256 256 0 ) ( -256 256 -32 ) ( 256 256 0 ) ASPHALT025C [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( 256 -256 0 ) ( 256 -256 -32 ) ( -256 -256 0 ) ASPHALT025C [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( -256 256 -32 ) ( -256 -256 -32 ) ( 256 256 -32 ) ASPHALT025C [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( 256 -256 0 ) ( -256 -256 0 ) ( 256 256 0 ) TILES129B [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 0.062 0.062 +} +} +{ +"classname" "info_player_start" +"origin" "-192 0 0" +} diff --git a/techdemo/data/maps/mpfwstart.max b/techdemo/data/maps/mpfwstart.max new file mode 100644 index 0000000..06340b8 --- /dev/null +++ b/techdemo/data/maps/mpfwstart.max @@ -0,0 +1,58 @@ +{ +"classname" "worldspawn" +"mapversion" "220" +"wad" "c:/program files (x86)/steam/steamapps/common/Quake/Id1/quake.wad;E:/mpfw/gameenv/data/textures/TexturesForAuthoring.wad;E:/mpfw/techdemo/data/textures/1ktextures.wad" +"_generator" "J.A.C.K. 1.1.3773 Freeware (vpQuake)" +{ +( 256 -256 160 ) ( 256 -256 0 ) ( 256 256 160 ) BRICKS101 [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( 288 256 160 ) ( 288 256 0 ) ( 288 -256 160 ) BRICKS101 [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( 256 256 160 ) ( 256 256 0 ) ( 288 256 160 ) BRICKS101 [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( 288 -256 160 ) ( 288 -256 0 ) ( 256 -256 160 ) BRICKS101 [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( 256 256 0 ) ( 256 -256 0 ) ( 288 256 0 ) BRICKS101 [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 0.062 0.062 +( 288 -256 160 ) ( 256 -256 160 ) ( 288 256 160 ) BRICKS101 [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 0.062 0.062 +} +{ +( -288 -256 160 ) ( -288 -256 0 ) ( -288 256 160 ) C1A0_WX [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( -256 256 160 ) ( -256 256 0 ) ( -256 -256 160 ) BRICKS101 [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( -288 256 160 ) ( -288 256 0 ) ( -256 256 160 ) C1A0_WX [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( -256 -256 160 ) ( -256 -256 0 ) ( -288 -256 160 ) C1A0_WX [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( -288 256 0 ) ( -288 -256 0 ) ( -256 256 0 ) C1A0_WX [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( -256 -256 160 ) ( -288 -256 160 ) ( -256 256 160 ) C1A0_WX [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +} +{ +( -256 256 160 ) ( -256 256 0 ) ( -256 288 160 ) C1A0_WX [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( 256 288 160 ) ( 256 288 0 ) ( 256 256 160 ) C1A0_WX [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( -256 288 160 ) ( -256 288 0 ) ( 256 288 160 ) C1A0_WX [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( 256 256 160 ) ( 256 256 0 ) ( -256 256 160 ) BRICKS101 [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( -256 288 0 ) ( -256 256 0 ) ( 256 288 0 ) C1A0_WX [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( 256 256 160 ) ( -256 256 160 ) ( 256 288 160 ) C1A0_WX [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +} +{ +( 256 -256 160 ) ( 256 -256 0 ) ( 256 -288 160 ) BRICKS101 [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( -256 -288 160 ) ( -256 -288 0 ) ( -256 -256 160 ) BRICKS101 [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( 256 -288 160 ) ( 256 -288 0 ) ( -256 -288 160 ) BRICKS101 [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( -256 -256 160 ) ( -256 -256 0 ) ( 256 -256 160 ) BRICKS101 [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( 256 -288 160 ) ( -256 -288 160 ) ( 256 -256 160 ) BRICKS101 [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 0.062 0.062 +( -256 -256 0 ) ( -256 -288 0 ) ( 256 -256 0 ) BRICKS101 [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 0.062 0.062 +} +{ +( -256 -256 192 ) ( -256 -256 160 ) ( -256 256 192 ) WOOD006 [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( 256 256 192 ) ( 256 256 160 ) ( 256 -256 192 ) WOOD006 [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( -256 256 192 ) ( -256 256 160 ) ( 256 256 192 ) WOOD006 [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( 256 -256 192 ) ( 256 -256 160 ) ( -256 -256 192 ) WOOD006 [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 0.062 0.062 +( -256 256 160 ) ( -256 -256 160 ) ( 256 256 160 ) WOOD006 [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 0.062 0.062 +( 256 -256 192 ) ( -256 -256 192 ) ( 256 256 192 ) WOOD006 [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 0.062 0.062 +} +{ +( -256 -256 0 ) ( -256 -256 -32 ) ( -256 256 0 ) ASPHALT025C [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( 256 256 0 ) ( 256 256 -32 ) ( 256 -256 0 ) ASPHALT025C [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( -256 256 0 ) ( -256 256 -32 ) ( 256 256 0 ) ASPHALT025C [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( 256 -256 0 ) ( 256 -256 -32 ) ( -256 -256 0 ) ASPHALT025C [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1 +( -256 256 -32 ) ( -256 -256 -32 ) ( 256 256 -32 ) ASPHALT025C [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 +( 256 -256 0 ) ( -256 -256 0 ) ( 256 256 0 ) TILES129B [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 0.062 0.062 +} +} +{ +"classname" "info_player_start" +"origin" "-192 0 0" +} diff --git a/techdemo/data/maps/start.jmf b/techdemo/data/maps/start.jmf new file mode 100644 index 0000000..a86b2e8 Binary files /dev/null and b/techdemo/data/maps/start.jmf differ diff --git a/techdemo/data/maps/start.map b/techdemo/data/maps/start.map new file mode 100644 index 0000000..cf4c737 --- /dev/null +++ b/techdemo/data/maps/start.map @@ -0,0 +1,9 @@ +{ +"classname" "worldspawn" +"sounds" "1" +"worldtype" "0" +"origin" "0 0 0" +"mapversion" "220" +"wad" "c:/program files (x86)/steam/steamapps/common/Quake/Id1/quake.wad;E:/mpfw/gameenv/data/textures/TexturesForAuthoring.wad" +"_generator" "J.A.C.K. 1.1.3773 Freeware (vpQuake)" +} diff --git a/techdemo/data/menus/test.wnd b/techdemo/data/menus/test.wnd new file mode 100644 index 0000000..a8ce88a --- /dev/null +++ b/techdemo/data/menus/test.wnd @@ -0,0 +1,24 @@ + + + Test Window + + + File + + Load Test Map + map "data/maps/testmpfw.bsp" + + + Quit game + quit + + + + E1M1 + + Play + map "data/maps/fullquake/e1m1.bsp" + + + + \ No newline at end of file diff --git a/techdemo/data/menus/test2.wnd b/techdemo/data/menus/test2.wnd new file mode 100644 index 0000000..7802584 --- /dev/null +++ b/techdemo/data/menus/test2.wnd @@ -0,0 +1,24 @@ + + + Test Window 2 + + + File + + Load Test Map + map "data/maps/testmpfw.bsp" + + + Quit game + quit + + + + E1M2 + + Play + map "data/maps/fullquake/e1m2.bsp" + + + + \ No newline at end of file diff --git a/techdemo/data/palette.lmp b/techdemo/data/palette.lmp new file mode 100644 index 0000000..7eefda1 Binary files /dev/null and b/techdemo/data/palette.lmp differ diff --git a/techdemo/data/shaders/lightmap.glsl b/techdemo/data/shaders/lightmap.glsl new file mode 100644 index 0000000..e69de29 diff --git a/techdemo/data/sys/collisionparams.xml b/techdemo/data/sys/collisionparams.xml new file mode 100644 index 0000000..e1923d3 --- /dev/null +++ b/techdemo/data/sys/collisionparams.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/techdemo/data/sys/cvardefs.cvars b/techdemo/data/sys/cvardefs.cvars new file mode 100644 index 0000000..de95d32 --- /dev/null +++ b/techdemo/data/sys/cvardefs.cvars @@ -0,0 +1,8 @@ +math_3d_floor_collision_work true +math_3d_collision_work true +vid_2d_background false +vid_3d_renderer true +vid_3d_grid false +vid_3d_cull_sky false +vid_3d_cull_clips true +vid_3d_cull_triggers true