Commit Graph

36 Commits

Author SHA1 Message Date
Lynix
6f4542393b Graphics/Sprite: Allows to set sprite corner color
Former-commit-id: b9b49224a89e38b233b590d78fd58e702741190f [formerly a575b0a6a20f1e395c0d3722d0c718cf29ee3d10] [formerly 39ad76edf53946c635a2acdaf97e5112c4ecbce2 [formerly 3353bce80b26d16e82f580d7a7c86399f3cac387]]
Former-commit-id: aa828d49caa667f82916c37f36cc44493c2b4b35 [formerly a0f30d565da18350446bc028f54dbcbe9d26bfb9]
Former-commit-id: 56145df1ee427d56fd7a951278b99484e56400a8
2016-09-07 13:04:58 +02:00
Lynix
05053fdf5e Sdk/GraphicsComponent: Allows to setup an offset to renderables
Former-commit-id: 8803527725eb537ec2a85e64479ac9037b59da48 [formerly 8d2aca710c0fa942c6a5b89e0c6cba5722cf1601] [formerly e44866a9ffea3643893ffff5d9fe8418b00b961d [formerly 6efd8e148208de0d2817679321acca69f75617fc]]
Former-commit-id: e79e25aca4df5fc5ee79b5963a35050d8c3cd79c [formerly 8e324bda1c9e43fb88aaf31e2d38b0ff587aa03f]
Former-commit-id: 735155f96801d382e36f9be78c44afbcb35cb236
2016-09-04 20:02:23 +02:00
Lynix
60ac889640 Graphics/Sprite: Add Origin parameter
Allows you to change center of translation/rotation/scale


Former-commit-id: f3ce3d4f8350738f8ddca2e157282b70a982b5ef [formerly b3c9dff5ec52ee320e68c032817caef84862c059] [formerly 0dd589e277f5d625f2c52d9195e812d940e2a4e0 [formerly 06491fb509c1e8a49acb8628c82e60a8ca71db84]]
Former-commit-id: 811657fd21f956a06906796be7986d8ddc37023c [formerly 7d6a08ef01b05140f6aed6f3f65b2ec5837fa28e]
Former-commit-id: af0ee4137a64a0cd4986cfc29854aced0698bde0
2016-08-31 20:53:27 +02:00
Lynix
377fae2ea1 Revert "Core/HardwareInfo: Fix indentation (Windows)"
This reverts commit a4019076ff9afd3cb7e2d98a54c9788fd2df1457 [formerly 3a39cd2e8a3aa8bb46f9f1465923f2abb8fc19a1] [formerly a23f6beee25e408579609874672806b124bf5fc0 [formerly be4cec088d5683bc18e54fd5daa2805134a88bb9]] [formerly dd94bfecaf16a96cdc39de9abd3c0749f17bf824 [formerly 539605da0eb694cbad2fb52fdb49b9a79c3a0d04] [formerly 00917e0bb4766a6f19f303040241c81a92778185 [formerly 48c4b5219e3d1f74f04099f164712c2baddf1d4b]]].


