minor rendering refactor
parent
73f432c266
commit
9ec3d00f5b
|
@ -689,7 +689,6 @@ template <typename Serializer>
|
||||||
static void module_serialize (
|
static void module_serialize (
|
||||||
struct module_state *state,
|
struct module_state *state,
|
||||||
Serializer* serializer) {
|
Serializer* serializer) {
|
||||||
// SerializeVec3(*serializer, "protot.TestModule.entity.mPosition", state->character->mPosition);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void module_finalize(struct module_state *state) {
|
static void module_finalize(struct module_state *state) {
|
||||||
|
|
|
@ -979,15 +979,7 @@ void Path::UpdateBuffers() {
|
||||||
assert (bgfx::isValid(mIndexBufferHandle));
|
assert (bgfx::isValid(mIndexBufferHandle));
|
||||||
}
|
}
|
||||||
|
|
||||||
void Renderer::setupShaders() {
|
void Renderer::setupTextures() {
|
||||||
// Create uniforms
|
|
||||||
sceneDefaultTextureSampler = bgfx::createUniform("sceneDefaultTexture", bgfx::UniformType::Int1);
|
|
||||||
u_mtx = bgfx::createUniform("u_mtx", bgfx::UniformType::Mat4);
|
|
||||||
u_flags = bgfx::createUniform("u_flags", bgfx::UniformType::Vec4);
|
|
||||||
u_camPos = bgfx::createUniform("u_camPos", bgfx::UniformType::Vec4);
|
|
||||||
s_texCube = bgfx::createUniform("s_texCube", bgfx::UniformType::Int1);
|
|
||||||
s_texCubeIrr = bgfx::createUniform("s_texCubeIrr", bgfx::UniformType::Int1);
|
|
||||||
|
|
||||||
int grid_size = 1024;
|
int grid_size = 1024;
|
||||||
int grid_border = 12;
|
int grid_border = 12;
|
||||||
uint8_t grid_color_border [4] = {32, 32, 32, 255};
|
uint8_t grid_color_border [4] = {32, 32, 32, 255};
|
||||||
|
@ -1018,6 +1010,16 @@ void Renderer::setupShaders() {
|
||||||
sceneDefaultTexture = bgfx::createTexture2D(grid_size, grid_size, false, 1, bgfx::TextureFormat::RGBA8, BGFX_TEXTURE_NONE, bgfx::copy (texture_data, grid_size * grid_size * 4));
|
sceneDefaultTexture = bgfx::createTexture2D(grid_size, grid_size, false, 1, bgfx::TextureFormat::RGBA8, BGFX_TEXTURE_NONE, bgfx::copy (texture_data, grid_size * grid_size * 4));
|
||||||
|
|
||||||
delete[] texture_data;
|
delete[] texture_data;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Renderer::setupShaders() {
|
||||||
|
// Create uniforms
|
||||||
|
sceneDefaultTextureSampler = bgfx::createUniform("sceneDefaultTexture", bgfx::UniformType::Int1);
|
||||||
|
u_mtx = bgfx::createUniform("u_mtx", bgfx::UniformType::Mat4);
|
||||||
|
u_flags = bgfx::createUniform("u_flags", bgfx::UniformType::Vec4);
|
||||||
|
u_camPos = bgfx::createUniform("u_camPos", bgfx::UniformType::Vec4);
|
||||||
|
s_texCube = bgfx::createUniform("s_texCube", bgfx::UniformType::Int1);
|
||||||
|
s_texCubeIrr = bgfx::createUniform("s_texCubeIrr", bgfx::UniformType::Int1);
|
||||||
|
|
||||||
// sceneDefaultTexture = bgfxutils::loadTexture("fieldstone-rgba.dds");
|
// sceneDefaultTexture = bgfxutils::loadTexture("fieldstone-rgba.dds");
|
||||||
|
|
||||||
|
@ -1217,6 +1219,8 @@ void Renderer::initialize(int width, int height) {
|
||||||
|
|
||||||
createGeometries();
|
createGeometries();
|
||||||
|
|
||||||
|
setupTextures();
|
||||||
|
|
||||||
setupShaders();
|
setupShaders();
|
||||||
|
|
||||||
setupRenderPasses();
|
setupRenderPasses();
|
||||||
|
@ -1365,6 +1369,7 @@ void Renderer::paintGL() {
|
||||||
0.5f, 0.5f, 0.5f, 1.0f,
|
0.5f, 0.5f, 0.5f, 1.0f,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// compute mtxShadow = View * Proj * Crop
|
||||||
float mtxTmp[16];
|
float mtxTmp[16];
|
||||||
bx::mtxMul(mtxTmp, lights[i].mtxProj, mtxCrop);
|
bx::mtxMul(mtxTmp, lights[i].mtxProj, mtxCrop);
|
||||||
bx::mtxMul(lights[i].mtxShadow, lights[i].mtxView, mtxTmp);
|
bx::mtxMul(lights[i].mtxShadow, lights[i].mtxView, mtxTmp);
|
||||||
|
@ -1509,11 +1514,8 @@ void Renderer::paintGL() {
|
||||||
if (entities[i]->mDrawEntity == false)
|
if (entities[i]->mDrawEntity == false)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
float mtxLightViewProjInv[16];
|
|
||||||
float light_pos_world[3];
|
|
||||||
|
|
||||||
// shadow map pass
|
|
||||||
for (uint32_t j = 0; j < entities[i]->mSkeletonMeshes.Length(); ++j) {
|
for (uint32_t j = 0; j < entities[i]->mSkeletonMeshes.Length(); ++j) {
|
||||||
|
// shadow map pass
|
||||||
bx::mtxMul(
|
bx::mtxMul(
|
||||||
lightMtx,
|
lightMtx,
|
||||||
entities[i]->mSkeletonMeshes.GetBoneMatrix(j).data(),
|
entities[i]->mSkeletonMeshes.GetBoneMatrix(j).data(),
|
||||||
|
@ -1524,15 +1526,9 @@ void Renderer::paintGL() {
|
||||||
&s_renderStates[RenderState::ShadowMap],
|
&s_renderStates[RenderState::ShadowMap],
|
||||||
entities[i]->mSkeletonMeshes.GetBoneMatrix(j).data()
|
entities[i]->mSkeletonMeshes.GetBoneMatrix(j).data()
|
||||||
);
|
);
|
||||||
}
|
|
||||||
|
|
||||||
// scene pass
|
// scene pass
|
||||||
for (uint32_t j = 0; j < entities[i]->mSkeletonMeshes.Length(); ++j) {
|
bgfx::setUniform(lights[0].u_lightMtx, lightMtx);
|
||||||
bx::mtxMul(
|
|
||||||
lightMtx,
|
|
||||||
entities[i]->mSkeletonMeshes.GetBoneMatrix(j).data(),
|
|
||||||
lights[0].mtxShadow
|
|
||||||
);
|
|
||||||
|
|
||||||
// compute world position of the light
|
// compute world position of the light
|
||||||
Vector4f light_pos4 (
|
Vector4f light_pos4 (
|
||||||
|
@ -1545,15 +1541,16 @@ void Renderer::paintGL() {
|
||||||
entities[i]->mSkeletonMeshes.GetBoneMatrix(j)
|
entities[i]->mSkeletonMeshes.GetBoneMatrix(j)
|
||||||
* light_pos4;
|
* light_pos4;
|
||||||
|
|
||||||
bgfx::setUniform(lights[0].u_lightPos, light_pos.data());
|
gLog ("light pos: %5.2f, %5.2f, %5.2f",
|
||||||
|
light_pos[0], light_pos[1], light_pos[2]);
|
||||||
|
|
||||||
|
bgfx::setUniform(lights[0].u_lightPos, light_pos4.data());
|
||||||
bgfx::setUniform(u_color, entities[i]->mColor.data());
|
bgfx::setUniform(u_color, entities[i]->mColor.data());
|
||||||
bgfx::setUniform(lights[0].u_lightMtx, lightMtx);
|
|
||||||
entities[i]->mSkeletonMeshes.GetMesh(j)->Submit(
|
entities[i]->mSkeletonMeshes.GetMesh(j)->Submit(
|
||||||
&s_renderStates[RenderState::Scene],
|
&s_renderStates[RenderState::Scene],
|
||||||
entities[i]->mSkeletonMeshes.GetBoneMatrix(j).data()
|
entities[i]->mSkeletonMeshes.GetBoneMatrix(j).data()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// render debug information
|
// render debug information
|
||||||
|
|
|
@ -313,7 +313,7 @@ struct Entity {
|
||||||
Vector4f mColor;
|
Vector4f mColor;
|
||||||
Skeleton mSkeleton;
|
Skeleton mSkeleton;
|
||||||
SkeletonMeshes mSkeletonMeshes;
|
SkeletonMeshes mSkeletonMeshes;
|
||||||
bool mDrawEntity = false;
|
bool mDrawEntity = true;
|
||||||
|
|
||||||
Entity() :
|
Entity() :
|
||||||
mColor (1.f, 1.f, 1.f, 1.f ),
|
mColor (1.f, 1.f, 1.f, 1.f ),
|
||||||
|
@ -407,6 +407,8 @@ struct Renderer {
|
||||||
|
|
||||||
// initialize simple geometries (cube, sphere, ...)
|
// initialize simple geometries (cube, sphere, ...)
|
||||||
void createGeometries();
|
void createGeometries();
|
||||||
|
// create default textures
|
||||||
|
void setupTextures();
|
||||||
// create uniforms, load shaders, and create render targets
|
// create uniforms, load shaders, and create render targets
|
||||||
void setupShaders();
|
void setupShaders();
|
||||||
// setup renderpasses and wire up render targets
|
// setup renderpasses and wire up render targets
|
||||||
|
|
Loading…
Reference in New Issue