90f05442aa
Merge branch 'master' into BoxModelCollision
...
# Conflicts:
# include/Engine/Core/Octree.h
# resources/Schema/Entities/CollisionTestLevel.xml
# src/Engine/Collision/CollisionSystem.cpp
# src/Engine/Core/Octree.cpp
2016-01-27 10:52:27 +01:00
6ea490e215
Tried a horrible recursive method, extreme framedrop.
2016-01-27 10:34:26 +01:00
3389b965eb
Test on game level v1.
2016-01-25 10:55:05 +01:00
f1343e2f82
Collision may be working, kind of.
2016-01-24 21:08:42 +01:00
910b3d10e4
WIP (false collisions), collision method expanded, not working.
2016-01-24 15:32:10 +01:00
Jace
373bb33cf0
Player jumping taking air acceleration into account
2016-01-24 15:20:34 +01:00
e6224a4e96
WIP (not working), attempt at separating axis theorem stuff.
2016-01-23 18:31:27 +01:00
6eeb3ea524
WIP, Bug fix + nitpicks + optimizations.
2016-01-23 17:50:35 +01:00
71404c8828
Special case for collision vs ground (upward facing) triangles.
2016-01-23 14:01:54 +01:00
3974c649ab
WIP on ModelBoxCollision. Octree works in Release mode.
2016-01-23 10:45:50 +01:00
1670fb4e48
Moved triangle vs ray code to method.
2016-01-22 14:45:50 +01:00
3955e1d60c
Can resolve collision when AABB corners cut through triangle.
...
At least two more cases left to resolve.
2016-01-22 13:46:09 +01:00
52765cc85b
TriangleVsBox detection seems to work in all cases, but cannot resolve all cases yet.
...
Also added default ctor for Ray and removed compilation errors in CollisionSystem.
2016-01-22 11:22:56 +01:00
9f6fa40448
Merge branch 'master' into BoxModelCollision
...
# Conflicts:
# src/Engine/Collision/CollisionSystem.cpp
2016-01-21 17:16:55 +01:00
de7c8e9234
WIP, collision detects too much, no resolving for most cases.
2016-01-21 17:10:36 +01:00
Jace
a6548a72b3
Merge remote-tracking branch 'origin/master' into EditorUsefulness
...
# Conflicts:
# include/Engine/Collision/CollidableOctreeSystem.h
# include/Engine/Collision/CollisionSystem.h
# include/Engine/Collision/TriggerSystem.h
# include/Engine/Rendering/RenderSystem.h
# include/Game/Systems/PlayerSystem.h
# resources/Schema/Components/Physics.xsd
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
# src/Game/Systems/HealthSystem.cpp
# src/Game/Systems/PlayerSystem.cpp
# src/Tests/OctTreeTestGameClass.cpp
2016-01-21 16:16:35 +01:00
4d5b835352
WIP triangles vs. AABB.
2016-01-20 16:43:09 +01:00
d1b6fb1259
Tiny logic alteration so we don't get false warnings in debug.
2016-01-19 16:59:02 +01:00
713ebbe18c
Can add any objects that inherit from AABB into the Octree.
2016-01-19 14:50:46 +01:00
Jace
51979d7f0c
Changed System to take World through constructor and store it instead, cause it makes more sense.
2016-01-18 23:59:33 +01:00
0669d91767
CollisionSystem loops over Collidable components.
2016-01-18 13:29:10 +01:00
942064c450
Removed class PlayerSystem and associated files.
2016-01-18 13:07:04 +01:00
Jace
b2213dbe9a
Merge remote-tracking branch 'origin/master' into PlayerMovement
...
# Conflicts:
# include/Engine/Collision/Collision.h
# include/Engine/Collision/CollisionSystem.h
# include/Engine/Collision/TriggerSystem.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/CollisionTestLevel.xml
# resources/Schema/Types/Entity.xsd
# src/Engine/Collision/Collision.cpp
# src/Game/Game.cpp
2016-01-15 20:28:43 +01:00
f5ea4d513c
ResourceManager::Load never returns null, throws exceptions instead.
2016-01-15 15:25:01 +01:00
4cf6dcfc14
Merge branch 'master' into AsyncResourceLoad
...
# Conflicts:
# include/Engine/Rendering/RawModel.h
# src/Engine/Rendering/RenderQueueFactory.cpp
2016-01-15 10:10:57 +01:00
Jace
5e721325a4
Merge fixes
2016-01-14 18:20:51 +01:00
Jace
6ad1839def
Initial work on PlayerMovementSystem
2016-01-14 17:03:48 +01:00
71047b08ec
Async load works, using exceptions for special resources.
2016-01-14 16:27:45 +01:00
Jace
d34470256b
EntityWrapper to uniquely identify entities and make using them a little easier
2016-01-14 15:43:19 +01:00
Jace
71d936f8d1
Start of a movement system with collisions against AABBs
2016-01-14 14:54:12 +01:00
9f185a1e35
Wrecked the last commit. Async loading works now.
2016-01-13 18:51:45 +01:00
Jace
d6ef527f25
Basic collisions using Octree. Seems buggy over octree boundaries.
2016-01-13 15:34:43 +01:00
236230d12c
Packets now dynamically allocates more memory when they need it.
...
Increased local receive buffer for Client and Server() and removed the magic number that was used
In Server.h and Client.h
(char readBuffer[INPUTSIZE] = { 0 }).
Packets start size has now been increased to 512 bytes.
Changed ComponentInfo::FieldsInOrder to store strings instead of pointers.
Removed HasEntity() and are now using ValidEntity() instead.
2016-01-12 12:00:19 +01:00
b37ffc7449
WIP Model component not working.
2016-01-11 14:58:49 +01:00
c4642cc530
Merge branch 'master' into OrderedSystemPipeline
...
# Conflicts:
# include/Engine/Core/SystemPipeline.h
2016-01-07 15:07:16 +01:00
fa8775a72e
Renamed vars and added some comments.
2016-01-07 10:28:18 +01:00
00bc55370d
Added error check in Collision.cpp
2015-12-18 14:19:28 +01:00
5e0fe975f3
Small error handling check.
2015-12-17 17:48:00 +01:00
0f59b863ee
Renamed IF_DEBUG_IS to DEBUG_IF, slightly different behavior and added some safety checking for auto creating AABBs from models.
2015-12-17 17:08:47 +01:00
5160a45b44
Made Ray into a class with checks so the direction will always be normalized.
2015-12-17 13:41:34 +01:00
6d1cbd928e
Improved collision logic, still not perfect since it updates before PlayerSystem.
2015-12-16 16:34:27 +01:00
cf0ff9bfe5
Simple quickly made CollisionSystem.
2015-12-16 12:23:08 +01:00
d10df6ae09
TriggerSystem implemented and working.
2015-12-16 12:22:15 +01:00
ed82a0939a
Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree
2015-12-15 15:37:14 +01:00
e2417be8c7
Very simple CollisionSystem made, 'Z','Y' to toggle on/off.
2015-12-15 15:36:28 +01:00
170610bcb1
Added a TriggerSystem, seems to work as intended.
2015-12-15 14:49:52 +01:00
1229a99af4
Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree
2015-12-15 11:07:51 +01:00
ae7d4b9097
Put Collision folder in CMakeLists.txt and altered paths.
2015-12-14 17:35:39 +01:00
e6fa9df3a5
Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree
2015-12-14 17:08:51 +01:00
59095c2ce5
Started on CollisionSystem and TriggerSystem. Moved collision code to Collision folder.
2015-12-14 17:08:00 +01:00
William Moberg
Jace
Jocke
stiffly
verysecrethero