Former-commit-id: 4d853fb7aca7af266a8f4a8b093923a515f73f91 [formerly ec71333603cb30452d05a416241131764a0903ba] [formerly 418de7f39eddfc7826b12dc15dd47a8e5af146b0 [formerly 074a0313d402ec669e309c38ed225a16338bf952]]
Former-commit-id: a03666d46956845e61dee50e8628216232b851ed [formerly 356c2cd3a0fc44c6ddb982d10941ad747a3f1312]
Former-commit-id: 3c9dbcc77309da3ef5da8999a0fd5716fcdff28b
2016-08-31 19:16:03 +02:00
Lynix
822eb197f4 Core/HardwareInfo: Fix indentation (Windows)
Former-commit-id: e722e9377f1ff2029f0206bc92c3a930cad42929 [formerly c0f38cc656abc307bc7548ab5502ef1a9f66544e] [formerly 66ebb2287517d27c153de9f4cb62967526a629cd [formerly 2bc51321d6a1c187743937a7e9e7027e8cf71e44]]
Former-commit-id: 63dcdeedc0aaec9d6fa52cfb41d548debd75c679 [formerly cdce876914c2ecec66a1884730bc8f6e9aaf8d74]
Former-commit-id: 578acacf54563a0dc831ea1e70cbfa3428ee98d8
2016-08-31 18:20:23 +02:00
Gawaboumga
1f7dd1dae4 Fix documentation
Former-commit-id: c11854f38304c8c1db43d740b85d262f999e960d [formerly 1a02bb65c7dd7a3fdcef9f2efed1aa041365b929] [formerly 86ec65871b28639a3a475671297ebef6e75833a5 [formerly e5064e4cd1661344b3beb785d085756deb3dccf4]]
Former-commit-id: 09a97462c981a214dcd274047c5057805bb9aca4 [formerly 1f0c58d1b2e3e0641d50cf113809c3c11a1cc500]
Former-commit-id: cb2e1f2b5c9cd84124eaab9c401076fa4a586858
2016-08-21 13:49:24 +02:00
Lynix
31f052d405 Sdk/GraphicsComponent: Add Detach method
Former-commit-id: 08d5c0fa0d1cd09d6f58a0dfe75a3d952b62cae6 [formerly 75463d92e087e8791feda751fe2514c18fedf942]
Former-commit-id: aebd5945083f9339294077701093184f7700704b
2016-06-20 13:11:31 +02:00
Gawaboumga
74081c2b9f Documentation for module: Graphics
Former-commit-id: 5fba876346aec7b35bc618002b669ff194e58544
2016-05-30 14:21:36 +02:00
Lynix
c359c6925e Graphics/SpriteLibrary: Fix missing initialization/uninitialization (fixes crash at exit)
Former-commit-id: c7bbd781d163a8456f1fadd0f71451adc5a1bd1a
2016-01-19 12:14:07 +01:00
Lynix
0a0e6d00f7 Graphics: Add render order
Former-commit-id: 881ae69c214e024846dc0165f3476f76f5bcc0b5
2015-11-27 23:38:54 +01:00
Lynix
df8da275c4 Switch from Nz prefix to namespace Nz
What a huge commit


Former-commit-id: 38ac5eebf70adc1180f571f6006192d28fb99897
2015-09-25 19:20:05 +02:00
Lynix
391d248e59 Graphics/Sprite: Fix linker error
Former-commit-id: 1867897b6d67ccd7ed1779c66f086e3dc962e693
2015-08-16 01:45:31 +02:00
Lynix
a4bd84a6e3 Graphics: Remove deprecated scene interface
Former-commit-id: 6b5d3c22827912d664c4f8c9c4051c824180bb51
2015-06-24 13:55:35 +02:00
Lynix
8ade9fa65e Graphics/Sprite: Update to InstancedRenderable
Former-commit-id: 8153acbca05bf6afb4a4ed6cd0a323f641919b6d
2015-06-16 22:54:01 +02:00
Lynix
251e21f006 More VS fixes
Former-commit-id: 356effb816b9527ff9e89ee3b99074c468455b08
2015-06-13 19:42:07 +02:00
Lynix
0db92e671d Added a static New method to RefCounted-derived classes
Former-commit-id: efd9e68e050fb6cc7e0df7a7c222ca759c502dc5
2015-01-25 23:41:09 +01:00
Lynix
5f5be93992 Merge remote-tracking branch 'origin/master' into Resource-Update
Conflicts:
	include/Nazara/Audio/Music.hpp
	include/Nazara/Audio/SoundBuffer.hpp
	include/Nazara/Core/Resource.hpp
	include/Nazara/Core/ResourceListener.hpp
	include/Nazara/Graphics/Material.hpp
	include/Nazara/Renderer/Context.hpp
	include/Nazara/Renderer/RenderBuffer.hpp
	include/Nazara/Renderer/Shader.hpp
	include/Nazara/Renderer/Texture.hpp
	include/Nazara/Renderer/UberShader.hpp
	include/Nazara/Utility/Animation.hpp
	include/Nazara/Utility/Buffer.hpp
	include/Nazara/Utility/Image.hpp
	include/Nazara/Utility/IndexBuffer.hpp
	include/Nazara/Utility/Mesh.hpp
	include/Nazara/Utility/SkeletalMesh.hpp
	include/Nazara/Utility/Skeleton.hpp
	include/Nazara/Utility/StaticMesh.hpp
	include/Nazara/Utility/SubMesh.hpp
	include/Nazara/Utility/VertexBuffer.hpp
	include/Nazara/Utility/VertexDeclaration.hpp
	src/Nazara/Core/Resource.cpp
	src/Nazara/Core/ResourceListener.cpp
	src/Nazara/Graphics/DeferredRenderQueue.cpp
	src/Nazara/Graphics/ForwardRenderQueue.cpp
	src/Nazara/Graphics/SkinningManager.cpp
	src/Nazara/Renderer/RenderTexture.cpp
	src/Nazara/Renderer/Renderer.cpp
	src/Nazara/Utility/Mesh.cpp

