 Jace
|
95ce024bb6
|
Merge pull request #13 from teamfisk/RendererDecoupling
Renderer decoupling
|
2015-12-14 13:39:20 +01:00 |
|
 Tleety
|
d182e6c453
|
Merge remote-tracking branch 'origin/master' into RendererDecoupling
# Conflicts:
# src/Game/Game.cpp
|
2015-12-14 13:16:56 +01:00 |
|
|
Jace
|
e76a6b74a3
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
# Conflicts:
# src/Game/Game.cpp
|
2015-12-14 11:41:59 +01:00 |
|
|
Jace
|
e82911cb8b
|
Renderer FOV setting in Config.ini
|
2015-12-14 11:39:13 +01:00 |
|
|
Jace
|
7464facab9
|
Next generation raptor copter
|
2015-12-12 03:38:17 +01:00 |
|
|
Tobias Dahl
|
f14c62f3d3
|
Merge pull request #12 from teamfisk/PlayerSystem
Player system
|
2015-12-11 17:15:00 +01:00 |
|
|
Tleety
|
d406059c79
|
Small bugfix.
|
2015-12-11 17:00:06 +01:00 |
|
|
Tleety
|
59b261534a
|
Cleaned some comments and random annoyances in Renderer
|
2015-12-11 16:57:02 +01:00 |
|
|
Tleety
|
45b87ed6b1
|
ShaderProgram is now a Resource.
All shaderprograms are now pointers and loaded with Resourcemanager.
|
2015-12-11 16:53:46 +01:00 |
|
|
Tleety
|
53d5736420
|
Fixed a bugg with RenderState.
Renderstate now also handles the Frambuffer binding.
|
2015-12-11 16:07:12 +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 |
|
|
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 |
|
|
Jace
|
6326a60a79
|
Merge pull request #11 from teamfisk/Picking
Picking
|
2015-12-10 17:24:12 +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 |
|
|
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 |
|
|
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 |
|
|
Tleety
|
de6e74c0b1
|
Forward+ Debugging commit, dont try it.
|
2015-12-09 17:36:03 +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 |
|
|
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 |
|
|
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 |
|
|
Jace
|
ed8d0fb608
|
Merge pull request #6 from teamfisk/Rendering
Rendering
|
2015-12-08 10:39:54 +01:00 |
|