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

Merge branch 'NDK-Refactor' into NDK

Browse Source 
Conflicts:
	examples/HardwareInfo/main.cpp
	include/Nazara/Renderer/Enums.hpp
	include/Nazara/Renderer/GpuQuery.hpp
	include/Nazara/Renderer/OpenGL.hpp
	include/Nazara/Renderer/RenderBuffer.hpp
	include/Nazara/Renderer/RenderTexture.hpp
	include/Nazara/Renderer/Texture.hpp
	src/Nazara/Graphics/AbstractRenderTechnique.cpp
	src/Nazara/Graphics/DeferredRenderTechnique.cpp
	src/Nazara/Graphics/Material.cpp
	src/Nazara/Graphics/SkyboxBackground.cpp
	src/Nazara/Renderer/GpuQuery.cpp
	src/Nazara/Renderer/OpenGL.cpp
	src/Nazara/Renderer/RenderBuffer.cpp
	src/Nazara/Renderer/RenderTexture.cpp
	src/Nazara/Renderer/Renderer.cpp
	src/Nazara/Renderer/Shader.cpp
	src/Nazara/Renderer/ShaderStage.cpp
	src/Nazara/Renderer/Texture.cpp

Former-commit-id: 2f1c7e9f9766f59ab83d9405856a1898ac4ab48f
This commit is contained in:
Lynix
2015-09-25 23:16:58 +02:00
parent c183102784 df8da275c4
commit eaf1bb3601
613 changed files with 68051 additions and 66125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
include/Nazara/Graphics/Light.inl
View File

@@ -5,103 +5,106 @@
#include <memory>
#include <Nazara/Renderer/Debug.hpp>
inline float NzLight::GetAmbientFactor() const
namespace Nz
{
return m_ambientFactor;
}
inline float Light::GetAmbientFactor() const
{
return m_ambientFactor;
}
inline float NzLight::GetAttenuation() const
{
return m_attenuation;
}
inline float Light::GetAttenuation() const
{
return m_attenuation;
}
inline NzColor NzLight::GetColor() const
{
return m_color;
}
inline Color Light::GetColor() const
{
return m_color;
}
inline float NzLight::GetDiffuseFactor() const
{
return m_diffuseFactor;
}
inline float Light::GetDiffuseFactor() const
{
return m_diffuseFactor;
}
inline float NzLight::GetInnerAngle() const
{
return m_innerAngle;
}
inline float Light::GetInnerAngle() const
{
return m_innerAngle;
}
inline nzLightType NzLight::GetLightType() const
{
return m_type;
}
inline LightType Light::GetLightType() const
{
return m_type;
}
inline float NzLight::GetOuterAngle() const
{
return m_outerAngle;
}
inline float Light::GetOuterAngle() const
{
return m_outerAngle;
}
inline float NzLight::GetOuterAngleCosine() const
{
return m_outerAngleCosine;
}
inline float Light::GetOuterAngleCosine() const
{
return m_outerAngleCosine;
}
inline float NzLight::GetOuterAngleTangent() const
{
return m_outerAngleTangent;
}
inline float Light::GetOuterAngleTangent() const
{
return m_outerAngleTangent;
}
inline float NzLight::GetRadius() const
{
return m_radius;
}
inline float Light::GetRadius() const
{
return m_radius;
}
inline void NzLight::SetAmbientFactor(float factor)
{
m_ambientFactor = factor;
}
inline void Light::SetAmbientFactor(float factor)
{
m_ambientFactor = factor;
}
inline void NzLight::SetAttenuation(float attenuation)
{
m_attenuation = attenuation;
}
inline void Light::SetAttenuation(float attenuation)
{
m_attenuation = attenuation;
}
inline void NzLight::SetColor(const NzColor& color)
{
m_color = color;
}
inline void Light::SetColor(const Color& color)
{
m_color = color;
}
inline void NzLight::SetDiffuseFactor(float factor)
{
m_diffuseFactor = factor;
}
inline void Light::SetDiffuseFactor(float factor)
{
m_diffuseFactor = factor;
}
inline void NzLight::SetInnerAngle(float innerAngle)
{
m_innerAngle = innerAngle;
m_innerAngleCosine = std::cos(NzDegreeToRadian(m_innerAngle));
}
inline void Light::SetInnerAngle(float innerAngle)
{
m_innerAngle = innerAngle;
m_innerAngleCosine = std::cos(DegreeToRadian(m_innerAngle));
}
inline void NzLight::SetLightType(nzLightType type)
{
m_type = type;
}
inline void Light::SetLightType(LightType type)
{
m_type = type;
}
inline void NzLight::SetOuterAngle(float outerAngle)
{
m_outerAngle = outerAngle;
m_outerAngleCosine = std::cos(NzDegreeToRadian(m_outerAngle));
m_outerAngleTangent = std::tan(NzDegreeToRadian(m_outerAngle));
inline void Light::SetOuterAngle(float outerAngle)
{
m_outerAngle = outerAngle;
m_outerAngleCosine = std::cos(DegreeToRadian(m_outerAngle));
m_outerAngleTangent = std::tan(DegreeToRadian(m_outerAngle));
InvalidateBoundingVolume();
}
InvalidateBoundingVolume();
}
inline void NzLight::SetRadius(float radius)
{
m_radius = radius;
inline void Light::SetRadius(float radius)
{
m_radius = radius;
m_invRadius = 1.f / m_radius;
m_invRadius = 1.f / m_radius;
InvalidateBoundingVolume();
InvalidateBoundingVolume();
}
}
#include <Nazara/Renderer/DebugOff.hpp>