规范模型输入以及测试shader
This commit is contained in:
@@ -28,7 +28,7 @@ TestVertexShader::~TestVertexShader()
|
||||
|
||||
const char* TestVertexShader::getName(void) const
|
||||
{
|
||||
return "test_vertex_shader";
|
||||
return "test";
|
||||
}
|
||||
|
||||
size_t TestVertexShader::getOutputVertexByteSize(void) const
|
||||
@@ -57,21 +57,18 @@ void TestVertexShader::prepare(const davinci::UniformBuffer* uniformBuffer, SetI
|
||||
|
||||
void TestVertexShader::process(size_t index, void* outputVertex, davinci::fVector3& vertexWorldPos)
|
||||
{
|
||||
static const float DEFAULT_POSITION[] = {0.f, 0.f, 0.f};
|
||||
static const float DEFAULT_NORMAL[] = { 0.f, 0.f, 0.f };
|
||||
static const float DEFAULT_TEXCOORD0[] = { 0.f, 0.f};
|
||||
static const uint16_t DEFAULT_COLOR0[] = { 0, 0, 0 };
|
||||
static const float32_t DEFAULT_POSITION[] = {0.f, 0.f, 0.f};
|
||||
static const float32_t DEFAULT_NORMAL[] = { 0.f, 0.f, 0.f };
|
||||
static const float32_t DEFAULT_TEXCOORD0[] = { 0.f, 0.f};
|
||||
static const float32_t DEFAULT_COLOR0[] = { 0.f, 0.f, 0.f };
|
||||
|
||||
davinci::fVector3 a_position(m_POSITION ? (const float*)(m_POSITION->getElement(index)) : DEFAULT_POSITION);
|
||||
davinci::fVector3 a_normal(m_NORMAL ? (const float*)(m_NORMAL->getElement(index)) : DEFAULT_NORMAL);
|
||||
const float32_t* a_texcoord_0(m_TEXCOORD_0 ? (const float*)(m_TEXCOORD_0->getElement(index)) : DEFAULT_TEXCOORD0);
|
||||
const uint16_t* color0 = m_COLOR_0 ? (const uint16_t*)(m_COLOR_0->getElement(index)) : DEFAULT_COLOR0;
|
||||
davinci::fVector3 a_position(m_POSITION ? (const float32_t*)(m_POSITION->getElement(index)) : DEFAULT_POSITION);
|
||||
|
||||
davinci::fVector3 a_color_0(
|
||||
color0[0] / float(std::numeric_limits<uint16_t>::max()),
|
||||
color0[1] / float(std::numeric_limits<uint16_t>::max()),
|
||||
color0[2] / float(std::numeric_limits<uint16_t>::max())
|
||||
);
|
||||
davinci::fVector3 a_normal(m_NORMAL ? (const float32_t*)(m_NORMAL->getElement(index)) : DEFAULT_NORMAL);
|
||||
|
||||
davinci::fVector2 a_uv(m_TEXCOORD_0 ? (const float32_t*)(m_TEXCOORD_0->getElement(index)) : DEFAULT_TEXCOORD0);
|
||||
|
||||
davinci::fVector3 a_color_0(m_COLOR_0 ? (const float32_t*)(m_COLOR_0->getElement(index)) : DEFAULT_COLOR0);
|
||||
|
||||
davinci::fMatrix4 mat_world = davinci::fMatrix4::IDENTITY;
|
||||
if (davinci::fMatrix4* p_mat_world = (davinci::fMatrix4*)(m_uniformBuffer->getAttribute("self:world_transform")))
|
||||
@@ -100,19 +97,21 @@ void TestVertexShader::process(size_t index, void* outputVertex, davinci::fVecto
|
||||
davinci::fVector3 temp1 = mat_world * a_position;
|
||||
davinci::fVector3 v_position = mat_camera_view_proj * temp1;
|
||||
|
||||
davinci::fVector3 v_normal = a_normal;
|
||||
davinci::fMatrix4 matNormal = davinci::fMatrix4::IDENTITY;
|
||||
if (davinci::fMatrix4* p_mat_normal = (davinci::fMatrix4*)(m_uniformBuffer->getAttribute("self:world_transform_inverse_trans")))
|
||||
{
|
||||
matNormal = *p_mat_normal;
|
||||
}
|
||||
davinci::fVector3 v_normal = (matNormal * davinci::fVector4(a_normal, 0)).xyz().normalise();
|
||||
|
||||
davinci::fVector3 v_color_0 = a_color_0;
|
||||
|
||||
float32_t v_uv[2];
|
||||
memcpy(v_uv, a_texcoord_0, sizeof(float32_t) * 2);
|
||||
|
||||
davinci::fVector3 v_to_camera = (camera_position - v_position).normalise();
|
||||
davinci::fVector3 v_to_light = (light0_position - v_position).normalise();
|
||||
davinci::fVector3 v_to_camera = (camera_position - temp1).normalise();
|
||||
davinci::fVector3 v_to_light = (light0_position - temp1).normalise();
|
||||
|
||||
memcpy((char*)outputVertex + m_outputVertexDesc.getElement(0)->offset, &v_position, sizeof(davinci::fVector3));
|
||||
memcpy((char*)outputVertex + m_outputVertexDesc.getElement(1)->offset, &v_normal, sizeof(davinci::fVector3));
|
||||
memcpy((char*)outputVertex + m_outputVertexDesc.getElement(2)->offset, v_uv, sizeof(float32_t) * 2);
|
||||
memcpy((char*)outputVertex + m_outputVertexDesc.getElement(2)->offset, &a_uv, sizeof(float32_t) * 2);
|
||||
memcpy((char*)outputVertex + m_outputVertexDesc.getElement(3)->offset, &v_to_camera, sizeof(davinci::fVector3));
|
||||
memcpy((char*)outputVertex + m_outputVertexDesc.getElement(4)->offset, &v_to_light, sizeof(davinci::fVector3));
|
||||
memcpy((char*)outputVertex + m_outputVertexDesc.getElement(5)->offset, &v_color_0, sizeof(davinci::fVector3));
|
||||
@@ -120,3 +119,64 @@ void TestVertexShader::process(size_t index, void* outputVertex, davinci::fVecto
|
||||
vertexWorldPos = mat_world * a_position;
|
||||
}
|
||||
|
||||
|
||||
StandardVertexShader::StandardVertexShader()
|
||||
{
|
||||
m_uniformBuffer = nullptr;
|
||||
//output point v_position = point(0, 0, 0) [[ string attribute="POSITION"]],
|
||||
m_outputVertexDesc.addElement("v_position", davinci::VET_POSITION, davinci::CT_Float32, davinci::DT_Vec3);
|
||||
}
|
||||
|
||||
StandardVertexShader::~StandardVertexShader()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
const char* StandardVertexShader::getName(void) const
|
||||
{
|
||||
return "standard";
|
||||
}
|
||||
|
||||
size_t StandardVertexShader::getOutputVertexByteSize(void) const
|
||||
{
|
||||
return m_outputVertexDesc.vertexByteSize();
|
||||
}
|
||||
|
||||
const davinci::VertexDesc& StandardVertexShader::getOutputVertexDesc() const
|
||||
{
|
||||
return m_outputVertexDesc;
|
||||
}
|
||||
|
||||
void StandardVertexShader::prepare(const davinci::UniformBuffer* uniformBuffer, SetInputAttributeFunc setInputAttributeFunc)
|
||||
{
|
||||
m_uniformBuffer = uniformBuffer;
|
||||
|
||||
//point a_position = vector(0, 0, 0) [[ string attribute="POSITION"]],
|
||||
m_POSITION = setInputAttributeFunc(davinci::VET_POSITION);
|
||||
}
|
||||
|
||||
void StandardVertexShader::process(size_t index, void* outputVertex, davinci::fVector3& vertexWorldPos)
|
||||
{
|
||||
static const float DEFAULT_POSITION[] = {0.f, 0.f, 0.f};
|
||||
|
||||
davinci::fVector3 a_position(m_POSITION ? (const float32_t*)(m_POSITION->getElement(index)) : DEFAULT_POSITION);
|
||||
|
||||
davinci::fMatrix4 mat_world = davinci::fMatrix4::IDENTITY;
|
||||
if (davinci::fMatrix4* p_mat_world = (davinci::fMatrix4*)(m_uniformBuffer->getAttribute("self:world_transform")))
|
||||
{
|
||||
mat_world = *p_mat_world;
|
||||
}
|
||||
|
||||
davinci::fMatrix4 mat_camera_view_proj = davinci::fMatrix4::IDENTITY;
|
||||
if (davinci::fMatrix4* p_mat_camera_view_proj = (davinci::fMatrix4*)(m_uniformBuffer->getAttribute("camera:view_proj_mat")))
|
||||
{
|
||||
mat_camera_view_proj = *p_mat_camera_view_proj;
|
||||
}
|
||||
|
||||
davinci::fVector3 temp1 = mat_world * a_position;
|
||||
davinci::fVector3 v_position = mat_camera_view_proj * temp1;
|
||||
|
||||
memcpy((char*)outputVertex + m_outputVertexDesc.getElement(0)->offset, &v_position, sizeof(davinci::fVector3));
|
||||
|
||||
vertexWorldPos = mat_world * a_position;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user