 Jace
|
8000654005
|
Model loading now fetches material opacity value properly
|
2015-12-17 15:28:05 +01:00 |
|
 viktorljung
|
aeca1dec18
|
Merge remote-tracking branch 'origin/master' into Rendering
# Conflicts:
# src/Engine/Editor/EditorSystem.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Game/Game.cpp
|
2015-12-17 11:17:58 +01:00 |
|
|
viktorljung
|
0f1b06f74e
|
Fixed camera rotation bug
|
2015-12-17 11:13:34 +01:00 |
|
|
Jace
|
c8460e0a6c
|
It's no use
|
2015-12-17 10:55:54 +01:00 |
|
|
viktorljung
|
6a3c14540d
|
fixes
|
2015-12-17 10:38:13 +01:00 |
|
|
viktorljung
|
5602b32507
|
Forward+ Fixes
|
2015-12-16 13:36:38 +01:00 |
|
|
Jace
|
322aedaf72
|
Basic transformation widgets
|
2015-12-16 09:47:38 +01:00 |
|
 Tleety
|
1431bd1a11
|
DebugChanges
|
2015-12-15 15:39:23 +01:00 |
|
|
viktorljung
|
fa66e9ff47
|
Camera Switch event now working, Camera models Rotation still bugged
|
2015-12-15 15:29:19 +01:00 |
|
|
Tleety
|
1e370bac13
|
ForwardPlus base debug commit.
|
2015-12-15 15:28:37 +01:00 |
|
|
Jace
|
c296c4eb3b
|
Fixed picking pass... again...
|
2015-12-15 09:49:38 +01:00 |
|
|
Jace
|
422e6f5264
|
Created a RenderState for ImGuiRenderPass
|
2015-12-14 20:26:04 +01:00 |
|
|
Jace
|
522679b14c
|
Added BlendEquation and BlendFunc to RenderState, and cleaned it up A LOT
|
2015-12-14 20:23:29 +01:00 |
|
|
viktorljung
|
d9ea0192d1
|
Added RenderSystem and removed RenderQueueFactory
|
2015-12-14 20:07:02 +01:00 |
|
|
viktorljung
|
ef07a9d536
|
Merge remote-tracking branch 'origin/master' into Rendering
# Conflicts:
# include/Engine/Rendering/RenderQueueFactory.h
|
2015-12-14 19:11:00 +01:00 |
|
|
viktorljung
|
05b78265be
|
Fixed some transparency bugs and started on component based camera
|
2015-12-14 19:10:00 +01:00 |
|
|
Tleety
|
7c714d1f98
|
Changed some error handling in the RenderState class.
|
2015-12-14 17:35:01 +01:00 |
|
|
Jace
|
f8d927cd91
|
Don't render invisible model components
|
2015-12-14 16:11:37 +01:00 |
|
|
Jace
|
798c73132e
|
Fixed ScreenCoords::ToPixelData stack corruption
|
2015-12-14 16:11:08 +01:00 |
|
|
Jace
|
bc6a211276
|
Removed RenderState log spam
|
2015-12-14 14:54:19 +01:00 |
|
|
Jace
|
7719274a37
|
Correct asset reference for fonts
|
2015-12-14 14:54:03 +01:00 |
|
|
viktorljung
|
123c198e19
|
Text component added and Text render queue
|
2015-12-14 14:48:24 +01:00 |
|
|
Jace
|
797036c204
|
Fixed picking event
|
2015-12-14 14:24:11 +01:00 |
|
|
Jace
|
3a9577c9fb
|
fixup! Enabled rendering "transparency"
|
2015-12-14 14:08:37 +01:00 |
|
|
Jace
|
7bc492134d
|
Enabled rendering "transparency"
|
2015-12-14 13:58:24 +01:00 |
|
|
Jace
|
7c1182c28f
|
Fixed absolute positions once and for all (maybe?)
|
2015-12-14 13:57:56 +01:00 |
|
|
Jace
|
2f3843e595
|
Editor version 1
|
2015-12-14 13:57:55 +01:00 |
|
|
Jace
|
524af211e0
|
Made resource loading fail gracefully when a resource can't be loaded. Resources should now throw exceptions in their constuctor if the resource can't be loaded. This will result in ResourceManager::Load returning null.
|
2015-12-14 13:57:53 +01:00 |
|
|
Jace
|
2e321e15a5
|
Cleaned up ImGuiRenderPass
|
2015-12-14 13:57:50 +01:00 |
|
|
Jace
|
c81a054601
|
Subscribed ImGui to MouseScroll event
|
2015-12-14 13:57:50 +01:00 |
|
|
Jace
|
7db1feac17
|
Added basic ImGui implementation
|
2015-12-14 13:57:45 +01:00 |
|
|
Jace
|
d16cbe84f0
|
Merge remote-tracking branch 'origin/master' into Input
# Conflicts:
# src/Engine/Rendering/Renderer.cpp
|
2015-12-14 13:40:22 +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
|
30474b70df
|
MouseInputHandler
|
2015-12-12 13:42:46 +01:00 |
|
|
Jace
|
7464facab9
|
Next generation raptor copter
|
2015-12-12 03:38:17 +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 |
|
|
viktorljung
|
9bd3da409d
|
Added Font to ResourceManager
|
2015-12-11 16:53:51 +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 |
|
|
viktorljung
|
a8a38716bd
|
Text renderer up and working, needs more work to be compatible with the ResourceManager and the Entity Component system
|
2015-12-11 16:12:29 +01:00 |
|
|
Tleety
|
53d5736420
|
Fixed a bugg with RenderState.
Renderstate now also handles the Frambuffer binding.
|
2015-12-11 16:07:12 +01:00 |
|
|
Tleety
|
433331e752
|
DrawPass now moved to it's own class to make renderer cleaner.
|
2015-12-11 14:22:54 +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 |
|
|
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 |
|
|
viktorljung
|
7b6902eafe
|
Merge remote-tracking branch 'origin/master' into TextRendering
|
2015-12-11 10:55:10 +01:00 |
|
|
viktorljung
|
46854a63dd
|
Text rendering includes
|
2015-12-11 10:54:52 +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 |
|