Former-commit-id: 99b5ad26a19fe9c9f8118da7b5920bffe89f60f8
2015-01-25 19:29:55 +01:00
Lynix
a185f03abc Merge remote-tracking branch 'origin/Scene-Update'
Former-commit-id: 4185e7a826476d3d5b4275b3900fe695bd791f3a
2015-01-25 16:35:18 +01:00
Lynix
cf12552358 (SceneNode) Added virtual constructor idiom
(Light) Added default constructor


Former-commit-id: 591e6a8435d2cea6238e70c0058d381b8d547f3e
2015-01-23 21:04:29 +01:00
Lynix
1f043b61df (Scene) Removed useless Pimpl idiom
Former-commit-id: ffbca2a6b6e16792f58e77195a08911368f64f57
2015-01-23 14:35:26 +01:00
Lynix
ea8d683624 Updated copyright year
(532 files, wow)


Former-commit-id: cbb31f1124a86720bd3a54fe589a0f849a87b434
2015-01-21 20:53:01 +01:00
Lynix
8a3c410d60 Made bounding volume handing part of SceneNodes
Former-commit-id: d09d06ac4515ce09aa16fd92dd045c2a06730a99
2015-01-20 20:35:16 +01:00
Lynix
ead44173ba Merge remote-tracking branch 'origin/Particle-Update'
Conflicts:
	include/Nazara/Graphics/Enums.hpp
	include/Nazara/Graphics/ForwardRenderQueue.hpp
	include/Nazara/Graphics/ForwardRenderTechnique.hpp
	include/Nazara/Graphics/Sprite.hpp
	src/Nazara/Graphics/DeferredRenderQueue.cpp
	src/Nazara/Graphics/ForwardRenderQueue.cpp
	src/Nazara/Graphics/ForwardRenderTechnique.cpp
	src/Nazara/Graphics/Material.cpp
	src/Nazara/Graphics/Resources/Shaders/Basic/core.frag.h
	src/Nazara/Graphics/Resources/Shaders/Basic/core.vert
	src/Nazara/Graphics/Resources/Shaders/Basic/core.vert.h
	src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.frag
	src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.frag.h
	src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.vert
	src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.vert.h
	src/Nazara/Graphics/Sprite.cpp

Former-commit-id: 73139ce47d7721635d87c74b2ca1183c2f67c090
2015-01-19 02:20:28 +01:00
Lynix
3ed18e70da Added default material to sprites
Former-commit-id: 8a68d3d9b251ff93a793d4e001aed721558a8eef
2015-01-17 00:34:09 +01:00
Lynix
fdb722ef14 Made SceneNodes non-movable
Fixed SceneNodes copy constructor not parenting the right object


