sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Graphics: Improve code 

Former-commit-id: d548b513aef5190e20bc065653178981c5d18f68
This commit is contained in:
Lynix 2015-08-16 01:44:17 +02:00
parent ff9d233e7c
commit ba1073828f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/Nazara/Graphics/Model.hpp
View File

@ -10,8 +10,8 @@
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/Resource.hpp> #include <Nazara/Core/Resource.hpp>
#include <Nazara/Core/ResourceLoader.hpp> #include <Nazara/Core/ResourceLoader.hpp>
#include <Nazara/Graphics/Material.hpp>
#include <Nazara/Graphics/InstancedRenderable.hpp> #include <Nazara/Graphics/InstancedRenderable.hpp>
#include <Nazara/Graphics/Material.hpp>
#include <Nazara/Utility/Mesh.hpp> #include <Nazara/Utility/Mesh.hpp>
struct NAZARA_GRAPHICS_API NzModelParameters struct NAZARA_GRAPHICS_API NzModelParameters
@ -34,7 +34,6 @@ using NzModelRef = NzObjectRef<NzModel>;
class NAZARA_GRAPHICS_API NzModel : public NzInstancedRenderable, public NzResource class NAZARA_GRAPHICS_API NzModel : public NzInstancedRenderable, public NzResource
{ {
friend NzModelLoader; friend NzModelLoader;
friend class NzScene;
public: public:
NzModel(); NzModel();

2
include/Nazara/Graphics/Sprite.inl
View File

@ -72,7 +72,7 @@ inline void NzSprite::SetDefaultMaterial()
material->Enable(nzRendererParameter_FaceCulling, false); material->Enable(nzRendererParameter_FaceCulling, false);
material->EnableLighting(false); material->EnableLighting(false);
SetMaterial(material); SetMaterial(std::move(material));
} }
inline void NzSprite::SetMaterial(NzMaterialRef material, bool resizeSprite) inline void NzSprite::SetMaterial(NzMaterialRef material, bool resizeSprite)