 William Moberg
|
9a7d77f29d
|
Removed notes in OldOctTree.
|
2015-12-11 16:44:49 +01:00 |
|
 Tleety
|
53d5736420
|
Fixed a bugg with RenderState.
Renderstate now also handles the Frambuffer binding.
|
2015-12-11 16:07:12 +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 |
|
 stiffly
|
3da69c8a1b
|
Fixed indentation
|
2015-12-11 15:29:57 +01:00 |
|
|
stiffly
|
16d636a87c
|
Removed Initialize function for systems.
|
2015-12-11 15:23:56 +01:00 |
|
|
stiffly
|
4da33ff4ec
|
Fixed movement on a "player" cube. Very simple system atm
|
2015-12-11 15:00:57 +01:00 |
|
|
stiffly
|
c2435fda2d
|
Added Component to Components.xsd and Entity.xsd
|
2015-12-11 14:27:54 +01:00 |
|
|
Tleety
|
433331e752
|
DrawPass now moved to it's own class to make renderer cleaner.
|
2015-12-11 14:22:54 +01:00 |
|
|
stiffly
|
094c7fbb44
|
Added system to CMakeLists.txt.
|
2015-12-11 14:20:36 +01:00 |
|
|
stiffly
|
0b60979c7b
|
Added a Initialize function for systems.
|
2015-12-11 14:03:00 +01:00 |
|
|
Tleety
|
2366cd3520
|
Merge remote-tracking branch 'origin/master' into RendererDecoupling
|
2015-12-11 13:52:41 +01:00 |
|
|
Tleety
|
725a8896ce
|
PickingPass now publishes an event that others can listen to to get pickingdata.
|
2015-12-11 13:51:08 +01:00 |
|
 verysecrethero
|
350038057d
|
Misc OctTreeTest changes
|
2015-12-11 13:51:07 +01:00 |
|
|
stiffly
|
80f028edf2
|
Added a very basic PlayerSystem, and a PlayerComponent.
|
2015-12-11 13:45:19 +01:00 |
|
|
Tleety
|
8c563a2d76
|
Merge remote-tracking branch 'origin/Picking' into RendererDecoupling
# Conflicts:
# include/Engine/Rendering/Renderer.h
# src/Engine/Rendering/Renderer.cpp
|
2015-12-11 11:21:58 +01:00 |
|
|
Tleety
|
91edab34bc
|
PickingPass now sets state and clear it when done.
PickingState now it's own class so renderer is a bit cleaner.
|
2015-12-11 11:18:30 +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 |
|
 Jace
|
6326a60a79
|
Merge pull request #11 from teamfisk/Picking
Picking
|
2015-12-10 17:24:12 +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 |
|
 viktorljung
|
bb900c5110
|
Added picking event
|
2015-12-10 16:33:33 +01:00 |
|
|
Tleety
|
cefc4e5257
|
PickingPassState done.
|
2015-12-10 16:06:25 +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 |
|
|
Tleety
|
37cf42527b
|
RenderState class structure made.
|
2015-12-10 16:03:48 +01:00 |
|
|
viktorljung
|
aa805f9a41
|
Merge remote-tracking branch 'origin/master' into Picking
|
2015-12-10 11:38:35 +01:00 |
|
|
verysecrethero
|
c60e968836
|
Removed a boxclear in the end of the test2 method
|
2015-12-10 11:03:40 +01:00 |
|
|
Tleety
|
9d3313e3ed
|
Calculate frustrum removed from code untill Nvidia isn't shit.
|
2015-12-10 10:46:27 +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 |
|
|
Tleety
|
de6e74c0b1
|
Forward+ Debugging commit, dont try it.
|
2015-12-09 17:36: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 |
|
|
Tleety
|
393a774140
|
Framework for Forward+ renderer, Buggy.
|
2015-12-09 14:50:39 +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 |
|
|
Tleety
|
eb9c217eb4
|
3D picking float value error fixed.
|
2015-12-09 10:44:06 +01:00 |
|