BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into Importer

Browse Source 
# Conflicts:
#	resources/Schema/Entities/RenderingWorld.xml
#	resources/Shaders/ForwardPlus.frag.glsl
#	src/Engine/Editor/EditorSystem.cpp
#	src/Engine/Network/Server.cpp
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Tests/OctTreeTestGameClass.cpp
#	src/Tests/OctTreeTestHardCodedTestWorld.h
#	src/Tests/ResourceManagerTest.cpp
This commit is contained in:
antc13
2016-01-24 14:40:52 +01:00
parent 8286d052b3 132de88d28
commit 4c5d17b203
172 changed files with 6609 additions and 2458 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tests/CollisionTest.cpp
+5 -5
View File
@@ -13,9 +13,9 @@ using boost::unit_test_framework::test_case;
#include <string>
//ray vs model
#include "Engine\Core\ResourceManager.h"
#include "Engine\Rendering\Model.h"
#include "Engine\Core\Ray.h"
#include "Engine/Core/ResourceManager.h"
#include "Engine/Rendering/Model.h"
#include "Engine/Core/Ray.h"
//vs memleaks
//#define _CRTDBG_MAP_ALLOC
@@ -207,9 +207,9 @@ BOOST_AUTO_TEST_CASE(octTest)
{
glm::vec3 mini = glm::vec3(-1, -1, -1);
glm::vec3 maxi = glm::vec3(1, 1, 1);
Octree tree(AABB(mini, maxi), 2);
Octree<AABB> tree(AABB(mini, maxi), 2);
tree.AddDynamicObject(AABB(mini, -0.9f*maxi));
Octree::Output data;
OctSpace::Output data;
glm::vec3 origin = 3.0f * mini;
bool rayIntersected = tree.RayCollides(Ray(origin , mini - origin), data);
BOOST_CHECK(rayIntersected);