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

Merge branch 'ubo' into vulkan

Browse Source
This commit is contained in:
Lynix
2018-06-12 19:07:58 +02:00
parent 43bb487801 e4eae425b2
commit d7a2e9aad1
64 changed files with 1041 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Renderer/DebugDrawer.hpp
View File

@@ -36,7 +36,7 @@ namespace Nz
static void DrawCone(const Vector3f& origin, const Quaternionf& rotation, float angle, float length);
static void DrawLine(const Vector3f& p1, const Vector3f& p2);
static void DrawPoints(const Vector3f* ptr, unsigned int pointCount);
static void DrawNormals(const StaticMesh* subMesh);
static void DrawNormals(const StaticMesh* subMesh, float normalLength = 0.01f);
static void DrawTangents(const StaticMesh* subMesh);
static void EnableDepthBuffer(bool depthBuffer);

54
include/Nazara/Renderer/Renderer.hpp
View File

@@ -15,8 +15,23 @@
namespace Nz
{
<<<<<<< HEAD
class AbstractBuffer;
class Buffer;
=======
class Color;
class Context;
class GpuQuery;
class IndexBuffer;
class RenderTarget;
struct RenderStates;
class Shader;
class Texture;
class TextureSampler;
class UniformBuffer;
class VertexBuffer;
class VertexDeclaration;
>>>>>>> ubo
class NAZARA_RENDERER_API Renderer
{
@@ -24,7 +39,46 @@ namespace Nz
Renderer() = delete;
~Renderer() = delete;
<<<<<<< HEAD
static inline RendererImpl* GetRendererImpl();
=======
static void BeginCondition(const GpuQuery& query, GpuQueryCondition condition);
static void BindUniformBuffer(unsigned int bindingPoint, const UniformBuffer* uniformBuffer);
static void Clear(UInt32 flags = RendererBuffer_Color | RendererBuffer_Depth);
static void DrawFullscreenQuad();
static void DrawIndexedPrimitives(PrimitiveMode mode, unsigned int firstIndex, unsigned int indexCount);
static void DrawIndexedPrimitivesInstanced(unsigned int instanceCount, PrimitiveMode mode, unsigned int firstIndex, unsigned int indexCount);
static void DrawPrimitives(PrimitiveMode mode, unsigned int firstVertex, unsigned int vertexCount);
static void DrawPrimitivesInstanced(unsigned int instanceCount, PrimitiveMode mode, unsigned int firstVertex, unsigned int vertexCount);
static void Enable(RendererParameter parameter, bool enable);
static void EndCondition();
static void Flush();
static RendererComparison GetDepthFunc();
static VertexBuffer* GetInstanceBuffer();
static float GetLineWidth();
static Matrix4f GetMatrix(MatrixType type);
static UInt8 GetMaxAnisotropyLevel();
static unsigned int GetMaxColorAttachments();
static unsigned int GetMaxRenderTargets();
static unsigned int GetMaxTextureSize();
static unsigned int GetMaxTextureUnits();
static unsigned int GetMaxVertexAttribs();
static float GetPointSize();
static const RenderStates& GetRenderStates();
static Recti GetScissorRect();
static const Shader* GetShader();
static const RenderTarget* GetTarget();
static Recti GetViewport();
static bool HasCapability(RendererCap capability);
>>>>>>> ubo
static bool Initialize();