Former-commit-id: 21a08e3bb0931af426d97399dab86dda9acdf172
2015-01-17 00:15:01 +01:00
Lynix
fc1e75d379 Fixed compilation error (from 683866baee26a12cf63b20914fff338cc872a4c8 [formerly a885b69881c30dcad29f87c3ffee41808761b6c9])
Former-commit-id: 8d96d5dee5666bbce41f406bcbabe269e101fafb
2015-01-05 15:12:59 +01:00
Lynix
4de17fdffb Remade sprite rendering
Added VertexColor shader flag
Added color sprite attribute
Added VertexStruct_XY_Color(_UV) struct & declaration


Former-commit-id: b664f4520aa55f4502f85f9dedab9b92040a8c16
2015-01-04 13:19:07 +01:00
Lynix
a51cbc1e49 Added Sprite::SetSize(float, float) overload
Former-commit-id: 672a2e4f5c2a2d40b4af42c7ee4b7b37d3774117
2014-12-07 03:05:27 +01:00
Lynix
67ecefd380 Added sprite color attribute
Former-commit-id: 1db061b862315495cb40ff308348a0ac8d41e304
2014-09-01 15:42:51 +02:00
Lynix
a31ced1d76 Modified SceneNode::FrustumCull
Now provides an implementation which will test the bounding volume
against the frustum (Basic frustum culling)
Is now const
Disabled face culling on sprites


Former-commit-id: 5cb7a94b38ef8b0ffa5a78f16f5ef65a59ab375d
2014-06-05 21:28:17 +02:00
Lynix
86bdab9055 Big UberShader update
-Added GRAPHICS_MAX_LIGHTPERPASS macro
-Added glGetActiveUniform OpenGL function
-Added (Uber)ShaderLibrary
-Added (Uber)ShaderName parameter to models
-Changed uniform system
-Fixed Node copying
-Moved Material class to Graphics module
-Optimized lights
-Remade Shader class
-Renamed Node::Invalidate to Node::InvalidateNode
-Renamed ShaderProgram to Shader


Former-commit-id: 15f0cad52969e91a2442e7d750ba2dc412f3549d
2014-02-21 19:27:39 +01:00
Lynix
c096756dab Happy thousandth commit Nazara
Updated copyright year (Yay, 515 file updated)
Regenerated global headers
Fixed some typo
Improved some shaders
-Blah blah blah-

Thank you all for supporting my project !
-Lynix


Former-commit-id: e4e741b318ba4f203da5ffd265bd5e516e7ffd7d
2014-01-12 20:16:21 +01:00
Lynix
3cbcc527cd Added Sprite::SetTexture
Former-commit-id: 275e689110fe7b86159b895a3016a64f1103effb
2013-10-09 10:14:17 +02:00
Lynix
7fa8f3dafd Moved Model::EnableDraw to SceneNode::EnableDrawing
Same goes for Model::IsDrawEnabled() => SceneNode::IsDrawingEnabled()
Is Drawable is now a pure virtual method from SceneNode


Former-commit-id: 217c6a21a98206ee0b283aaa216d419696a70faf
2013-08-23 13:16:42 +02:00
Lynix
198d13be20 Enabled Frustum culling for Sprites
Former-commit-id: 5c5bf7da97f10b43c204bb336c2e979899f506d0
2013-08-21 21:17:39 +02:00
Lynix
c8414a39d8 Big Graphics update
Separated LightManager
Added Sprite class
Added View class
Camera is no longer a SceneNode
Fixed Material not invalidating programs
Renamed CameraPosition uniform to EyePosition
Renamed VisibilityTest to FrustumCull


Former-commit-id: ff7fbe4d9b31a3c269baab0b48c6faa347a12161
2013-08-21 20:05:33 +02:00