Scarfski/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3.git synced 2026-06-08 08:13:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix tiny_renderer standalone example

Browse Source
This commit is contained in:
erwin coumans
2021-09-01 15:00:01 -07:00
parent 7ac95be8cd
commit 7de63bdbc5
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/TinyRenderer/TinyRenderer.cpp
View File

@@ -213,6 +213,7 @@ TinyRenderObjectData::TinyRenderObjectData(TGAImage& rgbColorBuffer, b3AlignedOb
m_lightAmbientCoeff = 0.6;
m_lightDiffuseCoeff = 0.35;
m_lightSpecularCoeff = 0.05;
}
TinyRenderObjectData::TinyRenderObjectData(TGAImage& rgbColorBuffer, b3AlignedObjectArray<float>& depthBuffer, b3AlignedObjectArray<float>* shadowBuffer, b3AlignedObjectArray<int>* segmentationMaskBuffer, int objectIndex, int linkIndex)
@@ -254,6 +255,7 @@ TinyRenderObjectData::TinyRenderObjectData(TGAImage& rgbColorBuffer, b3AlignedOb
Vec3f center(0, 0, 0);
Vec3f up(0, 0, 1);
m_lightDirWorld.setValue(0, 0, 0);
m_lightDistance = 10;
m_lightColor.setValue(1, 1, 1);
m_localScaling.setValue(1, 1, 1);
m_modelMatrix = Matrix::identity();

18
examples/TinyRenderer/main.cpp
View File

@@ -56,7 +56,8 @@ void MyKeyboardCallback(int keycode, int state)
sOldKeyboardCB(keycode, state);
}
#include "TinyRenderer.h"
float color2[4] = { 1,0,0,1 };
#include "our_gl.h"
int main(int argc, char* argv[])
{
@@ -108,10 +109,11 @@ int main(int argc, char* argv[])
b3Vector3 pos = b3MakeVector3(0, 0, 0);
b3Quaternion orn(0, 0, 0, 1);
float color[4] = {1,1,1,1};
b3Vector3 scaling = b3MakeVector3(1, 1, 1);
//app->m_renderer->registerGraphicsInstance(cubeIndex, pos, orn, color, scaling);
//app->m_renderer->writeTransforms();
app->m_renderer->registerGraphicsInstance(cubeIndex, pos, orn, color, scaling);
app->m_renderer->writeTransforms();
do
{
@@ -160,6 +162,15 @@ int main(int argc, char* argv[])
tr.setOrigin(org);
tr.getOpenGLMatrix(modelMat);
TinyRender::Vec3f eye(1,1,3);
TinyRender::Vec3f center(0,0,0);
TinyRender::Vec3f up(0,1,0);
renderData.m_viewMatrix = TinyRender::lookat(eye, center, up);
renderData.m_viewportMatrix = TinyRender::viewport(gWidth/8, gHeight/8, gWidth*3/4, gHeight*3/4);
renderData.m_projectionMatrix = TinyRender::projection(-1.f/(eye-center).norm());
for (int i = 0; i < 4; i++)
{
for (int j = 0; j < 4; j++)
@@ -170,6 +181,7 @@ int main(int argc, char* argv[])
}
//render the object
float color2[4] = { 1,1,1,1 };
renderData.m_model->setColorRGBA(color2);
TinyRenderer::renderObject(renderData);