BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
147 Commits 116 Branches 0 Tags
7f8e78c8cdeedcfb794b75b4cba3b00f583941ea
Commit Graph

73 Commits

Author SHA1 Message Date
verysecrethero 7f8e78c8cd RayVsModel tests in progress 2015-12-14 17:04:35 +01:00
William Moberg 11e37ca898 Added functions to test ray vs triangle- and model-intersections. 2015-12-14 10:42:45 +01:00
William Moberg 55aad493ff Fixed warnings in OctTree. Cleaned unit tests. 2015-12-11 16:45:38 +01:00
William Moberg 81034420a9 Put back old version of OctTree for testing, made unit tests. 
Tests shows the old version checks for collisions etc. faster, new version adds objects into tree faster, and doesn't give duplicated results.
 2015-12-11 16:04:30 +01:00
William Moberg ce7b26ccac Merge branch 'master' into OctTree 
# Conflicts:
#	include/Game/Game.h
#	include/Game/HardcodedTestWorld.h
#	src/Game/Game.cpp
 2015-12-10 16:37:55 +01:00
William Moberg 0d8f7acb7e OctTree doesn't check the same object multiple times if it exists in multiple places in the tree. 2015-12-10 16:04:55 +01:00
sippeangelo 53ef749736 Fixed absoute positioning, I think... 2015-12-10 10:16:03 +01:00
William Moberg e580540143 Made some optimizations in OctTree and added a unit test for BoxesInSameRegion. 2015-12-09 17:16:11 +01:00
sippeangelo 90a79c702f Added crude absolute positioning when rendering 2015-12-09 15:26:49 +01:00
sippeangelo 58d827f7d0 Moved world definition to Schema/Entities/Test.xml and removed HardcodedTestWorld 2015-12-09 14:25:41 +01:00
sippeangelo 3085ccdfbf Added temporary Release function to resource manager to be able to reload a resource 2015-12-09 14:23:49 +01:00
William Moberg 14bcb7ea0d Added Update call in Game to test OctTree by using collision. 2015-12-09 13:52:17 +01:00
William Moberg bad42fae1c OctTree differentiates between static/dynamic objects now. Added a general BoxesInSameRegion method. 2015-12-09 13:27:00 +01:00
sippeangelo c9b140bd6b Semi-working entity loading from XML files! 2015-12-09 12:29:32 +01:00
Jace d597c7e60e Cleaned up custom type conversion code 2015-12-08 22:51:35 +01:00
Jace 0dbe0fe48e Component definitions and default values loading from schema 2015-12-08 21:38:52 +01:00
sippeangelo 1e1ce4e127 Added Model component to schema 2015-12-08 18:21:24 +01:00
sippeangelo f337305dee Merge remote-tracking branch 'origin/master' into ecs 2015-12-08 18:07:42 +01:00
sippeangelo d7de4fc694 Component definitions now loaded from schema. No default values yet. 2015-12-08 18:07:32 +01:00
William Moberg a7fb77d998 OctTree can check if a box collides with a box in the OctTree. 2015-12-08 17:12:58 +01:00
William Moberg 32d2aa6a93 AABB can also be created with center position and its size. 2015-12-08 17:01:50 +01:00
William Moberg b87e543420 Merge branch 'master' into OctTree 2015-12-08 10:47:27 +01:00
William Moberg fa3816e55d Fixed flawed unit test. 2015-12-08 10:44:12 +01:00
viktorljung c717dd7049 Removed sprite RenderQueue and moved FrameBuffer to rendering instead of rendering/util 2015-12-08 10:37:24 +01:00
viktorljung d556f964e6 merge fixes 2015-12-08 10:15:12 +01:00
viktorljung e7427bf3ad Merge remote-tracking branch 'origin/master' into Rendering 
# Conflicts:
#	include/Game/HardcodedTestWorld.h
 2015-12-08 10:15:00 +01:00
viktorljung 9e1a4b83ae Linked picking to entities 2015-12-07 17:26:42 +01:00
viktorljung 9c589a0dc6 Added support for color tinting 2015-12-07 16:33:03 +01:00
William Moberg 04a8eeebe8 Added test get methods and some comments. 2015-12-07 16:25:01 +01:00
viktorljung 1df63aecd5 Added a RenderQueueFactory that produces a RenderQueueCollection for the Renderer to use. 
Still needs more work
 2015-12-07 16:24:34 +01:00
William Moberg e8d23f3b3f Added AABBVsAABB function. 2015-12-07 15:59:41 +01:00
stiffly 3bfd08e780 Adapted to folder name change in the code. Networking -> Network 2015-12-07 15:48:17 +01:00
sippeangelo 6991a2be26 Renamed Networking -> Network 2015-12-07 15:22:26 +01:00
stiffly dbac9a9669 Added filter to CMakeLists.txt. 2015-12-07 15:03:03 +01:00
stiffly 48339934b6 Created skeleton for Server/Client logic. 2015-12-07 14:32:49 +01:00
William Moberg 8e21b1fe35 Added ray collision detection in leaf nodes. Fixed possible bug in OctTree::AddBox 2015-12-03 19:25:40 +01:00
viktorljung 96a10ada38 fixed so the picking works with the new framebuffer class 2015-12-03 19:20:30 +01:00
viktorljung a82c7c1e3b Merge branch 'Rendering' of github.com:teamfisk/TacticalZ into Rendering 
# Conflicts:
#	include/Engine/Rendering/Renderer.h
#	src/Engine/Rendering/Renderer.cpp
 2015-12-03 19:06:24 +01:00
viktorljung dc8cc92ec2 Added a GenerateTexture function 2015-12-03 19:04:57 +01:00
viktorljung aaa6b6ef20 Added FrameBuffer wrapper class 2015-12-03 18:32:01 +01:00
Tleety 45a48bbbe5 Merge remote-tracking branch 'origin/master' into Rendering 2015-12-03 18:15:56 +01:00
Tleety 1c06c06816 Added a ScreenCoords class with some util functions to clean up the Renderer class. 2015-12-03 18:14:52 +01:00
William Moberg af5b3a9302 Fixed wrong paths and added an outDistance to RayVsAABB. 2015-12-03 17:24:53 +01:00
William Moberg abb61d2cd6 Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree 
# Conflicts:
#	include/Engine/Core/Collision.h
#	src/Engine/Core/Collision.cpp
 2015-12-03 17:11:35 +01:00
William Moberg 2f13f5da7a Relocated AABB and Ray in Collision.h to their own files. Started implementation on OctTree. 2015-12-03 17:03:27 +01:00
sippeangelo d3d2e594fe Basic and working entity system with a really ugly test case 2015-12-03 15:07:35 +01:00
Tleety 64aa3a1064 rendering/util now added to CMakeLists.txt 2015-12-03 15:02:14 +01:00
viktorljung 983ca485f5 Picking now returning world position 2015-12-03 14:50:14 +01:00
viktorljung 18b63c7ef3 Added 3D picking of models to renderer 2015-12-02 18:00:11 +01:00
verysecrethero af294f78b7 czdxvxdfvxvxvc 2015-12-02 16:26:30 +01:00