Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update GLIR camera

Browse Source
This commit is contained in:
Max Argus
2018-07-12 19:34:08 +02:00
parent a6a8b091ca
commit 21462d1c02
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/SharedMemory/plugins/eglPlugin/bullet.py
View File

@@ -25,10 +25,10 @@ p.loadSDF(path)
start = time.time() start = time.time()
plot = False plot = True
try: try:
for i in range(10): for i in range(10):
hight, width, img_arr, deept_arr, obj_arr = p.getCameraImage(80,80) hight, width, img_arr, deept_arr, obj_arr = p.getCameraImage(128,128)
if plot: if plot:
plt.imshow(img_arr[:,:,:3]) plt.imshow(img_arr[:,:,:3])
plt.show() plt.show()

5
examples/SharedMemory/plugins/eglPlugin/eglRendererVisualShapeConverter.cpp
View File

@@ -166,6 +166,7 @@ struct TinyRendererVisualShapeConverterInternalData
m_instancingRenderer->resize(m_swWidth,m_swHeight); m_instancingRenderer->resize(m_swWidth,m_swHeight);
m_instancingRenderer->InitShaders(); m_instancingRenderer->InitShaders();
m_instancingRenderer->setActiveCamera(&m_camera); m_instancingRenderer->setActiveCamera(&m_camera);
m_instancingRenderer->updateCamera();
m_instancingRenderer->setLightPosition(m_lightDirection); m_instancingRenderer->setLightPosition(m_lightDirection);
} }
@@ -875,6 +876,8 @@ void TinyRendererVisualShapeConverter::setUpAxis(int axis)
m_data->m_upAxis = axis; m_data->m_upAxis = axis;
m_data->m_camera.setCameraUpAxis(axis); m_data->m_camera.setCameraUpAxis(axis);
m_data->m_camera.update(); m_data->m_camera.update();
m_data->m_instancingRenderer->updateCamera();
} }
void TinyRendererVisualShapeConverter::resetCamera(float camDist, float yaw, float pitch, float camPosX,float camPosY, float camPosZ) void TinyRendererVisualShapeConverter::resetCamera(float camDist, float yaw, float pitch, float camPosX,float camPosY, float camPosZ)
{ {
@@ -884,7 +887,7 @@ void TinyRendererVisualShapeConverter::resetCamera(float camDist, float yaw, flo
m_data->m_camera.setCameraTargetPosition(camPosX,camPosY,camPosZ); m_data->m_camera.setCameraTargetPosition(camPosX,camPosY,camPosZ);
m_data->m_camera.setAspectRatio((float)m_data->m_swWidth/(float)m_data->m_swHeight); m_data->m_camera.setAspectRatio((float)m_data->m_swWidth/(float)m_data->m_swHeight);
m_data->m_camera.update(); m_data->m_camera.update();
m_data->m_instancingRenderer->updateCamera();
} }
void TinyRendererVisualShapeConverter::clearBuffers(TGAColor& clearColor) void TinyRendererVisualShapeConverter::clearBuffers(TGAColor& clearColor)