BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
145 Commits 116 Branches 0 Tags
8abef7024d978301a0481c951e7f6bace815456f
Commit Graph

145 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
verysecrethero 8abef7024d Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree 
# Conflicts:
#	src/Tests/OctTreeTest.cpp
 2015-12-14 11:14:09 +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 9a7d77f29d Removed notes in OldOctTree. 2015-12-11 16:44:49 +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
verysecrethero 350038057d Misc OctTreeTest changes 2015-12-11 13:51:07 +01:00
verysecrethero 1ceea91f4a Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree 
# Conflicts:
#	include/Engine/Core/OctTree.h
#	src/Engine/Core/OctTree.cpp
 2015-12-10 18:02:03 +01:00
William Moberg 4195baa5dc ContainedObject in OctTree made private. 2015-12-10 17:57:09 +01:00
William Moberg 37f9ab2322 Quick fix for unit test compilation. 2015-12-10 17:53:33 +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
verysecrethero c60e968836 Removed a boxclear in the end of the test2 method 2015-12-10 11:03:40 +01:00
Jace dc4f5ad26e Merge pull request #9 from teamfisk/ecs-systems 
ECS Systems
 2015-12-10 10:42:37 +01:00
Viktor Ljung eaca1c4dd1 Merge pull request #7 from teamfisk/ecs 
Entity loading from schema
 2015-12-10 10:32:00 +01:00
sippeangelo 0367826f16 Added RaptorCopter example system 2015-12-10 10:17:18 +01:00
sippeangelo 352074da04 Created base for systems 2015-12-10 10:17:08 +01:00
sippeangelo 53ef749736 Fixed absoute positioning, I think... 2015-12-10 10:16:03 +01:00
verysecrethero bc8a922b77 Merging octTreeTests a bit 2015-12-09 17:57:32 +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 578018607a Moved decision of which map to load to Config.ini 2015-12-09 14:32:34 +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
verysecrethero b650eb95df Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree 2015-12-09 13:57:22 +01:00
verysecrethero 8949db5456 Little more work with OctTreeTest 2015-12-09 13:56:59 +01:00
William Moberg 14bcb7ea0d Added Update call in Game to test OctTree by using collision. 2015-12-09 13:52:17 +01:00
verysecrethero 519178dfba Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree 
# Conflicts:
#	src/Engine/Core/OctTree.cpp
 2015-12-09 13:37:27 +01:00
verysecrethero ed5cd392ab Further work in testing OctTree 2015-12-09 13:29:15 +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
sippeangelo c9d1ba6cae EntityIDs should start at 1, because 0 is world 2015-12-09 11:07:46 +01:00
verysecrethero 1d0810db10 OctTree is now drawn perfectly 2015-12-09 10:24:06 +01:00
verysecrethero c85bb2eef7 Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree 2015-12-09 10:08:26 +01:00
verysecrethero 75402b0f93 Working on OctTree tests 2015-12-09 10:08:08 +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 9fbea18330 fixup! Merge remote-tracking branch 'origin/master' into ecs 2015-12-08 18:20:42 +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
sippeangelo 03bbe25a1e Fixed FindXerces.cmake 2015-12-08 17:42:59 +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
verysecrethero 7ac2aaef15 Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree 
# Conflicts:
#	src/Engine/Core/OctTree.cpp
 2015-12-08 11:16:34 +01:00
verysecrethero 06f56d13d1 added some octTreeTest tests and a few comments in OctTree 2015-12-08 11:14:01 +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
Jace ed8d0fb608 Merge pull request #6 from teamfisk/Rendering 
Rendering
 2015-12-08 10:39:54 +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