mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Terrain/decal materials (includes triplanar/normal/specular/emissive mapping); custom alphamaps

Browse Source 
This was SVN commit r12306.
This commit is contained in:
myconid
2012-08-07 18:21:16 +00:00
parent 780970d16a
commit 88ab3f0f5b
1032 changed files with 1884 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/renderer/PatchRData.h
+13 -7
View File
@@ -23,6 +23,7 @@
#include "maths/Vector3D.h"
#include "graphics/RenderableObject.h"
#include "graphics/ShaderProgram.h"
#include "renderer/ShadowMap.h"
#include "VertexBufferManager.h"
class CPatch;
@@ -45,11 +46,15 @@ public:
void RenderWater(CShaderProgramPtr& shader);
static void RenderBases(const std::vector<CPatchRData*>& patches, const CShaderProgramPtr& shader, bool isDummyShader);
static void RenderBlends(const std::vector<CPatchRData*>& patches, const CShaderProgramPtr& shader, bool isDummyShader);
static void RenderBases(const std::vector<CPatchRData*>& patches, const CShaderDefines& context,
ShadowMap* shadow, bool isDummyShader=false, const CShaderProgramPtr& dummy=CShaderProgramPtr());
static void RenderBlends(const std::vector<CPatchRData*>& patches, const CShaderDefines& context,
ShadowMap* shadow, bool isDummyShader=false, const CShaderProgramPtr& dummy=CShaderProgramPtr());
static void RenderStreams(const std::vector<CPatchRData*>& patches, const CShaderProgramPtr& shader, int streamflags);
CPatch* GetPatch() { return m_Patch; }
static void PrepareShader(const CShaderProgramPtr& shader, ShadowMap* shadow);
const CBoundingBoxAligned& GetWaterBounds() const { return m_WaterBounds; }
@@ -72,8 +77,9 @@ private:
CVector3D m_Position;
// diffuse color from sunlight
SColor4ub m_DiffuseColor;
CVector3D m_Normal;
};
cassert(sizeof(SBaseVertex) == 16);
cassert(sizeof(SBaseVertex) == 28);
struct SSideVertex {
// vertex position
@@ -90,10 +96,9 @@ private:
SColor4ub m_DiffuseColor;
// vertex uvs for alpha texture
float m_AlphaUVs[2];
// add some padding since VBOs prefer power-of-two sizes
u32 m_Padding[2];
CVector3D m_Normal;
};
cassert(sizeof(SBlendVertex) == 32);
cassert(sizeof(SBlendVertex) == 36);
// Mixed Fancy/Simple water vertex description data structure
struct SWaterVertex {
@@ -109,7 +114,8 @@ private:
// build this renderdata object
void Build();
void AddBlend(std::vector<SBlendVertex>& blendVertices, std::vector<u16>& blendIndices, u16 i, u16 j, u8 shape);
void AddBlend(std::vector<SBlendVertex>& blendVertices, std::vector<u16>& blendIndices,
u16 i, u16 j, u8 shape, CTerrainTextureEntry* texture);
void BuildBlends();
void BuildIndices();