2015-05-06 17:35:14 +00:00
|
|
|
#ifndef NO_OPENGL3
|
2015-04-16 16:55:32 +00:00
|
|
|
/*
|
|
|
|
Copyright (c) 2012 Advanced Micro Devices, Inc.
|
|
|
|
|
|
|
|
This software is provided 'as-is', without any express or implied warranty.
|
|
|
|
In no event will the authors be held liable for any damages arising from the use of this software.
|
|
|
|
Permission is granted to anyone to use this software for any purpose,
|
|
|
|
including commercial applications, and to alter it and redistribute it freely,
|
|
|
|
subject to the following restrictions:
|
|
|
|
|
|
|
|
1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
|
|
|
|
2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
|
|
|
|
3. This notice may not be removed or altered from any source distribution.
|
|
|
|
*/
|
|
|
|
//Originally written by Erwin Coumans
|
|
|
|
|
|
|
|
|
|
|
|
///todo: make this configurable in the gui
|
2016-07-18 06:50:11 +00:00
|
|
|
bool useShadowMap = true;// true;//false;//true;
|
2016-11-04 20:15:10 +00:00
|
|
|
int shadowMapWidth= 4096;
|
|
|
|
int shadowMapHeight= 4096;
|
|
|
|
float shadowMapWorldSize=10;
|
2015-04-16 22:16:13 +00:00
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
#define MAX_POINTS_IN_BATCH 1024
|
|
|
|
#define MAX_LINES_IN_BATCH 1024
|
2017-05-24 20:05:16 +00:00
|
|
|
#define MAX_TRIANGLES_IN_BATCH 8192
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
#include "OpenGLInclude.h"
|
2015-04-16 22:16:13 +00:00
|
|
|
#include "../CommonInterfaces/CommonWindowInterface.h"
|
2015-04-16 16:55:32 +00:00
|
|
|
//#include "Bullet3Common/b3MinMax.h"
|
|
|
|
|
|
|
|
#ifndef __APPLE__
|
|
|
|
#ifndef glVertexAttribDivisor
|
2017-02-07 00:22:17 +00:00
|
|
|
#ifndef NO_GLEW
|
2015-04-16 16:55:32 +00:00
|
|
|
#define glVertexAttribDivisor glVertexAttribDivisorARB
|
2017-02-07 00:22:17 +00:00
|
|
|
#endif //NO_GLEW
|
2015-04-16 16:55:32 +00:00
|
|
|
#endif //glVertexAttribDivisor
|
|
|
|
#ifndef GL_COMPARE_REF_TO_TEXTURE
|
|
|
|
#define GL_COMPARE_REF_TO_TEXTURE GL_COMPARE_R_TO_TEXTURE
|
|
|
|
#endif //GL_COMPARE_REF_TO_TEXTURE
|
|
|
|
#ifndef glDrawElementsInstanced
|
2017-02-07 00:22:17 +00:00
|
|
|
#ifndef NO_GLEW
|
2015-04-16 16:55:32 +00:00
|
|
|
#define glDrawElementsInstanced glDrawElementsInstancedARB
|
2017-02-07 00:22:17 +00:00
|
|
|
#endif //NO_GLEW
|
2015-04-16 16:55:32 +00:00
|
|
|
#endif
|
|
|
|
#endif //__APPLE__
|
|
|
|
#include "GLInstancingRenderer.h"
|
|
|
|
|
|
|
|
#include <string.h>
|
|
|
|
//#include "DemoSettings.h"
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
|
|
#include "Bullet3Common/b3Vector3.h"
|
|
|
|
#include "Bullet3Common/b3Quaternion.h"
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
#include "Bullet3Common/b3Transform.h"
|
2015-04-16 16:55:32 +00:00
|
|
|
#include "Bullet3Common/b3Matrix3x3.h"
|
2017-05-04 00:05:05 +00:00
|
|
|
#include "Bullet3Common/b3ResizablePool.h"
|
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
#include "LoadShader.h"
|
|
|
|
|
|
|
|
#include "GLInstanceRendererInternalData.h"
|
|
|
|
|
|
|
|
//GLSL shader strings, embedded using build3/stringify
|
|
|
|
#include "Shaders/pointSpriteVS.h"
|
|
|
|
#include "Shaders/pointSpritePS.h"
|
|
|
|
#include "Shaders/instancingVS.h"
|
|
|
|
#include "Shaders/instancingPS.h"
|
|
|
|
#include "Shaders/createShadowMapInstancingVS.h"
|
|
|
|
#include "Shaders/createShadowMapInstancingPS.h"
|
|
|
|
#include "Shaders/useShadowMapInstancingVS.h"
|
|
|
|
#include "Shaders/useShadowMapInstancingPS.h"
|
|
|
|
#include "Shaders/linesPS.h"
|
|
|
|
#include "Shaders/linesVS.h"
|
|
|
|
|
|
|
|
#include "GLRenderToTexture.h"
|
|
|
|
|
|
|
|
|
2017-05-24 20:05:16 +00:00
|
|
|
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
static const char* triangleVertexShaderText =
|
|
|
|
"#version 330\n"
|
|
|
|
"precision highp float;"
|
|
|
|
"uniform mat4 MVP;\n"
|
|
|
|
"uniform vec3 vCol;\n"
|
2017-05-24 20:05:16 +00:00
|
|
|
"layout (location = 0) in vec3 vPos;\n"
|
|
|
|
"layout (location = 1) in vec2 vUV;\n"
|
|
|
|
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
"out vec3 clr;\n"
|
|
|
|
"out vec2 uv0;\n"
|
|
|
|
"void main()\n"
|
|
|
|
"{\n"
|
2017-05-24 20:05:16 +00:00
|
|
|
" gl_Position = MVP * vec4(vPos,1);\n"
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
" clr = vCol;\n"
|
|
|
|
" uv0 = vUV;\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
|
|
|
|
static const char* triangleFragmentShader =
|
|
|
|
"#version 330\n"
|
|
|
|
"precision highp float;"
|
|
|
|
"in vec3 clr;\n"
|
|
|
|
"in vec2 uv0;"
|
|
|
|
"out vec4 color;"
|
|
|
|
"uniform sampler2D Diffuse;"
|
|
|
|
"void main()\n"
|
|
|
|
"{\n"
|
|
|
|
" vec4 texel = texture(Diffuse,uv0);\n"
|
|
|
|
" color = vec4(clr,texel.r)*texel;\n"
|
|
|
|
"}\n";
|
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
|
|
|
|
//#include "../../opencl/gpu_rigidbody_pipeline/b3GpuNarrowphaseAndSolver.h"//for m_maxNumObjectCapacity
|
|
|
|
|
|
|
|
static InternalDataRenderer* sData2;
|
|
|
|
|
|
|
|
GLint lineWidthRange[2]={1,1};
|
|
|
|
|
|
|
|
struct b3GraphicsInstance
|
|
|
|
{
|
|
|
|
GLuint m_cube_vao;
|
|
|
|
GLuint m_index_vbo;
|
|
|
|
GLuint m_texturehandle;
|
|
|
|
|
|
|
|
int m_numIndices;
|
|
|
|
int m_numVertices;
|
|
|
|
|
|
|
|
int m_numGraphicsInstances;
|
2017-05-04 00:05:05 +00:00
|
|
|
b3AlignedObjectArray<int> m_tempObjectUids;
|
2015-04-16 16:55:32 +00:00
|
|
|
int m_instanceOffset;
|
|
|
|
int m_vertexArrayOffset;
|
|
|
|
int m_primitiveType;
|
2017-06-01 03:32:45 +00:00
|
|
|
float m_materialShinyNess;
|
|
|
|
b3Vector3 m_materialSpecularColor;
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
b3GraphicsInstance()
|
|
|
|
:m_cube_vao(-1),
|
|
|
|
m_index_vbo(-1),
|
|
|
|
m_texturehandle(0),
|
|
|
|
m_numIndices(-1),
|
|
|
|
m_numVertices(-1),
|
|
|
|
m_numGraphicsInstances(0),
|
|
|
|
m_instanceOffset(0),
|
|
|
|
m_vertexArrayOffset(0),
|
2017-06-01 03:32:45 +00:00
|
|
|
m_primitiveType(B3_GL_TRIANGLES),
|
|
|
|
m_materialShinyNess(81),
|
|
|
|
m_materialSpecularColor(b3MakeVector3(1,1,1))
|
2015-04-16 16:55:32 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bool m_ortho = false;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//static GLfloat depthLightModelviewMatrix[16];
|
|
|
|
|
|
|
|
static void checkError(const char *functionName)
|
|
|
|
{
|
|
|
|
GLenum error;
|
|
|
|
while (( error = glGetError() ) != GL_NO_ERROR)
|
|
|
|
{
|
|
|
|
fprintf (stderr, "GL error 0x%X detected in %s\n", error, functionName);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
extern int gShapeIndex;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2016-04-20 19:55:21 +00:00
|
|
|
struct InternalTextureHandle
|
|
|
|
{
|
|
|
|
GLuint m_glTexture;
|
|
|
|
int m_width;
|
|
|
|
int m_height;
|
|
|
|
};
|
2015-04-16 16:55:32 +00:00
|
|
|
|
2017-05-04 00:05:05 +00:00
|
|
|
struct b3PublicGraphicsInstanceData
|
|
|
|
{
|
|
|
|
int m_shapeIndex;
|
|
|
|
int m_internalInstanceIndex;
|
|
|
|
GLfloat m_position[4];
|
|
|
|
GLfloat m_orientation[4];
|
|
|
|
GLfloat m_color[4];
|
|
|
|
GLfloat m_scale[4];
|
|
|
|
|
2017-05-04 04:53:29 +00:00
|
|
|
void clear()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2017-05-04 00:05:05 +00:00
|
|
|
};
|
2015-04-16 16:55:32 +00:00
|
|
|
|
2017-05-04 00:05:05 +00:00
|
|
|
typedef b3PoolBodyHandle<b3PublicGraphicsInstanceData> b3PublicGraphicsInstance;
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
struct InternalDataRenderer : public GLInstanceRendererInternalData
|
|
|
|
{
|
|
|
|
|
2016-07-13 01:16:13 +00:00
|
|
|
SimpleCamera m_defaultCamera1;
|
|
|
|
CommonCameraInterface* m_activeCamera;
|
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
GLfloat m_projectionMatrix[16];
|
|
|
|
GLfloat m_viewMatrix[16];
|
2017-06-01 03:32:45 +00:00
|
|
|
GLfloat m_viewMatrixInverse[16];
|
2015-04-16 16:55:32 +00:00
|
|
|
|
2017-04-23 14:35:13 +00:00
|
|
|
b3Vector3 m_lightPos;
|
2017-06-01 03:32:45 +00:00
|
|
|
b3Vector3 m_lightSpecularIntensity;
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
GLuint m_defaultTexturehandle;
|
2016-04-20 19:55:21 +00:00
|
|
|
b3AlignedObjectArray<InternalTextureHandle> m_textureHandles;
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
GLRenderToTexture* m_shadowMap;
|
|
|
|
GLuint m_shadowTexture;
|
2015-04-16 22:16:13 +00:00
|
|
|
|
2016-06-30 23:03:38 +00:00
|
|
|
GLuint m_renderFrameBuffer;
|
|
|
|
|
2017-05-04 00:05:05 +00:00
|
|
|
|
|
|
|
|
|
|
|
b3ResizablePool< b3PublicGraphicsInstance> m_publicGraphicsInstances;
|
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
InternalDataRenderer() :
|
2017-01-16 06:26:11 +00:00
|
|
|
m_activeCamera(&m_defaultCamera1),
|
2015-04-16 16:55:32 +00:00
|
|
|
m_shadowMap(0),
|
2016-06-30 23:03:38 +00:00
|
|
|
m_shadowTexture(0),
|
2017-01-16 06:26:11 +00:00
|
|
|
m_renderFrameBuffer(0)
|
2015-04-16 16:55:32 +00:00
|
|
|
{
|
2017-05-30 04:55:58 +00:00
|
|
|
m_lightPos=b3MakeVector3(-50,30,40);
|
2017-06-01 03:32:45 +00:00
|
|
|
m_lightSpecularIntensity.setValue(1,1,1);
|
2017-04-23 14:35:13 +00:00
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
//clear to zero to make it obvious if the matrix is used uninitialized
|
|
|
|
for (int i=0;i<16;i++)
|
|
|
|
{
|
|
|
|
m_projectionMatrix[i]=0;
|
|
|
|
m_viewMatrix[i]=0;
|
2017-06-01 03:32:45 +00:00
|
|
|
m_viewMatrixInverse[i]=0;
|
2015-04-16 16:55:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2015-04-16 22:16:13 +00:00
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
struct GLInstanceRendererInternalData* GLInstancingRenderer::getInternalData()
|
|
|
|
{
|
|
|
|
return m_data;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2017-05-24 20:05:16 +00:00
|
|
|
static GLuint triangleShaderProgram;
|
|
|
|
static GLint triangle_mvp_location=-1;
|
|
|
|
static GLint triangle_vpos_location=-1;
|
|
|
|
static GLint triangle_vUV_location=-1;
|
|
|
|
static GLint triangle_vcol_location=-1;
|
|
|
|
static GLuint triangleVertexBufferObject=0;
|
|
|
|
static GLuint triangleVertexArrayObject=0;
|
|
|
|
static GLuint triangleIndexVbo=0;
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
|
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
static GLuint linesShader; // The line renderer
|
|
|
|
static GLuint useShadowMapInstancingShader; // The shadow instancing renderer
|
|
|
|
static GLuint createShadowMapInstancingShader; // The shadow instancing renderer
|
|
|
|
static GLuint instancingShader; // The instancing renderer
|
|
|
|
static GLuint instancingShaderPointSprite; // The point sprite instancing renderer
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//static bool done = false;
|
|
|
|
|
|
|
|
static GLint lines_ModelViewMatrix=0;
|
|
|
|
static GLint lines_ProjectionMatrix=0;
|
|
|
|
static GLint lines_position=0;
|
|
|
|
static GLint lines_colour=0;
|
|
|
|
GLuint lineVertexBufferObject=0;
|
|
|
|
GLuint lineVertexArrayObject=0;
|
|
|
|
GLuint lineIndexVbo = 0;
|
|
|
|
|
|
|
|
GLuint linesVertexBufferObject=0;
|
|
|
|
GLuint linesVertexArrayObject=0;
|
|
|
|
GLuint linesIndexVbo = 0;
|
|
|
|
|
|
|
|
|
2017-06-01 03:32:45 +00:00
|
|
|
static GLint useShadow_ViewMatrixInverse=0;
|
2015-04-16 16:55:32 +00:00
|
|
|
static GLint useShadow_ModelViewMatrix=0;
|
2017-06-01 03:32:45 +00:00
|
|
|
static GLint useShadow_lightSpecularIntensity = 0;
|
|
|
|
static GLint useShadow_materialSpecularColor = 0;
|
2015-04-16 16:55:32 +00:00
|
|
|
static GLint useShadow_MVP=0;
|
2017-06-01 03:32:45 +00:00
|
|
|
static GLint useShadow_lightPosIn=0;
|
|
|
|
static GLint useShadow_cameraPositionIn = 0;
|
|
|
|
static GLint useShadow_materialShininessIn = 0;
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
static GLint useShadow_ProjectionMatrix=0;
|
|
|
|
static GLint useShadow_DepthBiasModelViewMatrix=0;
|
|
|
|
static GLint useShadow_uniform_texture_diffuse = 0;
|
|
|
|
static GLint useShadow_shadowMap = 0;
|
|
|
|
|
|
|
|
static GLint createShadow_depthMVP=0;
|
|
|
|
|
|
|
|
static GLint ModelViewMatrix=0;
|
|
|
|
static GLint ProjectionMatrix=0;
|
2015-08-06 02:03:27 +00:00
|
|
|
static GLint regularLightDirIn=0;
|
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
|
2017-06-01 03:32:45 +00:00
|
|
|
static GLint uniform_texture_diffuse = 0;
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
static GLint screenWidthPointSprite=0;
|
|
|
|
static GLint ModelViewMatrixPointSprite=0;
|
|
|
|
static GLint ProjectionMatrixPointSprite=0;
|
|
|
|
//static GLint uniform_texture_diffusePointSprite= 0;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
GLInstancingRenderer::GLInstancingRenderer(int maxNumObjectCapacity, int maxShapeCapacityInBytes)
|
2015-05-01 18:42:14 +00:00
|
|
|
:
|
2015-04-16 16:55:32 +00:00
|
|
|
m_textureenabled(true),
|
|
|
|
m_textureinitialized(false),
|
|
|
|
m_screenWidth(0),
|
|
|
|
m_screenHeight(0),
|
|
|
|
m_upAxis(1),
|
|
|
|
m_enableBlend(false)
|
|
|
|
{
|
|
|
|
|
|
|
|
m_data = new InternalDataRenderer;
|
2015-05-01 18:42:14 +00:00
|
|
|
m_data->m_maxNumObjectCapacity = maxNumObjectCapacity;
|
|
|
|
m_data->m_maxShapeCapacityInBytes=maxShapeCapacityInBytes;
|
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
m_data->m_totalNumInstances = 0;
|
|
|
|
|
|
|
|
sData2 = m_data;
|
|
|
|
|
2015-05-01 18:42:14 +00:00
|
|
|
m_data->m_instance_positions_ptr.resize(m_data->m_maxNumObjectCapacity*4);
|
|
|
|
m_data->m_instance_quaternion_ptr.resize(m_data->m_maxNumObjectCapacity*4);
|
|
|
|
m_data->m_instance_colors_ptr.resize(m_data->m_maxNumObjectCapacity*4);
|
|
|
|
m_data->m_instance_scale_ptr.resize(m_data->m_maxNumObjectCapacity*3);
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
void GLInstancingRenderer::removeAllInstances()
|
|
|
|
{
|
2016-07-09 22:09:09 +00:00
|
|
|
m_data->m_totalNumInstances = 0;
|
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
for (int i=0;i<m_graphicsInstances.size();i++)
|
|
|
|
{
|
|
|
|
if (m_graphicsInstances[i]->m_index_vbo)
|
|
|
|
{
|
|
|
|
glDeleteBuffers(1,&m_graphicsInstances[i]->m_index_vbo);
|
|
|
|
}
|
|
|
|
if (m_graphicsInstances[i]->m_cube_vao)
|
|
|
|
{
|
|
|
|
glDeleteVertexArrays(1,&m_graphicsInstances[i]->m_cube_vao);
|
|
|
|
}
|
|
|
|
delete m_graphicsInstances[i];
|
|
|
|
}
|
|
|
|
m_graphicsInstances.clear();
|
2017-05-04 00:05:05 +00:00
|
|
|
m_data->m_publicGraphicsInstances.exitHandles();
|
|
|
|
m_data->m_publicGraphicsInstances.initHandles();
|
2015-04-16 16:55:32 +00:00
|
|
|
}
|
|
|
|
|
2016-07-09 22:09:09 +00:00
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
GLInstancingRenderer::~GLInstancingRenderer()
|
|
|
|
{
|
|
|
|
delete m_data->m_shadowMap;
|
|
|
|
glDeleteTextures(1,&m_data->m_shadowTexture);
|
|
|
|
glDeleteTextures(1,&m_data->m_defaultTexturehandle);
|
|
|
|
|
|
|
|
removeAllInstances();
|
|
|
|
|
|
|
|
sData2=0;
|
|
|
|
|
|
|
|
if (m_data)
|
|
|
|
{
|
|
|
|
if (m_data->m_vbo)
|
|
|
|
glDeleteBuffers(1,&m_data->m_vbo);
|
|
|
|
}
|
|
|
|
delete m_data;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
bool GLInstancingRenderer::readSingleInstanceTransformToCPU(float* position, float* orientation, int shapeIndex)
|
|
|
|
{
|
|
|
|
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(shapeIndex);
|
|
|
|
if (pg)
|
|
|
|
{
|
|
|
|
int srcIndex = pg->m_internalInstanceIndex;
|
2015-04-16 16:55:32 +00:00
|
|
|
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
if ((srcIndex<m_data->m_totalNumInstances) && (srcIndex>=0))
|
|
|
|
{
|
|
|
|
position[0] = m_data->m_instance_positions_ptr[srcIndex*4+0];
|
|
|
|
position[1] = m_data->m_instance_positions_ptr[srcIndex*4+1];
|
|
|
|
position[2] = m_data->m_instance_positions_ptr[srcIndex*4+2];
|
|
|
|
|
|
|
|
orientation[0] = m_data->m_instance_quaternion_ptr[srcIndex*4+0];
|
|
|
|
orientation[1] = m_data->m_instance_quaternion_ptr[srcIndex*4+1];
|
|
|
|
orientation[2] = m_data->m_instance_quaternion_ptr[srcIndex*4+2];
|
|
|
|
orientation[3] = m_data->m_instance_quaternion_ptr[srcIndex*4+3];
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
2015-04-16 16:55:32 +00:00
|
|
|
|
2017-05-04 00:05:05 +00:00
|
|
|
void GLInstancingRenderer::writeSingleInstanceTransformToCPU(const float* position, const float* orientation, int bodyUniqueId)
|
2015-04-16 16:55:32 +00:00
|
|
|
{
|
2017-05-04 00:05:05 +00:00
|
|
|
|
|
|
|
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(bodyUniqueId);
|
|
|
|
b3Assert(pg);
|
2017-05-30 04:55:58 +00:00
|
|
|
|
|
|
|
if (pg==0)
|
|
|
|
return;
|
|
|
|
|
2017-05-04 00:05:05 +00:00
|
|
|
int srcIndex = pg->m_internalInstanceIndex;
|
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
b3Assert(srcIndex<m_data->m_totalNumInstances);
|
|
|
|
b3Assert(srcIndex>=0);
|
|
|
|
m_data->m_instance_positions_ptr[srcIndex*4+0]=position[0];
|
|
|
|
m_data->m_instance_positions_ptr[srcIndex*4+1]=position[1];
|
|
|
|
m_data->m_instance_positions_ptr[srcIndex*4+2]=position[2];
|
|
|
|
m_data->m_instance_positions_ptr[srcIndex*4+3]=1;
|
|
|
|
|
|
|
|
m_data->m_instance_quaternion_ptr[srcIndex*4+0]=orientation[0];
|
|
|
|
m_data->m_instance_quaternion_ptr[srcIndex*4+1]=orientation[1];
|
|
|
|
m_data->m_instance_quaternion_ptr[srcIndex*4+2]=orientation[2];
|
|
|
|
m_data->m_instance_quaternion_ptr[srcIndex*4+3]=orientation[3];
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2016-07-09 22:09:09 +00:00
|
|
|
|
2017-05-04 00:05:05 +00:00
|
|
|
void GLInstancingRenderer::readSingleInstanceTransformFromCPU(int bodyUniqueId, float* position, float* orientation)
|
2016-09-08 22:15:58 +00:00
|
|
|
{
|
2017-05-04 00:05:05 +00:00
|
|
|
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(bodyUniqueId);
|
|
|
|
b3Assert(pg);
|
|
|
|
int srcIndex = pg->m_internalInstanceIndex;
|
|
|
|
|
|
|
|
|
2016-09-08 22:15:58 +00:00
|
|
|
b3Assert(srcIndex<m_data->m_totalNumInstances);
|
|
|
|
b3Assert(srcIndex>=0);
|
|
|
|
position[0] = m_data->m_instance_positions_ptr[srcIndex*4+0];
|
|
|
|
position[1] = m_data->m_instance_positions_ptr[srcIndex*4+1];
|
|
|
|
position[2] = m_data->m_instance_positions_ptr[srcIndex*4+2];
|
|
|
|
|
|
|
|
orientation[0] = m_data->m_instance_quaternion_ptr[srcIndex*4+0];
|
|
|
|
orientation[1] = m_data->m_instance_quaternion_ptr[srcIndex*4+1];
|
|
|
|
orientation[2] = m_data->m_instance_quaternion_ptr[srcIndex*4+2];
|
|
|
|
orientation[3] = m_data->m_instance_quaternion_ptr[srcIndex*4+3];
|
|
|
|
}
|
2017-05-13 16:18:36 +00:00
|
|
|
void GLInstancingRenderer::writeSingleInstanceColorToCPU(const double* color, int bodyUniqueId)
|
2015-04-16 16:55:32 +00:00
|
|
|
{
|
2017-05-04 00:05:05 +00:00
|
|
|
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(bodyUniqueId);
|
|
|
|
b3Assert(pg);
|
|
|
|
int srcIndex = pg->m_internalInstanceIndex;
|
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
m_data->m_instance_colors_ptr[srcIndex*4+0]=float(color[0]);
|
|
|
|
m_data->m_instance_colors_ptr[srcIndex*4+1]=float(color[1]);
|
|
|
|
m_data->m_instance_colors_ptr[srcIndex*4+2]=float(color[2]);
|
|
|
|
m_data->m_instance_colors_ptr[srcIndex*4+3]=float(color[3]);
|
|
|
|
}
|
|
|
|
|
2017-05-13 16:18:36 +00:00
|
|
|
void GLInstancingRenderer::writeSingleInstanceColorToCPU(const float* color, int bodyUniqueId)
|
2015-04-16 16:55:32 +00:00
|
|
|
{
|
2017-05-04 00:05:05 +00:00
|
|
|
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(bodyUniqueId);
|
|
|
|
b3Assert(pg);
|
|
|
|
int srcIndex = pg->m_internalInstanceIndex;
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
m_data->m_instance_colors_ptr[srcIndex*4+0]=color[0];
|
|
|
|
m_data->m_instance_colors_ptr[srcIndex*4+1]=color[1];
|
|
|
|
m_data->m_instance_colors_ptr[srcIndex*4+2]=color[2];
|
|
|
|
m_data->m_instance_colors_ptr[srcIndex*4+3]=color[3];
|
|
|
|
}
|
|
|
|
|
2017-05-13 16:18:36 +00:00
|
|
|
void GLInstancingRenderer::writeSingleInstanceScaleToCPU(const float* scale, int bodyUniqueId)
|
2016-07-09 22:09:09 +00:00
|
|
|
{
|
2017-05-04 00:05:05 +00:00
|
|
|
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(bodyUniqueId);
|
|
|
|
b3Assert(pg);
|
|
|
|
int srcIndex = pg->m_internalInstanceIndex;
|
|
|
|
|
2016-07-09 22:09:09 +00:00
|
|
|
m_data->m_instance_scale_ptr[srcIndex*3+0]=scale[0];
|
|
|
|
m_data->m_instance_scale_ptr[srcIndex*3+1]=scale[1];
|
|
|
|
m_data->m_instance_scale_ptr[srcIndex*3+2]=scale[2];
|
|
|
|
}
|
2015-04-16 16:55:32 +00:00
|
|
|
|
2017-05-13 16:18:36 +00:00
|
|
|
void GLInstancingRenderer::writeSingleInstanceScaleToCPU(const double* scale, int bodyUniqueId)
|
2016-07-09 22:09:09 +00:00
|
|
|
{
|
2017-05-04 00:05:05 +00:00
|
|
|
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(bodyUniqueId);
|
|
|
|
b3Assert(pg);
|
|
|
|
int srcIndex = pg->m_internalInstanceIndex;
|
|
|
|
|
2016-07-09 22:09:09 +00:00
|
|
|
m_data->m_instance_scale_ptr[srcIndex*3+0]=scale[0];
|
|
|
|
m_data->m_instance_scale_ptr[srcIndex*3+1]=scale[1];
|
|
|
|
m_data->m_instance_scale_ptr[srcIndex*3+2]=scale[2];
|
|
|
|
}
|
2015-04-16 16:55:32 +00:00
|
|
|
|
2017-05-04 00:05:05 +00:00
|
|
|
void GLInstancingRenderer::writeSingleInstanceTransformToGPU(float* position, float* orientation, int objectUniqueId)
|
2015-04-16 16:55:32 +00:00
|
|
|
{
|
|
|
|
glBindBuffer(GL_ARRAY_BUFFER, m_data->m_vbo);
|
2016-07-18 06:50:11 +00:00
|
|
|
//glFlush();
|
2015-04-16 16:55:32 +00:00
|
|
|
|
2017-05-04 00:05:05 +00:00
|
|
|
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(objectUniqueId);
|
|
|
|
b3Assert(pg);
|
|
|
|
int objectIndex = pg->m_internalInstanceIndex;
|
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
char* orgBase = (char*)glMapBuffer( GL_ARRAY_BUFFER,GL_READ_WRITE);
|
|
|
|
//b3GraphicsInstance* gfxObj = m_graphicsInstances[k];
|
|
|
|
int totalNumInstances= 0;
|
|
|
|
for (int k=0;k<m_graphicsInstances.size();k++)
|
|
|
|
{
|
|
|
|
b3GraphicsInstance* gfxObj = m_graphicsInstances[k];
|
|
|
|
totalNumInstances+=gfxObj->m_numGraphicsInstances;
|
|
|
|
}
|
|
|
|
|
|
|
|
int POSITION_BUFFER_SIZE = (totalNumInstances*sizeof(float)*4);
|
|
|
|
|
|
|
|
char* base = orgBase;
|
|
|
|
|
2015-05-01 18:42:14 +00:00
|
|
|
float* positions = (float*)(base+m_data->m_maxShapeCapacityInBytes);
|
|
|
|
float* orientations = (float*)(base+m_data->m_maxShapeCapacityInBytes + POSITION_BUFFER_SIZE);
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
|
|
|
|
positions[objectIndex*4] = position[0];
|
|
|
|
positions[objectIndex*4+1] = position[1];
|
|
|
|
positions[objectIndex*4+2] = position[2];
|
|
|
|
positions[objectIndex*4+3] = position[3];
|
|
|
|
|
|
|
|
orientations [objectIndex*4] = orientation[0];
|
|
|
|
orientations [objectIndex*4+1] = orientation[1];
|
|
|
|
orientations [objectIndex*4+2] = orientation[2];
|
|
|
|
orientations [objectIndex*4+3] = orientation[3];
|
|
|
|
|
|
|
|
glUnmapBuffer( GL_ARRAY_BUFFER);
|
2016-07-18 06:50:11 +00:00
|
|
|
//glFlush();
|
2015-04-16 16:55:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void GLInstancingRenderer::writeTransforms()
|
|
|
|
{
|
|
|
|
|
2016-10-14 22:06:09 +00:00
|
|
|
{
|
|
|
|
B3_PROFILE("b3Assert(glGetError() 1");
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
}
|
|
|
|
{
|
|
|
|
B3_PROFILE("glBindBuffer");
|
|
|
|
glBindBuffer(GL_ARRAY_BUFFER, m_data->m_vbo);
|
|
|
|
}
|
2015-04-16 16:55:32 +00:00
|
|
|
|
2016-10-14 22:06:09 +00:00
|
|
|
{
|
|
|
|
B3_PROFILE("glFlush()");
|
|
|
|
//without the flush, the glBufferSubData can spike to really slow (seconds slow)
|
|
|
|
glFlush();
|
|
|
|
}
|
2015-04-16 16:55:32 +00:00
|
|
|
|
2016-10-14 22:06:09 +00:00
|
|
|
{
|
|
|
|
B3_PROFILE("b3Assert(glGetError() 2");
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
}
|
2016-07-09 22:09:09 +00:00
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
|
2016-07-09 22:09:09 +00:00
|
|
|
#ifdef B3_DEBUG
|
2016-07-08 02:24:44 +00:00
|
|
|
{
|
2016-10-14 22:06:09 +00:00
|
|
|
|
|
|
|
//B3_PROFILE("m_data->m_totalNumInstances == totalNumInstances");
|
|
|
|
|
2016-07-09 22:09:09 +00:00
|
|
|
int totalNumInstances= 0;
|
|
|
|
for (int k=0;k<m_graphicsInstances.size();k++)
|
|
|
|
{
|
|
|
|
b3GraphicsInstance* gfxObj = m_graphicsInstances[k];
|
|
|
|
totalNumInstances+=gfxObj->m_numGraphicsInstances;
|
|
|
|
}
|
|
|
|
b3Assert(m_data->m_totalNumInstances == totalNumInstances);
|
2016-07-08 02:24:44 +00:00
|
|
|
}
|
2016-07-09 22:09:09 +00:00
|
|
|
#endif//B3_DEBUG
|
2016-07-08 02:24:44 +00:00
|
|
|
|
2016-07-09 22:09:09 +00:00
|
|
|
int POSITION_BUFFER_SIZE = (m_data->m_totalNumInstances*sizeof(float)*4);
|
|
|
|
int ORIENTATION_BUFFER_SIZE = (m_data->m_totalNumInstances*sizeof(float)*4);
|
|
|
|
int COLOR_BUFFER_SIZE = (m_data->m_totalNumInstances*sizeof(float)*4);
|
2016-07-08 02:24:44 +00:00
|
|
|
// int SCALE_BUFFER_SIZE = (totalNumInstances*sizeof(float)*3);
|
|
|
|
|
|
|
|
#if 1
|
2016-10-14 22:06:09 +00:00
|
|
|
{
|
|
|
|
// printf("m_data->m_totalNumInstances = %d\n", m_data->m_totalNumInstances);
|
|
|
|
{
|
|
|
|
B3_PROFILE("glBufferSubData pos");
|
2016-07-09 22:09:09 +00:00
|
|
|
glBufferSubData( GL_ARRAY_BUFFER,m_data->m_maxShapeCapacityInBytes,m_data->m_totalNumInstances*sizeof(float)*4,
|
2016-07-08 02:24:44 +00:00
|
|
|
&m_data->m_instance_positions_ptr[0]);
|
2016-10-14 22:06:09 +00:00
|
|
|
}
|
|
|
|
{
|
|
|
|
B3_PROFILE("glBufferSubData orn");
|
2016-07-09 22:09:09 +00:00
|
|
|
glBufferSubData( GL_ARRAY_BUFFER,m_data->m_maxShapeCapacityInBytes+POSITION_BUFFER_SIZE,m_data->m_totalNumInstances*sizeof(float)*4,
|
2016-07-08 02:24:44 +00:00
|
|
|
&m_data->m_instance_quaternion_ptr[0]);
|
2016-10-14 22:06:09 +00:00
|
|
|
}
|
|
|
|
{
|
|
|
|
B3_PROFILE("glBufferSubData color");
|
2016-07-09 22:09:09 +00:00
|
|
|
glBufferSubData( GL_ARRAY_BUFFER,m_data->m_maxShapeCapacityInBytes+ POSITION_BUFFER_SIZE+ORIENTATION_BUFFER_SIZE, m_data->m_totalNumInstances*sizeof(float)*4,
|
2016-07-08 02:24:44 +00:00
|
|
|
&m_data->m_instance_colors_ptr[0]);
|
2016-10-14 22:06:09 +00:00
|
|
|
}
|
|
|
|
{
|
|
|
|
B3_PROFILE("glBufferSubData scale");
|
2016-07-09 22:09:09 +00:00
|
|
|
glBufferSubData( GL_ARRAY_BUFFER, m_data->m_maxShapeCapacityInBytes+POSITION_BUFFER_SIZE+ORIENTATION_BUFFER_SIZE+COLOR_BUFFER_SIZE,m_data->m_totalNumInstances*sizeof(float)*3,
|
2016-07-08 02:24:44 +00:00
|
|
|
&m_data->m_instance_scale_ptr[0]);
|
2016-10-14 22:06:09 +00:00
|
|
|
}
|
|
|
|
}
|
2016-07-08 02:24:44 +00:00
|
|
|
#else
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
char* orgBase = (char*)glMapBuffer( GL_ARRAY_BUFFER,GL_READ_WRITE);
|
|
|
|
if (orgBase)
|
|
|
|
{
|
|
|
|
|
|
|
|
|
2016-07-08 02:24:44 +00:00
|
|
|
|
2016-07-09 22:09:09 +00:00
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
for (int k=0;k<m_graphicsInstances.size();k++)
|
|
|
|
{
|
|
|
|
//int k=0;
|
|
|
|
b3GraphicsInstance* gfxObj = m_graphicsInstances[k];
|
|
|
|
|
|
|
|
|
|
|
|
|
2016-07-08 02:24:44 +00:00
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
char* base = orgBase;
|
|
|
|
|
2015-05-01 18:42:14 +00:00
|
|
|
float* positions = (float*)(base+m_data->m_maxShapeCapacityInBytes);
|
|
|
|
float* orientations = (float*)(base+m_data->m_maxShapeCapacityInBytes + POSITION_BUFFER_SIZE);
|
|
|
|
float* colors= (float*)(base+m_data->m_maxShapeCapacityInBytes + POSITION_BUFFER_SIZE+ORIENTATION_BUFFER_SIZE);
|
|
|
|
float* scaling= (float*)(base+m_data->m_maxShapeCapacityInBytes + POSITION_BUFFER_SIZE+ORIENTATION_BUFFER_SIZE+COLOR_BUFFER_SIZE);
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
//static int offset=0;
|
|
|
|
//offset++;
|
|
|
|
|
|
|
|
|
|
|
|
for (int i=0;i<gfxObj->m_numGraphicsInstances;i++)
|
|
|
|
{
|
|
|
|
|
|
|
|
int srcIndex=i+gfxObj->m_instanceOffset;
|
|
|
|
|
|
|
|
positions[srcIndex*4] = m_data->m_instance_positions_ptr[srcIndex*4];
|
|
|
|
positions[srcIndex*4+1] = m_data->m_instance_positions_ptr[srcIndex*4+1];
|
|
|
|
positions[srcIndex*4+2] = m_data->m_instance_positions_ptr[srcIndex*4+2];
|
|
|
|
positions[srcIndex*4+3] = m_data->m_instance_positions_ptr[srcIndex*4+3];
|
|
|
|
|
|
|
|
orientations[srcIndex*4]=m_data->m_instance_quaternion_ptr[srcIndex*4];
|
|
|
|
orientations[srcIndex*4+1]=m_data->m_instance_quaternion_ptr[srcIndex*4+1];
|
|
|
|
orientations[srcIndex*4+2]=m_data->m_instance_quaternion_ptr[srcIndex*4+2];
|
|
|
|
orientations[srcIndex*4+3]=m_data->m_instance_quaternion_ptr[srcIndex*4+3];
|
|
|
|
|
|
|
|
colors[srcIndex*4]=m_data->m_instance_colors_ptr[srcIndex*4];
|
|
|
|
colors[srcIndex*4+1]=m_data->m_instance_colors_ptr[srcIndex*4+1];
|
|
|
|
colors[srcIndex*4+2]=m_data->m_instance_colors_ptr[srcIndex*4+2];
|
|
|
|
colors[srcIndex*4+3]=m_data->m_instance_colors_ptr[srcIndex*4+3];
|
|
|
|
|
|
|
|
scaling[srcIndex*3]=m_data->m_instance_scale_ptr[srcIndex*3];
|
|
|
|
scaling[srcIndex*3+1]=m_data->m_instance_scale_ptr[srcIndex*3+1];
|
|
|
|
scaling[srcIndex*3+2]=m_data->m_instance_scale_ptr[srcIndex*3+2];
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
{
|
|
|
|
b3Error("ERROR glMapBuffer failed\n");
|
|
|
|
}
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
glUnmapBuffer( GL_ARRAY_BUFFER);
|
|
|
|
//if this glFinish is removed, the animation is not always working/blocks
|
|
|
|
//@todo: figure out why
|
2016-07-18 06:50:11 +00:00
|
|
|
//glFlush();
|
2016-07-08 02:24:44 +00:00
|
|
|
|
|
|
|
#endif
|
|
|
|
|
2016-10-14 22:06:09 +00:00
|
|
|
{
|
|
|
|
B3_PROFILE("glBindBuffer 2");
|
|
|
|
glBindBuffer(GL_ARRAY_BUFFER, 0);//m_data->m_vbo);
|
|
|
|
}
|
2015-04-16 16:55:32 +00:00
|
|
|
|
2016-10-14 22:06:09 +00:00
|
|
|
{
|
|
|
|
B3_PROFILE("b3Assert(glGetError() 4");
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
}
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
int GLInstancingRenderer::registerGraphicsInstance(int shapeIndex, const double* pos1, const double* orn1, const double* color1, const double* scaling1)
|
|
|
|
{
|
|
|
|
float pos[4] = {(float)pos1[0],(float)pos1[1],(float)pos1[2],(float)pos1[3]};
|
|
|
|
float orn[4] = {(float)orn1[0],(float)orn1[1],(float)orn1[2],(float)orn1[3]};
|
|
|
|
float color[4] = {(float)color1[0],(float)color1[1],(float)color1[2],(float)color1[3]};
|
|
|
|
float scaling[4] = {(float)scaling1[0],(float)scaling1[1],(float)scaling1[2],(float)scaling1[3]};
|
|
|
|
return registerGraphicsInstance(shapeIndex,pos,orn,color,scaling);
|
|
|
|
}
|
|
|
|
|
2017-05-04 00:05:05 +00:00
|
|
|
void GLInstancingRenderer::rebuildGraphicsInstances()
|
|
|
|
{
|
|
|
|
m_data->m_totalNumInstances = 0;
|
2015-04-16 16:55:32 +00:00
|
|
|
|
2017-05-04 00:05:05 +00:00
|
|
|
b3AlignedObjectArray<int> usedObjects;
|
|
|
|
m_data->m_publicGraphicsInstances.getUsedHandles(usedObjects);
|
|
|
|
|
|
|
|
for (int i=0;i<usedObjects.size();i++)
|
|
|
|
{
|
|
|
|
int bodyUniqueId = usedObjects[i];
|
|
|
|
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(bodyUniqueId);
|
|
|
|
b3Assert(pg);
|
|
|
|
int srcIndex = pg->m_internalInstanceIndex;
|
|
|
|
|
|
|
|
pg->m_position[0] = m_data->m_instance_positions_ptr[srcIndex*4+0];
|
|
|
|
pg->m_position[1] = m_data->m_instance_positions_ptr[srcIndex*4+1];
|
|
|
|
pg->m_position[2] = m_data->m_instance_positions_ptr[srcIndex*4+2];
|
|
|
|
pg->m_orientation[0] = m_data->m_instance_quaternion_ptr[srcIndex*4+0];
|
|
|
|
pg->m_orientation[1] = m_data->m_instance_quaternion_ptr[srcIndex*4+1];
|
|
|
|
pg->m_orientation[2] = m_data->m_instance_quaternion_ptr[srcIndex*4+2];
|
|
|
|
pg->m_orientation[3] = m_data->m_instance_quaternion_ptr[srcIndex*4+3];
|
|
|
|
pg->m_color[0] = m_data->m_instance_colors_ptr[srcIndex*4+0];
|
|
|
|
pg->m_color[1] = m_data->m_instance_colors_ptr[srcIndex*4+1];
|
|
|
|
pg->m_color[2] = m_data->m_instance_colors_ptr[srcIndex*4+2];
|
|
|
|
pg->m_color[3] = m_data->m_instance_colors_ptr[srcIndex*4+3];
|
|
|
|
pg->m_scale[0] = m_data->m_instance_scale_ptr[srcIndex*3+0];
|
|
|
|
pg->m_scale[1] = m_data->m_instance_scale_ptr[srcIndex*3+1];
|
|
|
|
pg->m_scale[2] = m_data->m_instance_scale_ptr[srcIndex*3+2];
|
|
|
|
}
|
|
|
|
for (int i=0;i<m_graphicsInstances.size();i++)
|
|
|
|
{
|
|
|
|
m_graphicsInstances[i]->m_numGraphicsInstances = 0;
|
|
|
|
m_graphicsInstances[i]->m_instanceOffset = 0;
|
|
|
|
m_graphicsInstances[i]->m_tempObjectUids.clear();
|
|
|
|
}
|
|
|
|
for (int i=0;i<usedObjects.size();i++)
|
|
|
|
{
|
|
|
|
int bodyUniqueId = usedObjects[i];
|
|
|
|
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(bodyUniqueId);
|
|
|
|
m_graphicsInstances[pg->m_shapeIndex]->m_tempObjectUids.push_back(bodyUniqueId);
|
|
|
|
}
|
|
|
|
|
|
|
|
int curOffset = 0;
|
|
|
|
m_data->m_totalNumInstances = 0;
|
|
|
|
|
|
|
|
for (int i=0;i<m_graphicsInstances.size();i++)
|
|
|
|
{
|
|
|
|
m_graphicsInstances[i]->m_instanceOffset = curOffset;
|
|
|
|
m_graphicsInstances[i]->m_numGraphicsInstances = 0;
|
|
|
|
|
|
|
|
for (int g=0;g<m_graphicsInstances[i]->m_tempObjectUids.size();g++)
|
|
|
|
{
|
|
|
|
curOffset++;
|
|
|
|
int objectUniqueId = m_graphicsInstances[i]->m_tempObjectUids[g];
|
|
|
|
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(objectUniqueId);
|
|
|
|
|
|
|
|
registerGraphicsInstanceInternal(objectUniqueId,pg->m_position,pg->m_orientation,pg->m_color,pg->m_scale);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
void GLInstancingRenderer::removeGraphicsInstance(int instanceUid)
|
2015-04-16 16:55:32 +00:00
|
|
|
{
|
2017-05-04 00:05:05 +00:00
|
|
|
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(instanceUid);
|
|
|
|
b3Assert(pg);
|
|
|
|
if (pg)
|
|
|
|
{
|
|
|
|
m_data->m_publicGraphicsInstances.freeHandle(instanceUid);
|
|
|
|
rebuildGraphicsInstances();
|
|
|
|
}
|
|
|
|
}
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
|
2017-05-04 00:05:05 +00:00
|
|
|
int GLInstancingRenderer::registerGraphicsInstanceInternal(int newUid, const float* position, const float* quaternion, const float* color, const float* scaling)
|
|
|
|
{
|
|
|
|
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(newUid);
|
|
|
|
int shapeIndex = pg->m_shapeIndex;
|
|
|
|
// b3Assert(pg);
|
|
|
|
// int objectIndex = pg->m_internalInstanceIndex;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
b3GraphicsInstance* gfxObj = m_graphicsInstances[shapeIndex];
|
2015-04-16 16:55:32 +00:00
|
|
|
int index = gfxObj->m_numGraphicsInstances + gfxObj->m_instanceOffset;
|
2017-05-04 00:05:05 +00:00
|
|
|
pg->m_internalInstanceIndex = index;
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
int maxElements = m_data->m_instance_positions_ptr.size();
|
|
|
|
if (index*4<maxElements)
|
|
|
|
{
|
|
|
|
m_data->m_instance_positions_ptr[index*4]=position[0];
|
|
|
|
m_data->m_instance_positions_ptr[index*4+1]=position[1];
|
|
|
|
m_data->m_instance_positions_ptr[index*4+2]=position[2];
|
|
|
|
m_data->m_instance_positions_ptr[index*4+3]=1;
|
|
|
|
|
|
|
|
m_data->m_instance_quaternion_ptr[index*4]=quaternion[0];
|
|
|
|
m_data->m_instance_quaternion_ptr[index*4+1]=quaternion[1];
|
|
|
|
m_data->m_instance_quaternion_ptr[index*4+2]=quaternion[2];
|
|
|
|
m_data->m_instance_quaternion_ptr[index*4+3]=quaternion[3];
|
|
|
|
|
|
|
|
m_data->m_instance_colors_ptr[index*4]=color[0];
|
|
|
|
m_data->m_instance_colors_ptr[index*4+1]=color[1];
|
|
|
|
m_data->m_instance_colors_ptr[index*4+2]=color[2];
|
|
|
|
m_data->m_instance_colors_ptr[index*4+3]=color[3];
|
|
|
|
|
|
|
|
m_data->m_instance_scale_ptr[index*3] = scaling[0];
|
|
|
|
m_data->m_instance_scale_ptr[index*3+1] = scaling[1];
|
|
|
|
m_data->m_instance_scale_ptr[index*3+2] = scaling[2];
|
|
|
|
|
|
|
|
gfxObj->m_numGraphicsInstances++;
|
|
|
|
m_data->m_totalNumInstances++;
|
|
|
|
} else
|
|
|
|
{
|
|
|
|
b3Error("registerGraphicsInstance out of range, %d\n", maxElements);
|
|
|
|
return -1;
|
|
|
|
}
|
2017-05-04 00:05:05 +00:00
|
|
|
return newUid;//gfxObj->m_numGraphicsInstances;
|
|
|
|
}
|
|
|
|
|
|
|
|
int GLInstancingRenderer::registerGraphicsInstance(int shapeIndex, const float* position, const float* quaternion, const float* color, const float* scaling)
|
|
|
|
{
|
|
|
|
int newUid = m_data->m_publicGraphicsInstances.allocHandle();
|
|
|
|
b3PublicGraphicsInstance* pg = m_data->m_publicGraphicsInstances.getHandle(newUid);
|
|
|
|
pg->m_shapeIndex = shapeIndex;
|
|
|
|
|
|
|
|
//b3Assert(shapeIndex == (m_graphicsInstances.size()-1));
|
|
|
|
b3Assert(m_graphicsInstances.size()<m_data->m_maxNumObjectCapacity-1);
|
|
|
|
if (shapeIndex == (m_graphicsInstances.size()-1))
|
|
|
|
{
|
|
|
|
registerGraphicsInstanceInternal(newUid, position,quaternion,color,scaling);
|
|
|
|
} else
|
|
|
|
{
|
|
|
|
|
|
|
|
int srcIndex = m_data->m_totalNumInstances++;
|
|
|
|
pg->m_internalInstanceIndex = srcIndex;
|
|
|
|
|
|
|
|
m_data->m_instance_positions_ptr[srcIndex*4+0] = position[0];
|
|
|
|
m_data->m_instance_positions_ptr[srcIndex*4+1] = position[1];
|
|
|
|
m_data->m_instance_positions_ptr[srcIndex*4+2] = position[2];
|
|
|
|
m_data->m_instance_positions_ptr[srcIndex*4+3] = 1.;
|
|
|
|
|
|
|
|
m_data->m_instance_quaternion_ptr[srcIndex*4+0] = quaternion[0];
|
|
|
|
m_data->m_instance_quaternion_ptr[srcIndex*4+1] = quaternion[1];
|
|
|
|
m_data->m_instance_quaternion_ptr[srcIndex*4+2] = quaternion[2];
|
|
|
|
m_data->m_instance_quaternion_ptr[srcIndex*4+3] = quaternion[3];
|
|
|
|
|
|
|
|
m_data->m_instance_colors_ptr[srcIndex*4+0] = color[0];
|
|
|
|
m_data->m_instance_colors_ptr[srcIndex*4+1] = color[1];
|
|
|
|
m_data->m_instance_colors_ptr[srcIndex*4+2] = color[2];
|
|
|
|
m_data->m_instance_colors_ptr[srcIndex*4+3] = color[3];
|
|
|
|
|
|
|
|
m_data->m_instance_scale_ptr[srcIndex*3+0] = scaling[0];
|
|
|
|
m_data->m_instance_scale_ptr[srcIndex*3+1] = scaling[1];
|
|
|
|
m_data->m_instance_scale_ptr[srcIndex*3+2] = scaling[2];
|
|
|
|
|
|
|
|
|
|
|
|
rebuildGraphicsInstances();
|
|
|
|
}
|
|
|
|
|
|
|
|
return newUid;
|
2015-04-16 16:55:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
int GLInstancingRenderer::registerTexture(const unsigned char* texels, int width, int height, bool flipPixelsY)
|
2015-04-16 16:55:32 +00:00
|
|
|
{
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
2016-04-20 19:55:21 +00:00
|
|
|
glActiveTexture(GL_TEXTURE0);
|
2015-04-16 16:55:32 +00:00
|
|
|
int textureIndex = m_data->m_textureHandles.size();
|
2017-01-16 06:26:11 +00:00
|
|
|
// const GLubyte* image= (const GLubyte*)texels;
|
2015-04-16 16:55:32 +00:00
|
|
|
GLuint textureHandle;
|
|
|
|
glGenTextures(1,(GLuint*)&textureHandle);
|
|
|
|
glBindTexture(GL_TEXTURE_2D,textureHandle);
|
|
|
|
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
2016-04-27 03:52:52 +00:00
|
|
|
InternalTextureHandle h;
|
2016-04-20 19:55:21 +00:00
|
|
|
h.m_glTexture = textureHandle;
|
|
|
|
h.m_width = width;
|
|
|
|
h.m_height = height;
|
2015-04-16 16:55:32 +00:00
|
|
|
|
2016-04-20 19:55:21 +00:00
|
|
|
m_data->m_textureHandles.push_back(h);
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
if (texels)
|
|
|
|
{
|
|
|
|
updateTexture(textureIndex, texels, flipPixelsY);
|
|
|
|
}
|
2015-04-16 16:55:32 +00:00
|
|
|
return textureIndex;
|
|
|
|
}
|
|
|
|
|
2016-04-20 19:55:21 +00:00
|
|
|
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
|
|
|
|
void GLInstancingRenderer::updateTexture(int textureIndex, const unsigned char* texels, bool flipPixelsY)
|
2016-04-20 19:55:21 +00:00
|
|
|
{
|
|
|
|
if (textureIndex>=0)
|
|
|
|
{
|
2016-04-27 03:52:52 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
2016-04-20 19:55:21 +00:00
|
|
|
glActiveTexture(GL_TEXTURE0);
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
InternalTextureHandle& h = m_data->m_textureHandles[textureIndex];
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
glBindTexture(GL_TEXTURE_2D,h.m_glTexture);
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
2016-04-27 03:52:52 +00:00
|
|
|
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
if (flipPixelsY)
|
2016-04-27 03:52:52 +00:00
|
|
|
{
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
//textures need to be flipped for OpenGL...
|
|
|
|
b3AlignedObjectArray<unsigned char> flippedTexels;
|
|
|
|
flippedTexels.resize(h.m_width* h.m_height * 3);
|
|
|
|
|
|
|
|
for (int i = 0; i < h.m_width; i++)
|
2016-04-27 03:52:52 +00:00
|
|
|
{
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
for (int j = 0; j < h.m_height; j++)
|
|
|
|
{
|
|
|
|
flippedTexels[(i + j*h.m_width) * 3] = texels[(i + (h.m_height - 1 -j )*h.m_width) * 3];
|
|
|
|
flippedTexels[(i + j*h.m_width) * 3+1] = texels[(i + (h.m_height - 1 - j)*h.m_width) * 3+1];
|
|
|
|
flippedTexels[(i + j*h.m_width) * 3+2] = texels[(i + (h.m_height - 1 - j)*h.m_width) * 3+2];
|
|
|
|
}
|
2016-04-27 03:52:52 +00:00
|
|
|
}
|
|
|
|
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, h.m_width,h.m_height,0,GL_RGB,GL_UNSIGNED_BYTE,&flippedTexels[0]);
|
|
|
|
} else
|
|
|
|
{
|
|
|
|
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, h.m_width,h.m_height,0,GL_RGB,GL_UNSIGNED_BYTE,&texels[0]);
|
|
|
|
}
|
2016-04-20 19:55:21 +00:00
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
glGenerateMipmap(GL_TEXTURE_2D);
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void GLInstancingRenderer::activateTexture(int textureIndex)
|
|
|
|
{
|
|
|
|
glActiveTexture(GL_TEXTURE0);
|
|
|
|
|
|
|
|
if (textureIndex>=0)
|
|
|
|
{
|
|
|
|
glBindTexture(GL_TEXTURE_2D,m_data->m_textureHandles[textureIndex].m_glTexture);
|
|
|
|
} else
|
|
|
|
{
|
|
|
|
glBindTexture(GL_TEXTURE_2D,0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
void GLInstancingRenderer::updateShape(int shapeIndex, const float* vertices)
|
|
|
|
{
|
|
|
|
b3GraphicsInstance* gfxObj = m_graphicsInstances[shapeIndex];
|
|
|
|
int numvertices = gfxObj->m_numVertices;
|
|
|
|
|
|
|
|
glBindBuffer(GL_ARRAY_BUFFER, m_data->m_vbo);
|
|
|
|
char* dest= (char*)glMapBuffer( GL_ARRAY_BUFFER,GL_WRITE_ONLY);//GL_WRITE_ONLY
|
|
|
|
int vertexStrideInBytes = 9*sizeof(float);
|
|
|
|
int sz = numvertices*vertexStrideInBytes;
|
|
|
|
memcpy(dest+vertexStrideInBytes*gfxObj->m_vertexArrayOffset,vertices,sz);
|
|
|
|
glUnmapBuffer( GL_ARRAY_BUFFER);
|
|
|
|
}
|
|
|
|
|
|
|
|
int GLInstancingRenderer::registerShape(const float* vertices, int numvertices, const int* indices, int numIndices,int primitiveType, int textureId)
|
|
|
|
{
|
|
|
|
b3GraphicsInstance* gfxObj = new b3GraphicsInstance;
|
|
|
|
|
|
|
|
if (textureId>=0)
|
|
|
|
{
|
2016-04-20 19:55:21 +00:00
|
|
|
gfxObj->m_texturehandle = m_data->m_textureHandles[textureId].m_glTexture;
|
2015-04-16 16:55:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
gfxObj->m_primitiveType = primitiveType;
|
|
|
|
|
|
|
|
if (m_graphicsInstances.size())
|
|
|
|
{
|
|
|
|
b3GraphicsInstance* prevObj = m_graphicsInstances[m_graphicsInstances.size()-1];
|
|
|
|
gfxObj->m_instanceOffset = prevObj->m_instanceOffset + prevObj->m_numGraphicsInstances;
|
|
|
|
gfxObj->m_vertexArrayOffset = prevObj->m_vertexArrayOffset + prevObj->m_numVertices;
|
|
|
|
} else
|
|
|
|
{
|
|
|
|
gfxObj->m_instanceOffset = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
m_graphicsInstances.push_back(gfxObj);
|
|
|
|
gfxObj->m_numIndices = numIndices;
|
|
|
|
gfxObj->m_numVertices = numvertices;
|
|
|
|
|
|
|
|
|
2017-05-15 16:02:49 +00:00
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
int vertexStrideInBytes = 9*sizeof(float);
|
|
|
|
int sz = numvertices*vertexStrideInBytes;
|
2017-05-15 16:02:49 +00:00
|
|
|
int totalUsed = vertexStrideInBytes*gfxObj->m_vertexArrayOffset+sz;
|
|
|
|
b3Assert(totalUsed<m_data->m_maxShapeCapacityInBytes);
|
|
|
|
if (totalUsed>=m_data->m_maxShapeCapacityInBytes)
|
|
|
|
{
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
glBindBuffer(GL_ARRAY_BUFFER, m_data->m_vbo);
|
|
|
|
|
2016-10-14 22:06:09 +00:00
|
|
|
#if 0
|
|
|
|
|
|
|
|
char* dest= (char*)glMapBuffer( GL_ARRAY_BUFFER,GL_WRITE_ONLY);//GL_WRITE_ONLY
|
|
|
|
|
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
#ifdef B3_DEBUG
|
2017-05-15 16:02:49 +00:00
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
#endif//B3_DEBUG
|
|
|
|
|
|
|
|
memcpy(dest+vertexStrideInBytes*gfxObj->m_vertexArrayOffset,vertices,sz);
|
|
|
|
glUnmapBuffer( GL_ARRAY_BUFFER);
|
2016-10-14 22:06:09 +00:00
|
|
|
#else
|
|
|
|
glBufferSubData( GL_ARRAY_BUFFER,vertexStrideInBytes*gfxObj->m_vertexArrayOffset,sz,
|
|
|
|
vertices);
|
|
|
|
#endif
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
glGenBuffers(1, &gfxObj->m_index_vbo);
|
|
|
|
|
|
|
|
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, gfxObj->m_index_vbo);
|
|
|
|
int indexBufferSizeInBytes = gfxObj->m_numIndices*sizeof(int);
|
|
|
|
|
|
|
|
glBufferData(GL_ELEMENT_ARRAY_BUFFER, indexBufferSizeInBytes, NULL, GL_STATIC_DRAW);
|
|
|
|
glBufferSubData(GL_ELEMENT_ARRAY_BUFFER,0,indexBufferSizeInBytes,indices);
|
|
|
|
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
|
|
|
|
|
|
|
|
glGenVertexArrays(1, &gfxObj->m_cube_vao);
|
|
|
|
glBindVertexArray(gfxObj->m_cube_vao);
|
|
|
|
glBindBuffer(GL_ARRAY_BUFFER, m_data->m_vbo);
|
|
|
|
glBindVertexArray(0);
|
|
|
|
glBindBuffer(GL_ARRAY_BUFFER,0);
|
|
|
|
glBindVertexArray(0);
|
|
|
|
|
|
|
|
|
|
|
|
return m_graphicsInstances.size()-1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void GLInstancingRenderer::InitShaders()
|
|
|
|
{
|
|
|
|
|
2015-05-01 18:42:14 +00:00
|
|
|
int POSITION_BUFFER_SIZE = (m_data->m_maxNumObjectCapacity*sizeof(float)*4);
|
|
|
|
int ORIENTATION_BUFFER_SIZE = (m_data->m_maxNumObjectCapacity*sizeof(float)*4);
|
|
|
|
int COLOR_BUFFER_SIZE = (m_data->m_maxNumObjectCapacity*sizeof(float)*4);
|
|
|
|
int SCALE_BUFFER_SIZE = (m_data->m_maxNumObjectCapacity*sizeof(float)*3);
|
2015-04-16 16:55:32 +00:00
|
|
|
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
{
|
|
|
|
triangleShaderProgram = gltLoadShaderPair(triangleVertexShaderText,triangleFragmentShader);
|
2017-05-24 20:05:16 +00:00
|
|
|
|
|
|
|
//triangle_vpos_location = glGetAttribLocation(triangleShaderProgram, "vPos");
|
|
|
|
//triangle_vUV_location = glGetAttribLocation(triangleShaderProgram, "vUV");
|
|
|
|
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
triangle_mvp_location = glGetUniformLocation(triangleShaderProgram, "MVP");
|
|
|
|
triangle_vcol_location = glGetUniformLocation(triangleShaderProgram, "vCol");
|
2017-05-24 20:05:16 +00:00
|
|
|
|
|
|
|
glLinkProgram(triangleShaderProgram);
|
|
|
|
glUseProgram(triangleShaderProgram);
|
|
|
|
|
|
|
|
glGenVertexArrays(1, &triangleVertexArrayObject);
|
|
|
|
glBindVertexArray(triangleVertexArrayObject);
|
|
|
|
|
|
|
|
glGenBuffers(1, &triangleVertexBufferObject);
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
glGenBuffers(1, &triangleIndexVbo);
|
2017-05-24 20:05:16 +00:00
|
|
|
|
|
|
|
int sz = MAX_TRIANGLES_IN_BATCH*sizeof(GfxVertexFormat0);
|
|
|
|
glBindVertexArray(triangleVertexArrayObject);
|
|
|
|
glBindBuffer(GL_ARRAY_BUFFER, triangleVertexBufferObject);
|
|
|
|
glBufferData(GL_ARRAY_BUFFER, sz, 0, GL_DYNAMIC_DRAW);
|
|
|
|
|
|
|
|
glBindVertexArray(0);
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
}
|
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
linesShader = gltLoadShaderPair(linesVertexShader,linesFragmentShader);
|
|
|
|
lines_ModelViewMatrix = glGetUniformLocation(linesShader, "ModelViewMatrix");
|
|
|
|
lines_ProjectionMatrix = glGetUniformLocation(linesShader, "ProjectionMatrix");
|
|
|
|
lines_colour=glGetUniformLocation(linesShader, "colour");
|
|
|
|
lines_position=glGetAttribLocation(linesShader, "position");
|
|
|
|
glLinkProgram(linesShader);
|
|
|
|
glUseProgram(linesShader);
|
|
|
|
|
|
|
|
{
|
|
|
|
glGenVertexArrays(1, &linesVertexArrayObject);
|
|
|
|
glBindVertexArray(linesVertexArrayObject);
|
|
|
|
|
|
|
|
glGenBuffers(1, &linesVertexBufferObject);
|
|
|
|
glGenBuffers(1, &linesIndexVbo);
|
|
|
|
|
|
|
|
int sz = MAX_LINES_IN_BATCH*sizeof(b3Vector3);
|
|
|
|
glBindVertexArray(linesVertexArrayObject);
|
|
|
|
glBindBuffer(GL_ARRAY_BUFFER, linesVertexBufferObject);
|
|
|
|
glBufferData(GL_ARRAY_BUFFER, sz, 0, GL_DYNAMIC_DRAW);
|
|
|
|
|
|
|
|
glBindVertexArray(0);
|
|
|
|
}
|
|
|
|
{
|
|
|
|
glGenVertexArrays(1, &lineVertexArrayObject);
|
|
|
|
glBindVertexArray(lineVertexArrayObject);
|
|
|
|
|
|
|
|
glGenBuffers(1, &lineVertexBufferObject);
|
|
|
|
glGenBuffers(1, &lineIndexVbo);
|
|
|
|
|
|
|
|
int sz = MAX_POINTS_IN_BATCH*sizeof(b3Vector3);
|
|
|
|
glBindVertexArray(lineVertexArrayObject);
|
|
|
|
glBindBuffer(GL_ARRAY_BUFFER, lineVertexBufferObject);
|
|
|
|
glBufferData(GL_ARRAY_BUFFER, sz, 0, GL_DYNAMIC_DRAW);
|
|
|
|
|
|
|
|
glBindVertexArray(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
//glGetIntegerv(GL_ALIASED_LINE_WIDTH_RANGE, range);
|
|
|
|
glGetIntegerv(GL_SMOOTH_LINE_WIDTH_RANGE, lineWidthRange);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
useShadowMapInstancingShader = gltLoadShaderPair(useShadowMapInstancingVertexShader,useShadowMapInstancingFragmentShader);
|
|
|
|
|
|
|
|
glLinkProgram(useShadowMapInstancingShader);
|
|
|
|
glUseProgram(useShadowMapInstancingShader);
|
2017-06-01 03:32:45 +00:00
|
|
|
useShadow_ViewMatrixInverse = glGetUniformLocation(useShadowMapInstancingShader, "ViewMatrixInverse");
|
2015-04-16 16:55:32 +00:00
|
|
|
useShadow_ModelViewMatrix = glGetUniformLocation(useShadowMapInstancingShader, "ModelViewMatrix");
|
2017-06-01 03:32:45 +00:00
|
|
|
useShadow_lightSpecularIntensity = glGetUniformLocation(useShadowMapInstancingShader, "lightSpecularIntensityIn");
|
|
|
|
useShadow_materialSpecularColor = glGetUniformLocation(useShadowMapInstancingShader, "materialSpecularColorIn");
|
2015-04-16 16:55:32 +00:00
|
|
|
useShadow_MVP = glGetUniformLocation(useShadowMapInstancingShader, "MVP");
|
|
|
|
useShadow_ProjectionMatrix = glGetUniformLocation(useShadowMapInstancingShader, "ProjectionMatrix");
|
|
|
|
useShadow_DepthBiasModelViewMatrix = glGetUniformLocation(useShadowMapInstancingShader, "DepthBiasModelViewProjectionMatrix");
|
|
|
|
useShadow_uniform_texture_diffuse = glGetUniformLocation(useShadowMapInstancingShader, "Diffuse");
|
|
|
|
useShadow_shadowMap = glGetUniformLocation(useShadowMapInstancingShader,"shadowMap");
|
2017-06-01 03:32:45 +00:00
|
|
|
useShadow_lightPosIn = glGetUniformLocation(useShadowMapInstancingShader,"lightPosIn");
|
|
|
|
useShadow_cameraPositionIn = glGetUniformLocation(useShadowMapInstancingShader,"cameraPositionIn");
|
|
|
|
useShadow_materialShininessIn = glGetUniformLocation(useShadowMapInstancingShader,"materialShininessIn");
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
createShadowMapInstancingShader = gltLoadShaderPair(createShadowMapInstancingVertexShader,createShadowMapInstancingFragmentShader);
|
|
|
|
glLinkProgram(createShadowMapInstancingShader);
|
|
|
|
glUseProgram(createShadowMapInstancingShader);
|
|
|
|
createShadow_depthMVP = glGetUniformLocation(createShadowMapInstancingShader, "depthMVP");
|
|
|
|
|
|
|
|
glUseProgram(0);
|
|
|
|
|
|
|
|
instancingShader = gltLoadShaderPair(instancingVertexShader,instancingFragmentShader);
|
|
|
|
glLinkProgram(instancingShader);
|
|
|
|
glUseProgram(instancingShader);
|
|
|
|
ModelViewMatrix = glGetUniformLocation(instancingShader, "ModelViewMatrix");
|
|
|
|
ProjectionMatrix = glGetUniformLocation(instancingShader, "ProjectionMatrix");
|
|
|
|
uniform_texture_diffuse = glGetUniformLocation(instancingShader, "Diffuse");
|
2015-08-06 02:03:27 +00:00
|
|
|
regularLightDirIn = glGetUniformLocation(instancingShader,"lightDirIn");
|
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
glUseProgram(0);
|
|
|
|
|
|
|
|
instancingShaderPointSprite = gltLoadShaderPair(pointSpriteVertexShader,pointSpriteFragmentShader);
|
|
|
|
glUseProgram(instancingShaderPointSprite);
|
|
|
|
ModelViewMatrixPointSprite = glGetUniformLocation(instancingShaderPointSprite, "ModelViewMatrix");
|
|
|
|
ProjectionMatrixPointSprite = glGetUniformLocation(instancingShaderPointSprite, "ProjectionMatrix");
|
|
|
|
screenWidthPointSprite = glGetUniformLocation(instancingShaderPointSprite, "screenWidth");
|
|
|
|
|
|
|
|
glUseProgram(0);
|
|
|
|
|
|
|
|
//GLuint offset = 0;
|
|
|
|
|
|
|
|
glGenBuffers(1, &m_data->m_vbo);
|
|
|
|
checkError("glGenBuffers");
|
|
|
|
|
|
|
|
glBindBuffer(GL_ARRAY_BUFFER, m_data->m_vbo);
|
|
|
|
|
|
|
|
|
2015-05-01 18:42:14 +00:00
|
|
|
int size = m_data->m_maxShapeCapacityInBytes + POSITION_BUFFER_SIZE+ORIENTATION_BUFFER_SIZE+COLOR_BUFFER_SIZE+SCALE_BUFFER_SIZE;
|
2015-04-16 16:55:32 +00:00
|
|
|
m_data->m_vboSize = size;
|
|
|
|
|
|
|
|
glBufferData(GL_ARRAY_BUFFER, size, 0, GL_DYNAMIC_DRAW);//GL_STATIC_DRAW);
|
|
|
|
|
|
|
|
glBindBuffer(GL_ARRAY_BUFFER,0);
|
|
|
|
glBindVertexArray(0);
|
|
|
|
|
|
|
|
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void GLInstancingRenderer::init()
|
|
|
|
{
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
|
|
|
|
glEnable(GL_DEPTH_TEST);
|
|
|
|
glDepthFunc(GL_LESS);
|
|
|
|
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
// glClearColor(float(0.),float(0.),float(0.4),float(0));
|
|
|
|
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
{
|
|
|
|
B3_PROFILE("texture");
|
|
|
|
if(m_textureenabled)
|
|
|
|
{
|
|
|
|
if(!m_textureinitialized)
|
|
|
|
{
|
|
|
|
glActiveTexture(GL_TEXTURE0);
|
|
|
|
|
|
|
|
GLubyte* image=new GLubyte[256*256*3];
|
|
|
|
for(int y=0;y<256;++y)
|
|
|
|
{
|
|
|
|
// const int t=y>>5;
|
|
|
|
GLubyte* pi=image+y*256*3;
|
|
|
|
for(int x=0;x<256;++x)
|
|
|
|
{
|
|
|
|
if (x<2||y<2||x>253||y>253)
|
|
|
|
{
|
|
|
|
pi[0]=255;//0;
|
|
|
|
pi[1]=255;//0;
|
|
|
|
pi[2]=255;//0;
|
|
|
|
} else
|
|
|
|
{
|
|
|
|
pi[0]=255;
|
|
|
|
pi[1]=255;
|
|
|
|
pi[2]=255;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
const int s=x>>5;
|
|
|
|
const GLubyte b=180;
|
|
|
|
GLubyte c=b+((s+t&1)&1)*(255-b);
|
|
|
|
pi[0]=c;
|
|
|
|
pi[1]=c;
|
|
|
|
pi[2]=c;
|
|
|
|
*/
|
|
|
|
|
|
|
|
pi+=3;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
glGenTextures(1,(GLuint*)&m_data->m_defaultTexturehandle);
|
|
|
|
glBindTexture(GL_TEXTURE_2D,m_data->m_defaultTexturehandle);
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 256,256,0,GL_RGB,GL_UNSIGNED_BYTE,image);
|
|
|
|
glGenerateMipmap(GL_TEXTURE_2D);
|
|
|
|
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
delete[] image;
|
|
|
|
m_textureinitialized=true;
|
|
|
|
}
|
|
|
|
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
glBindTexture(GL_TEXTURE_2D,m_data->m_defaultTexturehandle);
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
|
|
|
|
} else
|
|
|
|
{
|
|
|
|
glDisable(GL_TEXTURE_2D);
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//glEnable(GL_COLOR_MATERIAL);
|
|
|
|
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
// glEnable(GL_CULL_FACE);
|
|
|
|
// glCullFace(GL_BACK);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-04-16 22:16:13 +00:00
|
|
|
void GLInstancingRenderer::resize(int width, int height)
|
2015-04-16 16:55:32 +00:00
|
|
|
{
|
2015-04-16 22:16:13 +00:00
|
|
|
m_screenWidth = width;
|
|
|
|
m_screenHeight = height;
|
2015-04-16 16:55:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-04-16 22:16:13 +00:00
|
|
|
const CommonCameraInterface* GLInstancingRenderer::getActiveCamera() const
|
2015-04-16 16:55:32 +00:00
|
|
|
{
|
2016-07-13 01:16:13 +00:00
|
|
|
return m_data->m_activeCamera;
|
2015-04-16 16:55:32 +00:00
|
|
|
}
|
|
|
|
|
2015-04-16 22:16:13 +00:00
|
|
|
CommonCameraInterface* GLInstancingRenderer::getActiveCamera()
|
2015-04-16 16:55:32 +00:00
|
|
|
{
|
2016-07-13 01:16:13 +00:00
|
|
|
return m_data->m_activeCamera;
|
2015-04-16 16:55:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-04-16 22:16:13 +00:00
|
|
|
void GLInstancingRenderer::setActiveCamera(CommonCameraInterface* cam)
|
2015-04-16 16:55:32 +00:00
|
|
|
{
|
2016-07-13 01:16:13 +00:00
|
|
|
m_data->m_activeCamera = cam;
|
2015-04-16 16:55:32 +00:00
|
|
|
}
|
|
|
|
|
2017-06-01 03:32:45 +00:00
|
|
|
void GLInstancingRenderer::setLightSpecularIntensity(const float lightSpecularIntensity[3])
|
|
|
|
{
|
|
|
|
m_data->m_lightSpecularIntensity[0] = lightSpecularIntensity[0];
|
|
|
|
m_data->m_lightSpecularIntensity[1] = lightSpecularIntensity[1];
|
|
|
|
m_data->m_lightSpecularIntensity[2] = lightSpecularIntensity[2];
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-04-23 14:35:13 +00:00
|
|
|
void GLInstancingRenderer::setLightPosition(const float lightPos[3])
|
|
|
|
{
|
|
|
|
m_data->m_lightPos[0] = lightPos[0];
|
|
|
|
m_data->m_lightPos[1] = lightPos[1];
|
|
|
|
m_data->m_lightPos[2] = lightPos[2];
|
|
|
|
}
|
|
|
|
|
|
|
|
void GLInstancingRenderer::setLightPosition(const double lightPos[3])
|
|
|
|
{
|
|
|
|
m_data->m_lightPos[0] = lightPos[0];
|
|
|
|
m_data->m_lightPos[1] = lightPos[1];
|
|
|
|
m_data->m_lightPos[2] = lightPos[2];
|
|
|
|
}
|
|
|
|
|
2015-04-16 22:16:13 +00:00
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
void GLInstancingRenderer::updateCamera(int upAxis)
|
|
|
|
{
|
|
|
|
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
m_upAxis = upAxis;
|
|
|
|
|
2016-07-13 01:16:13 +00:00
|
|
|
m_data->m_activeCamera->setCameraUpAxis(upAxis);
|
|
|
|
m_data->m_activeCamera->setAspectRatio((float)m_screenWidth/(float)m_screenHeight);
|
|
|
|
m_data->m_defaultCamera1.update();
|
2016-07-14 16:49:49 +00:00
|
|
|
m_data->m_activeCamera->getCameraProjectionMatrix(m_data->m_projectionMatrix);
|
|
|
|
m_data->m_activeCamera->getCameraViewMatrix(m_data->m_viewMatrix);
|
2017-06-01 03:32:45 +00:00
|
|
|
b3Scalar viewMat[16];
|
|
|
|
b3Scalar viewMatInverse[16];
|
|
|
|
|
|
|
|
for (int i=0;i<16;i++)
|
|
|
|
{
|
|
|
|
viewMat[i] = m_data->m_viewMatrix[i];
|
|
|
|
}
|
|
|
|
b3Transform tr;
|
|
|
|
tr.setFromOpenGLMatrix(viewMat);
|
|
|
|
tr = tr.inverse();
|
|
|
|
tr.getOpenGLMatrix(viewMatInverse);
|
|
|
|
for (int i=0;i<16;i++)
|
|
|
|
{
|
|
|
|
m_data->m_viewMatrixInverse[i]=viewMatInverse[i];
|
|
|
|
}
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//#define STB_IMAGE_WRITE_IMPLEMENTATION
|
|
|
|
#include "stb_image_write.h"
|
|
|
|
void writeTextureToPng(int textureWidth, int textureHeight, const char* fileName, int numComponents)
|
|
|
|
{
|
|
|
|
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
glPixelStorei(GL_PACK_ALIGNMENT,4);
|
|
|
|
|
|
|
|
glReadBuffer(GL_NONE);
|
|
|
|
float* orgPixels = (float*)malloc(textureWidth*textureHeight*numComponents*4);
|
|
|
|
char* pixels = (char*)malloc(textureWidth*textureHeight*numComponents*4);
|
|
|
|
glReadPixels(0,0,textureWidth, textureHeight, GL_DEPTH_COMPONENT, GL_FLOAT, orgPixels);
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
for (int j=0;j<textureHeight;j++)
|
|
|
|
{
|
|
|
|
for (int i=0;i<textureWidth;i++)
|
|
|
|
{
|
|
|
|
float val = orgPixels[(j*textureWidth+i)];
|
|
|
|
if (val!=1.f)
|
|
|
|
{
|
|
|
|
//printf("val[%d,%d]=%f\n", i,j,val);
|
|
|
|
}
|
|
|
|
pixels[(j*textureWidth+i)*numComponents]=char(orgPixels[(j*textureWidth+i)]*255.f);
|
|
|
|
pixels[(j*textureWidth+i)*numComponents+1]=0;//255.f;
|
|
|
|
pixels[(j*textureWidth+i)*numComponents+2]=0;//255.f;
|
|
|
|
pixels[(j*textureWidth+i)*numComponents+3]=127;
|
|
|
|
|
|
|
|
|
|
|
|
//pixels[(j*textureWidth+i)*+1]=val;
|
|
|
|
//pixels[(j*textureWidth+i)*numComponents+2]=val;
|
|
|
|
//pixels[(j*textureWidth+i)*numComponents+3]=255;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* pixels[(j*textureWidth+j)*numComponents]=255;
|
|
|
|
pixels[(j*textureWidth+j)*numComponents+1]=0;
|
|
|
|
pixels[(j*textureWidth+j)*numComponents+2]=0;
|
|
|
|
pixels[(j*textureWidth+j)*numComponents+3]=255;
|
|
|
|
*/
|
|
|
|
|
|
|
|
}
|
|
|
|
if (0)
|
|
|
|
{
|
|
|
|
//swap the pixels
|
|
|
|
unsigned char tmp;
|
|
|
|
|
|
|
|
for (int j=0;j<textureHeight/2;j++)
|
|
|
|
{
|
|
|
|
for (int i=0;i<textureWidth;i++)
|
|
|
|
{
|
|
|
|
for (int c=0;c<numComponents;c++)
|
|
|
|
{
|
|
|
|
tmp = pixels[(j*textureWidth+i)*numComponents+c];
|
|
|
|
pixels[(j*textureWidth+i)*numComponents+c]=
|
|
|
|
pixels[((textureHeight-j-1)*textureWidth+i)*numComponents+c];
|
|
|
|
pixels[((textureHeight-j-1)*textureWidth+i)*numComponents+c] = tmp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
stbi_write_png(fileName, textureWidth,textureHeight, numComponents, pixels, textureWidth*numComponents);
|
|
|
|
|
|
|
|
free(pixels);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void GLInstancingRenderer::renderScene()
|
|
|
|
{
|
|
|
|
//avoid some Intel driver on a Macbook Pro to lock-up
|
|
|
|
//todo: figure out what is going on on that machine
|
|
|
|
|
2016-07-18 06:50:11 +00:00
|
|
|
//glFlush();
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
if (useShadowMap)
|
|
|
|
{
|
|
|
|
|
|
|
|
renderSceneInternal(B3_CREATE_SHADOWMAP_RENDERMODE);
|
2016-07-08 02:24:44 +00:00
|
|
|
//glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
|
2015-04-16 16:55:32 +00:00
|
|
|
renderSceneInternal(B3_USE_SHADOWMAP_RENDERMODE);
|
|
|
|
|
|
|
|
} else
|
|
|
|
{
|
|
|
|
renderSceneInternal();
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
struct PointerCaster
|
|
|
|
{
|
|
|
|
union {
|
|
|
|
int m_baseIndex;
|
|
|
|
GLvoid* m_pointer;
|
|
|
|
};
|
|
|
|
|
|
|
|
PointerCaster()
|
|
|
|
:m_pointer(0)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
static void b3CreateFrustum(
|
|
|
|
float left,
|
|
|
|
float right,
|
|
|
|
float bottom,
|
|
|
|
float top,
|
|
|
|
float nearVal,
|
|
|
|
float farVal,
|
|
|
|
float frustum[16])
|
|
|
|
{
|
|
|
|
|
|
|
|
frustum[0*4+0] = (float(2) * nearVal) / (right - left);
|
|
|
|
frustum[0*4+1] = float(0);
|
|
|
|
frustum[0*4+2] = float(0);
|
|
|
|
frustum[0*4+3] = float(0);
|
|
|
|
|
|
|
|
frustum[1*4+0] = float(0);
|
|
|
|
frustum[1*4+1] = (float(2) * nearVal) / (top - bottom);
|
|
|
|
frustum[1*4+2] = float(0);
|
|
|
|
frustum[1*4+3] = float(0);
|
|
|
|
|
|
|
|
frustum[2*4+0] = (right + left) / (right - left);
|
|
|
|
frustum[2*4+1] = (top + bottom) / (top - bottom);
|
|
|
|
frustum[2*4+2] = -(farVal + nearVal) / (farVal - nearVal);
|
|
|
|
frustum[2*4+3] = float(-1);
|
|
|
|
|
|
|
|
frustum[3*4+0] = float(0);
|
|
|
|
frustum[3*4+1] = float(0);
|
|
|
|
frustum[3*4+2] = -(float(2) * farVal * nearVal) / (farVal - nearVal);
|
|
|
|
frustum[3*4+3] = float(0);
|
|
|
|
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static void b3Matrix4x4Mul(GLfloat aIn[4][4], GLfloat bIn[4][4], GLfloat result[4][4])
|
|
|
|
{
|
|
|
|
for (int j=0;j<4;j++)
|
|
|
|
for (int i=0;i<4;i++)
|
|
|
|
result[j][i] = aIn[0][i] * bIn[j][0] + aIn[1][i] * bIn[j][1] + aIn[2][i] * bIn[j][2] + aIn[3][i] * bIn[j][3];
|
|
|
|
}
|
|
|
|
|
|
|
|
static void b3Matrix4x4Mul16(GLfloat aIn[16], GLfloat bIn[16], GLfloat result[16])
|
|
|
|
{
|
|
|
|
for (int j=0;j<4;j++)
|
|
|
|
for (int i=0;i<4;i++)
|
|
|
|
result[j*4+i] = aIn[0*4+i] * bIn[j*4+0] + aIn[1*4+i] * bIn[j*4+1] + aIn[2*4+i] * bIn[j*4+2] + aIn[3*4+i] * bIn[j*4+3];
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void b3CreateDiagonalMatrix(GLfloat value, GLfloat result[4][4])
|
|
|
|
{
|
|
|
|
for (int i=0;i<4;i++)
|
|
|
|
{
|
|
|
|
for (int j=0;j<4;j++)
|
|
|
|
{
|
|
|
|
if (i==j)
|
|
|
|
{
|
|
|
|
result[i][j] = value;
|
|
|
|
} else
|
|
|
|
{
|
|
|
|
result[i][j] = 0.f;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void b3CreateOrtho(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar, GLfloat result[4][4])
|
|
|
|
{
|
|
|
|
b3CreateDiagonalMatrix(1.f,result);
|
|
|
|
|
|
|
|
result[0][0] = 2.f / (right - left);
|
|
|
|
result[1][1] = 2.f / (top - bottom);
|
|
|
|
result[2][2] = - 2.f / (zFar - zNear);
|
|
|
|
result[3][0] = - (right + left) / (right - left);
|
|
|
|
result[3][1] = - (top + bottom) / (top - bottom);
|
|
|
|
result[3][2] = - (zFar + zNear) / (zFar - zNear);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void b3CreateLookAt(const b3Vector3& eye, const b3Vector3& center,const b3Vector3& up, GLfloat result[16])
|
|
|
|
{
|
|
|
|
b3Vector3 f = (center - eye).normalized();
|
|
|
|
b3Vector3 u = up.normalized();
|
|
|
|
b3Vector3 s = (f.cross(u)).normalized();
|
|
|
|
u = s.cross(f);
|
|
|
|
|
|
|
|
result[0*4+0] = s.x;
|
|
|
|
result[1*4+0] = s.y;
|
|
|
|
result[2*4+0] = s.z;
|
|
|
|
|
|
|
|
result[0*4+1] = u.x;
|
|
|
|
result[1*4+1] = u.y;
|
|
|
|
result[2*4+1] = u.z;
|
|
|
|
|
|
|
|
result[0*4+2] =-f.x;
|
|
|
|
result[1*4+2] =-f.y;
|
|
|
|
result[2*4+2] =-f.z;
|
|
|
|
|
|
|
|
result[0*4+3] = 0.f;
|
|
|
|
result[1*4+3] = 0.f;
|
|
|
|
result[2*4+3] = 0.f;
|
|
|
|
|
|
|
|
result[3*4+0] = -s.dot(eye);
|
|
|
|
result[3*4+1] = -u.dot(eye);
|
|
|
|
result[3*4+2] = f.dot(eye);
|
|
|
|
result[3*4+3] = 1.f;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-05-24 20:05:16 +00:00
|
|
|
|
|
|
|
void GLInstancingRenderer::drawTexturedTriangleMesh(float worldPosition[3], float worldOrientation[4], const float* vertices, int numvertices, const unsigned int* indices, int numIndices, float colorRGBA[4], int textureIndex, int vertexLayout)
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
{
|
2017-05-24 20:05:16 +00:00
|
|
|
int sz = sizeof(GfxVertexFormat0);
|
|
|
|
|
|
|
|
glActiveTexture(GL_TEXTURE0);
|
|
|
|
activateTexture(textureIndex);
|
|
|
|
checkError("activateTexture");
|
|
|
|
|
|
|
|
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
|
|
|
|
glUseProgram(triangleShaderProgram);
|
|
|
|
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
b3Quaternion orn(worldOrientation[0],worldOrientation[1],worldOrientation[2],worldOrientation[3]);
|
|
|
|
b3Vector3 pos = b3MakeVector3(worldPosition[0],worldPosition[1],worldPosition[2]);
|
|
|
|
|
2017-05-24 20:05:16 +00:00
|
|
|
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
b3Transform worldTrans(orn,pos);
|
|
|
|
b3Scalar worldMatUnk[16];
|
|
|
|
worldTrans.getOpenGLMatrix(worldMatUnk);
|
|
|
|
float modelMat[16];
|
|
|
|
for (int i=0;i<16;i++)
|
|
|
|
{
|
|
|
|
modelMat[i] = worldMatUnk[i];
|
|
|
|
}
|
2017-05-24 20:05:16 +00:00
|
|
|
float viewProjection[16];
|
|
|
|
b3Matrix4x4Mul16(m_data->m_projectionMatrix,m_data->m_viewMatrix,viewProjection);
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
float MVP[16];
|
2017-05-24 20:05:16 +00:00
|
|
|
b3Matrix4x4Mul16(viewProjection,modelMat,MVP);
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
glUniformMatrix4fv(triangle_mvp_location, 1, GL_FALSE, (const GLfloat*) MVP);
|
2017-05-24 20:05:16 +00:00
|
|
|
checkError("glUniformMatrix4fv");
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
|
|
|
|
glUniform3f(triangle_vcol_location,colorRGBA[0],colorRGBA[1],colorRGBA[2]);
|
2017-05-24 20:05:16 +00:00
|
|
|
checkError("glUniform3f");
|
|
|
|
|
|
|
|
glBindVertexArray(triangleVertexArrayObject);
|
|
|
|
checkError("glBindVertexArray");
|
|
|
|
|
|
|
|
glBindBuffer(GL_ARRAY_BUFFER, triangleVertexBufferObject);
|
|
|
|
checkError("glBindBuffer");
|
|
|
|
|
|
|
|
glBufferData(GL_ARRAY_BUFFER, sizeof(GfxVertexFormat0)*numvertices, 0, GL_DYNAMIC_DRAW);
|
|
|
|
glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(GfxVertexFormat0)*numvertices, vertices);
|
|
|
|
|
|
|
|
PointerCaster posCast;
|
|
|
|
posCast.m_baseIndex = 0;
|
|
|
|
PointerCaster uvCast;
|
|
|
|
uvCast.m_baseIndex = 8*sizeof(float);
|
|
|
|
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(GfxVertexFormat0), posCast.m_pointer);
|
|
|
|
glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, sizeof(GfxVertexFormat0), uvCast.m_pointer);
|
|
|
|
checkError("glVertexAttribPointer");
|
|
|
|
glEnableVertexAttribArray(0);
|
|
|
|
glEnableVertexAttribArray(1);
|
|
|
|
|
|
|
|
glVertexAttribDivisor(0,0);
|
|
|
|
glVertexAttribDivisor(1,0);
|
|
|
|
checkError("glVertexAttribDivisor");
|
|
|
|
|
|
|
|
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, triangleIndexVbo);
|
|
|
|
int indexBufferSizeInBytes = numIndices*sizeof(int);
|
|
|
|
|
|
|
|
glBufferData(GL_ELEMENT_ARRAY_BUFFER, numIndices*sizeof(int), NULL, GL_DYNAMIC_DRAW);
|
|
|
|
glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, numIndices*sizeof(int), indices);
|
|
|
|
|
|
|
|
glDrawElements(GL_TRIANGLES, numIndices, GL_UNSIGNED_INT, 0);
|
|
|
|
|
|
|
|
//glDrawElements(GL_TRIANGLES, numIndices, GL_UNSIGNED_INT,indices);
|
|
|
|
checkError("glDrawElements");
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
|
|
|
|
glActiveTexture(GL_TEXTURE0);
|
|
|
|
glBindTexture(GL_TEXTURE_2D,0);
|
|
|
|
glUseProgram(0);
|
2017-05-24 20:05:16 +00:00
|
|
|
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
|
|
|
|
glBindBuffer(GL_ARRAY_BUFFER,0);
|
|
|
|
glBindVertexArray(0);
|
|
|
|
checkError("glBindVertexArray");
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
void GLInstancingRenderer::drawPoint(const double* position, const double color[4], double pointDrawSize)
|
|
|
|
{
|
|
|
|
float pos[4]={(float)position[0],(float)position[1],(float)position[2],0};
|
|
|
|
float clr[4] = {(float)color[0],(float)color[1],(float)color[2],(float)color[3]};
|
|
|
|
drawPoints(pos,clr,1,3*sizeof(float),float(pointDrawSize));
|
|
|
|
}
|
|
|
|
|
|
|
|
void GLInstancingRenderer::drawPoint(const float* positions, const float color[4], float pointDrawSize)
|
|
|
|
{
|
|
|
|
drawPoints(positions,color,1,3*sizeof(float),pointDrawSize);
|
|
|
|
}
|
|
|
|
void GLInstancingRenderer::drawPoints(const float* positions, const float color[4], int numPoints, int pointStrideInBytes, float pointDrawSize)
|
|
|
|
{
|
|
|
|
|
|
|
|
glActiveTexture(GL_TEXTURE0);
|
|
|
|
glBindTexture(GL_TEXTURE_2D,0);
|
|
|
|
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
glUseProgram(linesShader);
|
|
|
|
glUniformMatrix4fv(lines_ProjectionMatrix, 1, false, &m_data->m_projectionMatrix[0]);
|
|
|
|
glUniformMatrix4fv(lines_ModelViewMatrix, 1, false, &m_data->m_viewMatrix[0]);
|
|
|
|
glUniform4f(lines_colour,color[0],color[1],color[2],color[3]);
|
|
|
|
|
|
|
|
glPointSize(pointDrawSize);
|
|
|
|
glBindVertexArray(lineVertexArrayObject);
|
|
|
|
|
|
|
|
glBindBuffer(GL_ARRAY_BUFFER, lineVertexBufferObject);
|
|
|
|
|
|
|
|
int maxPointsInBatch = MAX_POINTS_IN_BATCH;
|
|
|
|
int remainingPoints = numPoints;
|
|
|
|
int offsetNumPoints= 0;
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
int curPointsInBatch = b3Min(maxPointsInBatch, remainingPoints);
|
|
|
|
if (curPointsInBatch)
|
|
|
|
{
|
|
|
|
|
|
|
|
glBufferSubData(GL_ARRAY_BUFFER, 0, curPointsInBatch*pointStrideInBytes, positions + offsetNumPoints*(pointStrideInBytes / sizeof(float)));
|
|
|
|
glEnableVertexAttribArray(0);
|
|
|
|
int numFloats = 3;// pointStrideInBytes / sizeof(float);
|
|
|
|
glVertexAttribPointer(0, numFloats, GL_FLOAT, GL_FALSE, pointStrideInBytes, 0);
|
|
|
|
glDrawArrays(GL_POINTS, 0, curPointsInBatch);
|
|
|
|
remainingPoints -= curPointsInBatch;
|
|
|
|
offsetNumPoints += curPointsInBatch;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
glBindVertexArray(0);
|
|
|
|
glPointSize(1);
|
|
|
|
glUseProgram(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
void GLInstancingRenderer::drawLines(const float* positions, const float color[4], int numPoints, int pointStrideInBytes, const unsigned int* indices, int numIndices, float lineWidthIn)
|
|
|
|
{
|
2016-07-08 02:24:44 +00:00
|
|
|
glActiveTexture(GL_TEXTURE0);
|
|
|
|
glBindTexture(GL_TEXTURE_2D,0);
|
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
float lineWidth = lineWidthIn;
|
|
|
|
b3Clamp(lineWidth,(float)lineWidthRange[0],(float)lineWidthRange[1]);
|
|
|
|
glLineWidth(lineWidth);
|
|
|
|
|
2017-05-24 20:05:16 +00:00
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
|
|
|
|
|
|
|
|
glActiveTexture(GL_TEXTURE0);
|
|
|
|
glBindTexture(GL_TEXTURE_2D,0);
|
|
|
|
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
glUseProgram(linesShader);
|
|
|
|
glUniformMatrix4fv(lines_ProjectionMatrix, 1, false, &m_data->m_projectionMatrix[0]);
|
|
|
|
glUniformMatrix4fv(lines_ModelViewMatrix, 1, false, &m_data->m_viewMatrix[0]);
|
|
|
|
glUniform4f(lines_colour,color[0],color[1],color[2],color[3]);
|
|
|
|
|
|
|
|
// glPointSize(pointDrawSize);
|
|
|
|
glBindVertexArray(linesVertexArrayObject);
|
|
|
|
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
glBindBuffer(GL_ARRAY_BUFFER, linesVertexBufferObject);
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
glBufferData(GL_ARRAY_BUFFER, numPoints*pointStrideInBytes, 0,GL_DYNAMIC_DRAW);
|
|
|
|
|
|
|
|
glBufferSubData(GL_ARRAY_BUFFER, 0, numPoints*pointStrideInBytes, positions);
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
glBindBuffer(GL_ARRAY_BUFFER, 0);
|
|
|
|
glBindBuffer(GL_ARRAY_BUFFER, linesVertexBufferObject);
|
|
|
|
glEnableVertexAttribArray(0);
|
|
|
|
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
int numFloats = 3;
|
|
|
|
glVertexAttribPointer(0, numFloats, GL_FLOAT, GL_FALSE, pointStrideInBytes, 0);
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, linesIndexVbo);
|
|
|
|
int indexBufferSizeInBytes = numIndices*sizeof(int);
|
|
|
|
|
|
|
|
glBufferData(GL_ELEMENT_ARRAY_BUFFER, indexBufferSizeInBytes, NULL, GL_DYNAMIC_DRAW);
|
|
|
|
glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, indexBufferSizeInBytes, indices);
|
|
|
|
|
|
|
|
glDrawElements(GL_LINES, numIndices, GL_UNSIGNED_INT, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
|
|
|
|
glBindBuffer(GL_ARRAY_BUFFER, 0);
|
|
|
|
// for (int i=0;i<numIndices;i++)
|
|
|
|
// printf("indicec[i]=%d]\n",indices[i]);
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
glBindVertexArray(0);
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
glPointSize(1);
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
glUseProgram(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
void GLInstancingRenderer::drawLine(const double fromIn[4], const double toIn[4], const double colorIn[4], double lineWidthIn)
|
|
|
|
{
|
|
|
|
float from[4]={float(fromIn[0]),float(fromIn[1]),float(fromIn[2]),float(fromIn[3])};
|
|
|
|
float to[4]={float(toIn[0]),float(toIn[1]),float(toIn[2]),float(toIn[3])};
|
|
|
|
float color[4]={float(colorIn[0]),float(colorIn[1]),float(colorIn[2]),float(colorIn[3])};
|
|
|
|
float lineWidth=float(lineWidthIn);
|
|
|
|
drawLine(from,to,color,lineWidth);
|
|
|
|
}
|
|
|
|
void GLInstancingRenderer::drawLine(const float from[4], const float to[4], const float color[4], float lineWidth)
|
|
|
|
{
|
|
|
|
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
glActiveTexture(GL_TEXTURE0);
|
|
|
|
glBindTexture(GL_TEXTURE_2D,0);
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
glUseProgram(linesShader);
|
|
|
|
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
glUniformMatrix4fv(lines_ProjectionMatrix, 1, false, &m_data->m_projectionMatrix[0]);
|
|
|
|
glUniformMatrix4fv(lines_ModelViewMatrix, 1, false, &m_data->m_viewMatrix[0]);
|
|
|
|
glUniform4f(lines_colour,color[0],color[1],color[2],color[3]);
|
|
|
|
|
|
|
|
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
const float vertexPositions[] = {
|
|
|
|
from[0],from[1],from[2],1,
|
|
|
|
to[0],to[1],to[2],1
|
|
|
|
};
|
|
|
|
int sz = sizeof(vertexPositions);
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
|
|
|
|
b3Clamp(lineWidth,(float)lineWidthRange[0],(float)lineWidthRange[1]);
|
|
|
|
glLineWidth(lineWidth);
|
|
|
|
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
glBindVertexArray(lineVertexArrayObject);
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
glBindBuffer(GL_ARRAY_BUFFER, lineVertexBufferObject);
|
|
|
|
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
glBufferSubData(GL_ARRAY_BUFFER, 0,sz, vertexPositions);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
glBindBuffer(GL_ARRAY_BUFFER, 0);
|
|
|
|
glBindBuffer(GL_ARRAY_BUFFER, lineVertexBufferObject);
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
glEnableVertexAttribArray(0);
|
|
|
|
glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 0, 0);
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
glDrawArrays(GL_LINES, 0, 2);
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
|
|
|
|
glBindVertexArray(0);
|
|
|
|
glLineWidth(1);
|
|
|
|
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
glUseProgram(0);
|
|
|
|
}
|
|
|
|
|
2015-04-16 22:16:13 +00:00
|
|
|
|
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
void GLInstancingRenderer::renderSceneInternal(int renderMode)
|
|
|
|
{
|
|
|
|
|
2017-05-16 19:19:03 +00:00
|
|
|
if (!useShadowMap)
|
|
|
|
{
|
|
|
|
renderMode = B3_DEFAULT_RENDERMODE;
|
|
|
|
}
|
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
// glEnable(GL_DEPTH_TEST);
|
|
|
|
|
|
|
|
GLint dims[4];
|
|
|
|
glGetIntegerv(GL_VIEWPORT, dims);
|
|
|
|
//we need to get the viewport dims, because on Apple Retina the viewport dimension is different from screenWidth
|
|
|
|
//printf("dims=%d,%d,%d,%d\n",dims[0],dims[1],dims[2],dims[3]);
|
|
|
|
// Accept fragment if it closer to the camera than the former one
|
|
|
|
//glDepthFunc(GL_LESS);
|
|
|
|
|
|
|
|
// Cull triangles which normal is not towards the camera
|
2015-08-10 21:30:00 +00:00
|
|
|
glEnable(GL_CULL_FACE);
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
B3_PROFILE("GLInstancingRenderer::RenderScene");
|
|
|
|
|
|
|
|
{
|
|
|
|
B3_PROFILE("init");
|
|
|
|
init();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
float depthProjectionMatrix[4][4];
|
|
|
|
GLfloat depthModelViewMatrix[4][4];
|
|
|
|
//GLfloat depthModelViewMatrix2[4][4];
|
|
|
|
|
|
|
|
// Compute the MVP matrix from the light's point of view
|
|
|
|
if (renderMode==B3_CREATE_SHADOWMAP_RENDERMODE)
|
|
|
|
{
|
|
|
|
glEnable(GL_CULL_FACE);
|
|
|
|
glCullFace(GL_FRONT);
|
|
|
|
|
|
|
|
if (!m_data->m_shadowMap)
|
|
|
|
{
|
|
|
|
glActiveTexture(GL_TEXTURE0);
|
|
|
|
|
|
|
|
glGenTextures(1,&m_data->m_shadowTexture);
|
|
|
|
glBindTexture(GL_TEXTURE_2D,m_data->m_shadowTexture);
|
|
|
|
//glTexImage2D(GL_TEXTURE_2D,0,GL_DEPTH_COMPONENT16,m_screenWidth,m_screenHeight,0,GL_DEPTH_COMPONENT,GL_FLOAT,0);
|
|
|
|
//glTexImage2D(GL_TEXTURE_2D,0,GL_DEPTH_COMPONENT32,m_screenWidth,m_screenHeight,0,GL_DEPTH_COMPONENT,GL_FLOAT,0);
|
2015-07-11 05:20:06 +00:00
|
|
|
|
|
|
|
#ifdef OLD_SHADOWMAP_INIT
|
2015-04-16 16:55:32 +00:00
|
|
|
glTexImage2D(GL_TEXTURE_2D, 0,GL_DEPTH_COMPONENT16, shadowMapWidth, shadowMapHeight, 0,GL_DEPTH_COMPONENT, GL_FLOAT, 0);
|
2015-07-11 05:20:06 +00:00
|
|
|
#else//OLD_SHADOWMAP_INIT
|
|
|
|
//Reduce size of shadowMap if glTexImage2D call fails as may happen in some cases
|
|
|
|
//https://github.com/bulletphysics/bullet3/issues/40
|
|
|
|
|
|
|
|
int size;
|
|
|
|
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &size);
|
|
|
|
if (size < shadowMapWidth){
|
|
|
|
shadowMapWidth = size;
|
|
|
|
}
|
|
|
|
if (size < shadowMapHeight){
|
|
|
|
shadowMapHeight = size;
|
|
|
|
}
|
|
|
|
GLuint err;
|
|
|
|
do {
|
|
|
|
glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT16,
|
|
|
|
shadowMapWidth, shadowMapHeight,
|
|
|
|
0, GL_DEPTH_COMPONENT, GL_FLOAT, 0);
|
|
|
|
err = glGetError();
|
|
|
|
if (err!=GL_NO_ERROR){
|
|
|
|
shadowMapHeight >>= 1;
|
|
|
|
shadowMapWidth >>= 1;
|
|
|
|
}
|
|
|
|
} while (err != GL_NO_ERROR && shadowMapWidth > 0);
|
|
|
|
#endif//OLD_SHADOWMAP_INIT
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
2016-10-14 22:06:09 +00:00
|
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
2016-10-13 06:03:36 +00:00
|
|
|
|
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
float l_ClampColor[] = {1.0, 1.0, 1.0, 1.0};
|
|
|
|
glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, l_ClampColor);
|
|
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
|
|
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
|
|
|
|
// glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
|
|
|
|
// glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
|
|
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL);
|
|
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
|
|
|
|
|
|
|
|
m_data->m_shadowMap=new GLRenderToTexture();
|
|
|
|
m_data->m_shadowMap->init(shadowMapWidth, shadowMapHeight,m_data->m_shadowTexture,RENDERTEXTURE_DEPTH);
|
|
|
|
}
|
|
|
|
m_data->m_shadowMap->enable();
|
|
|
|
glViewport(0,0,shadowMapWidth,shadowMapHeight);
|
|
|
|
//glClearColor(1,1,1,1);
|
|
|
|
glClear(GL_DEPTH_BUFFER_BIT);
|
|
|
|
//glClearColor(0.3,0.3,0.3,1);
|
|
|
|
|
|
|
|
// m_data->m_shadowMap->disable();
|
|
|
|
// return;
|
|
|
|
glEnable(GL_CULL_FACE);
|
2016-09-03 15:39:40 +00:00
|
|
|
glCullFace(GL_FRONT); // Cull back-facing triangles -> draw only front-facing triangles
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
} else
|
|
|
|
{
|
2016-11-04 20:15:10 +00:00
|
|
|
glEnable(GL_CULL_FACE);
|
2015-04-16 16:55:32 +00:00
|
|
|
glCullFace(GL_BACK);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
b3CreateOrtho(-shadowMapWorldSize,shadowMapWorldSize,-shadowMapWorldSize,shadowMapWorldSize,1,300,depthProjectionMatrix);//-14,14,-14,14,1,200, depthProjectionMatrix);
|
|
|
|
float depthViewMatrix[4][4];
|
|
|
|
b3Vector3 center = b3MakeVector3(0,0,0);
|
2017-04-10 18:03:41 +00:00
|
|
|
//float upf[3];
|
|
|
|
//m_data->m_activeCamera->getCameraUpVector(upf);
|
|
|
|
b3Vector3 up, fwd;
|
2017-04-23 14:35:13 +00:00
|
|
|
b3Vector3 lightDir = m_data->m_lightPos.normalized();
|
|
|
|
b3PlaneSpace1(lightDir,up,fwd);
|
2017-04-10 18:03:41 +00:00
|
|
|
// b3Vector3 up = b3MakeVector3(upf[0],upf[1],upf[2]);
|
2017-04-23 14:35:13 +00:00
|
|
|
b3CreateLookAt(m_data->m_lightPos,center,up,&depthViewMatrix[0][0]);
|
2015-04-16 16:55:32 +00:00
|
|
|
//b3CreateLookAt(lightPos,m_data->m_cameraTargetPosition,b3Vector3(0,1,0),(float*)depthModelViewMatrix2);
|
|
|
|
|
|
|
|
GLfloat depthModelMatrix[4][4];
|
|
|
|
b3CreateDiagonalMatrix(1.f,depthModelMatrix);
|
|
|
|
|
|
|
|
b3Matrix4x4Mul(depthViewMatrix, depthModelMatrix, depthModelViewMatrix);
|
|
|
|
|
|
|
|
GLfloat depthMVP[4][4];
|
|
|
|
b3Matrix4x4Mul(depthProjectionMatrix,depthModelViewMatrix,depthMVP);
|
|
|
|
|
|
|
|
GLfloat biasMatrix[4][4]={
|
2015-09-11 00:52:41 +00:00
|
|
|
{ 0.5, 0.0, 0.0, 0.0 },
|
|
|
|
{ 0.0, 0.5, 0.0, 0.0 },
|
|
|
|
{ 0.0, 0.0, 0.5, 0.0 },
|
|
|
|
{ 0.5, 0.5, 0.5, 1.0 }
|
2015-04-16 16:55:32 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
GLfloat depthBiasMVP[4][4];
|
|
|
|
b3Matrix4x4Mul(biasMatrix,depthMVP,depthBiasMVP);
|
|
|
|
|
|
|
|
|
|
|
|
//float m_frustumZNear=0.1;
|
|
|
|
//float m_frustumZFar=100.f;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//b3CreateFrustum(-m_frustumZNear, m_frustumZNear, -m_frustumZNear, m_frustumZNear, m_frustumZNear, m_frustumZFar,(float*)depthProjectionMatrix);
|
|
|
|
|
|
|
|
|
|
|
|
//b3CreateLookAt(lightPos,m_data->m_cameraTargetPosition,b3Vector3(0,0,1),(float*)depthModelViewMatrix);
|
|
|
|
|
|
|
|
{
|
|
|
|
B3_PROFILE("updateCamera");
|
|
|
|
// updateCamera();
|
2016-07-13 01:16:13 +00:00
|
|
|
m_data->m_activeCamera->getCameraProjectionMatrix(m_data->m_projectionMatrix);
|
|
|
|
m_data->m_activeCamera->getCameraViewMatrix(m_data->m_viewMatrix);
|
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
|
|
|
|
// glBindBuffer(GL_ARRAY_BUFFER, 0);
|
|
|
|
{
|
|
|
|
B3_PROFILE("glFlush2");
|
|
|
|
|
|
|
|
glBindBuffer(GL_ARRAY_BUFFER, m_data->m_vbo);
|
2016-07-18 06:50:11 +00:00
|
|
|
//glFlush();
|
2015-04-16 16:55:32 +00:00
|
|
|
}
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
|
|
|
|
int totalNumInstances = 0;
|
|
|
|
|
|
|
|
for (int i=0;i<m_graphicsInstances.size();i++)
|
|
|
|
{
|
|
|
|
totalNumInstances+=m_graphicsInstances[i]->m_numGraphicsInstances;
|
|
|
|
}
|
|
|
|
|
|
|
|
int curOffset = 0;
|
|
|
|
//GLuint lastBindTexture = 0;
|
|
|
|
|
2016-07-08 02:24:44 +00:00
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
for (int i=0;i<m_graphicsInstances.size();i++)
|
|
|
|
{
|
|
|
|
|
|
|
|
b3GraphicsInstance* gfxObj = m_graphicsInstances[i];
|
|
|
|
if (gfxObj->m_numGraphicsInstances)
|
|
|
|
{
|
|
|
|
glActiveTexture(GL_TEXTURE0);
|
|
|
|
GLuint curBindTexture = 0;
|
|
|
|
if (gfxObj->m_texturehandle)
|
|
|
|
curBindTexture = gfxObj->m_texturehandle;
|
|
|
|
else
|
|
|
|
curBindTexture = m_data->m_defaultTexturehandle;
|
|
|
|
|
|
|
|
//disable lazy evaluation, it just leads to bugs
|
|
|
|
//if (lastBindTexture != curBindTexture)
|
|
|
|
{
|
|
|
|
glBindTexture(GL_TEXTURE_2D,curBindTexture);
|
|
|
|
}
|
|
|
|
//lastBindTexture = curBindTexture;
|
|
|
|
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
// int myOffset = gfxObj->m_instanceOffset*4*sizeof(float);
|
|
|
|
|
|
|
|
int POSITION_BUFFER_SIZE = (totalNumInstances*sizeof(float)*4);
|
|
|
|
int ORIENTATION_BUFFER_SIZE = (totalNumInstances*sizeof(float)*4);
|
|
|
|
int COLOR_BUFFER_SIZE = (totalNumInstances*sizeof(float)*4);
|
|
|
|
// int SCALE_BUFFER_SIZE = (totalNumInstances*sizeof(float)*3);
|
|
|
|
|
|
|
|
glBindVertexArray(gfxObj->m_cube_vao);
|
|
|
|
|
|
|
|
|
|
|
|
int vertexStride = 9*sizeof(float);
|
|
|
|
PointerCaster vertex;
|
|
|
|
vertex.m_baseIndex = gfxObj->m_vertexArrayOffset*vertexStride;
|
|
|
|
|
|
|
|
|
|
|
|
glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 9*sizeof(float), vertex.m_pointer);
|
2015-05-01 18:42:14 +00:00
|
|
|
glVertexAttribPointer(1, 4, GL_FLOAT, GL_FALSE, 0, (GLvoid *)(curOffset*4*sizeof(float)+m_data->m_maxShapeCapacityInBytes));
|
|
|
|
glVertexAttribPointer(2, 4, GL_FLOAT, GL_FALSE, 0, (GLvoid *)(curOffset*4*sizeof(float)+m_data->m_maxShapeCapacityInBytes+POSITION_BUFFER_SIZE));
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
PointerCaster uv;
|
|
|
|
uv.m_baseIndex = 7*sizeof(float)+vertex.m_baseIndex;
|
|
|
|
|
|
|
|
PointerCaster normal;
|
|
|
|
normal.m_baseIndex = 4*sizeof(float)+vertex.m_baseIndex;
|
|
|
|
|
|
|
|
glVertexAttribPointer(3, 2, GL_FLOAT, GL_FALSE, 9*sizeof(float), uv.m_pointer);
|
|
|
|
glVertexAttribPointer(4, 3, GL_FLOAT, GL_FALSE, 9*sizeof(float), normal.m_pointer);
|
2015-05-01 18:42:14 +00:00
|
|
|
glVertexAttribPointer(5, 4, GL_FLOAT, GL_FALSE, 0, (GLvoid *)(curOffset*4*sizeof(float)+m_data->m_maxShapeCapacityInBytes+POSITION_BUFFER_SIZE+ORIENTATION_BUFFER_SIZE));
|
|
|
|
glVertexAttribPointer(6, 3, GL_FLOAT, GL_FALSE, 0, (GLvoid *)(curOffset*3*sizeof(float)+m_data->m_maxShapeCapacityInBytes+POSITION_BUFFER_SIZE+ORIENTATION_BUFFER_SIZE+COLOR_BUFFER_SIZE));
|
2015-04-16 16:55:32 +00:00
|
|
|
|
|
|
|
glEnableVertexAttribArray(0);
|
|
|
|
glEnableVertexAttribArray(1);
|
|
|
|
glEnableVertexAttribArray(2);
|
|
|
|
glEnableVertexAttribArray(3);
|
|
|
|
glEnableVertexAttribArray(4);
|
|
|
|
glEnableVertexAttribArray(5);
|
|
|
|
glEnableVertexAttribArray(6);
|
|
|
|
glVertexAttribDivisor(0, 0);
|
|
|
|
glVertexAttribDivisor(1, 1);
|
|
|
|
glVertexAttribDivisor(2, 1);
|
|
|
|
glVertexAttribDivisor(3, 0);
|
|
|
|
glVertexAttribDivisor(4, 0);
|
|
|
|
glVertexAttribDivisor(5, 1);
|
|
|
|
glVertexAttribDivisor(6, 1);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int indexCount = gfxObj->m_numIndices;
|
|
|
|
GLvoid* indexOffset = 0;
|
|
|
|
|
|
|
|
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, gfxObj->m_index_vbo);
|
|
|
|
{
|
|
|
|
B3_PROFILE("glDrawElementsInstanced");
|
|
|
|
|
|
|
|
if (gfxObj->m_primitiveType==B3_GL_POINTS)
|
|
|
|
{
|
|
|
|
glUseProgram(instancingShaderPointSprite);
|
|
|
|
glUniformMatrix4fv(ProjectionMatrixPointSprite, 1, false, &m_data->m_projectionMatrix[0]);
|
|
|
|
glUniformMatrix4fv(ModelViewMatrixPointSprite, 1, false, &m_data->m_viewMatrix[0]);
|
|
|
|
glUniform1f(screenWidthPointSprite,float(m_screenWidth));
|
|
|
|
|
|
|
|
//glUniform1i(uniform_texture_diffusePointSprite, 0);
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
glPointSize(20);
|
|
|
|
|
|
|
|
#ifndef __APPLE__
|
|
|
|
glEnable(GL_POINT_SPRITE_ARB);
|
|
|
|
// glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
glEnable(GL_VERTEX_PROGRAM_POINT_SIZE);
|
|
|
|
glDrawElementsInstanced(GL_POINTS, indexCount, GL_UNSIGNED_INT, indexOffset, gfxObj->m_numGraphicsInstances);
|
|
|
|
} else
|
|
|
|
{
|
|
|
|
switch (renderMode)
|
|
|
|
{
|
|
|
|
|
|
|
|
case B3_DEFAULT_RENDERMODE:
|
|
|
|
{
|
|
|
|
glUseProgram(instancingShader);
|
|
|
|
glUniformMatrix4fv(ProjectionMatrix, 1, false, &m_data->m_projectionMatrix[0]);
|
|
|
|
glUniformMatrix4fv(ModelViewMatrix, 1, false, &m_data->m_viewMatrix[0]);
|
2015-08-06 02:03:27 +00:00
|
|
|
|
2017-04-23 14:35:13 +00:00
|
|
|
b3Vector3 gLightDir = m_data->m_lightPos;
|
2015-08-06 02:03:27 +00:00
|
|
|
gLightDir.normalize();
|
|
|
|
glUniform3f(regularLightDirIn,gLightDir[0],gLightDir[1],gLightDir[2]);
|
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
glUniform1i(uniform_texture_diffuse, 0);
|
|
|
|
glDrawElementsInstanced(GL_TRIANGLES, indexCount, GL_UNSIGNED_INT, indexOffset, gfxObj->m_numGraphicsInstances);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case B3_CREATE_SHADOWMAP_RENDERMODE:
|
|
|
|
{
|
|
|
|
/*printf("createShadowMapInstancingShader=%d\n",createShadowMapInstancingShader);
|
|
|
|
printf("createShadow_depthMVP=%d\n",createShadow_depthMVP);
|
|
|
|
printf("indexOffset=%d\n",indexOffset);
|
|
|
|
printf("gfxObj->m_numGraphicsInstances=%d\n",gfxObj->m_numGraphicsInstances);
|
|
|
|
printf("indexCount=%d\n",indexCount);
|
|
|
|
*/
|
2016-07-08 02:24:44 +00:00
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
glUseProgram(createShadowMapInstancingShader);
|
|
|
|
glUniformMatrix4fv(createShadow_depthMVP, 1, false, &depthMVP[0][0]);
|
|
|
|
glDrawElementsInstanced(GL_TRIANGLES, indexCount, GL_UNSIGNED_INT, indexOffset, gfxObj->m_numGraphicsInstances);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case B3_USE_SHADOWMAP_RENDERMODE:
|
|
|
|
{
|
|
|
|
if (m_enableBlend)
|
|
|
|
{
|
|
|
|
glEnable (GL_BLEND);
|
|
|
|
glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
|
|
|
}
|
|
|
|
|
|
|
|
glUseProgram(useShadowMapInstancingShader);
|
|
|
|
glUniformMatrix4fv(useShadow_ProjectionMatrix, 1, false, &m_data->m_projectionMatrix[0]);
|
|
|
|
glUniformMatrix4fv(useShadow_ModelViewMatrix, 1, false, &m_data->m_viewMatrix[0]);
|
2017-06-01 03:32:45 +00:00
|
|
|
glUniformMatrix4fv(useShadow_ViewMatrixInverse, 1, false, &m_data->m_viewMatrixInverse[0]);
|
|
|
|
glUniformMatrix4fv(useShadow_ModelViewMatrix, 1, false, &m_data->m_viewMatrix[0]);
|
|
|
|
|
|
|
|
glUniform3f(useShadow_lightSpecularIntensity, m_data->m_lightSpecularIntensity[0],m_data->m_lightSpecularIntensity[1],m_data->m_lightSpecularIntensity[2]);
|
|
|
|
glUniform3f(useShadow_materialSpecularColor, gfxObj->m_materialSpecularColor[0],gfxObj->m_materialSpecularColor[1],gfxObj->m_materialSpecularColor[2]);
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
float MVP[16];
|
|
|
|
b3Matrix4x4Mul16(m_data->m_projectionMatrix,m_data->m_viewMatrix,MVP);
|
|
|
|
glUniformMatrix4fv(useShadow_MVP, 1, false, &MVP[0]);
|
2017-06-01 03:32:45 +00:00
|
|
|
//gLightDir.normalize();
|
|
|
|
glUniform3f(useShadow_lightPosIn,m_data->m_lightPos[0],m_data->m_lightPos[1],m_data->m_lightPos[2]);
|
|
|
|
float camPos[3];
|
|
|
|
m_data->m_activeCamera->getCameraPosition(camPos);
|
|
|
|
glUniform3f(useShadow_cameraPositionIn,camPos[0],camPos[1],camPos[2]);
|
|
|
|
glUniform1f(useShadow_materialShininessIn,gfxObj->m_materialShinyNess);
|
|
|
|
|
2015-04-16 16:55:32 +00:00
|
|
|
glUniformMatrix4fv(useShadow_DepthBiasModelViewMatrix, 1, false, &depthBiasMVP[0][0]);
|
|
|
|
glActiveTexture(GL_TEXTURE1);
|
|
|
|
glBindTexture(GL_TEXTURE_2D, m_data->m_shadowTexture);
|
|
|
|
glUniform1i(useShadow_shadowMap,1);
|
|
|
|
glDrawElementsInstanced(GL_TRIANGLES, indexCount, GL_UNSIGNED_INT, indexOffset, gfxObj->m_numGraphicsInstances);
|
|
|
|
if (m_enableBlend)
|
|
|
|
{
|
|
|
|
glDisable (GL_BLEND);
|
|
|
|
}
|
Improve debug text/line rendering, can be use to draw frames and text in local coordinate of an object / link.
example:
kuka = p.loadURDF("kuka_iiwa/model.urdf")
p.getNumJoints(kuka)
pybullet.addUserDebugLine([0,0,0],[0,0,0.1],[0,0,1],trackObjectUniqueId=2,trackLinkIndex=6)
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],trackObjectUniqueId=2,trackLinkIndex=6)
Also allow to render text using a given orientation (instead of pointing to the camera), example:
pybullet.addUserDebugText("tip", [0,0,0.1],textColorRGB=[1,0,0],textOrientation=[0,0,0,1], trackObjectUniqueId=2,trackLinkIndex=6)
Add drawTexturedTriangleMesh, for drawing 3d text.
Expose readSingleInstanceTransformToCPU, to extract position/orientation from graphics index.
updateTexture: allow to not flip texels around up axis
2017-05-24 05:05:26 +00:00
|
|
|
glActiveTexture(GL_TEXTURE1);
|
|
|
|
glBindTexture(GL_TEXTURE_2D,0);
|
|
|
|
|
|
|
|
glActiveTexture(GL_TEXTURE0);
|
2016-07-08 02:24:44 +00:00
|
|
|
glBindTexture(GL_TEXTURE_2D,0);
|
2015-04-16 16:55:32 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
{
|
|
|
|
// b3Assert(0);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//glDrawElementsInstanced(GL_LINE_LOOP, indexCount, GL_UNSIGNED_INT, (void*)indexOffset, gfxObj->m_numGraphicsInstances);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
curOffset+= gfxObj->m_numGraphicsInstances;
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
B3_PROFILE("glFlush");
|
2016-07-18 06:50:11 +00:00
|
|
|
//glFlush();
|
2015-04-16 16:55:32 +00:00
|
|
|
}
|
|
|
|
if (renderMode==B3_CREATE_SHADOWMAP_RENDERMODE)
|
|
|
|
{
|
|
|
|
// writeTextureToPng(shadowMapWidth,shadowMapHeight,"shadowmap.png",4);
|
|
|
|
m_data->m_shadowMap->disable();
|
2016-06-30 23:03:38 +00:00
|
|
|
glBindFramebuffer( GL_FRAMEBUFFER, m_data->m_renderFrameBuffer);
|
2015-04-16 16:55:32 +00:00
|
|
|
glViewport(dims[0],dims[1],dims[2],dims[3]);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
{
|
|
|
|
B3_PROFILE("glUseProgram(0);");
|
|
|
|
glUseProgram(0);
|
|
|
|
glBindBuffer(GL_ARRAY_BUFFER,0);
|
|
|
|
glBindVertexArray(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
glDisable(GL_CULL_FACE);
|
|
|
|
b3Assert(glGetError() ==GL_NO_ERROR);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void GLInstancingRenderer::CleanupShaders()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
void GLInstancingRenderer::enableShadowMap()
|
|
|
|
{
|
|
|
|
glActiveTexture(GL_TEXTURE0);
|
|
|
|
//glEnable(GL_TEXTURE_2D);
|
|
|
|
glBindTexture(GL_TEXTURE_2D, m_data->m_shadowTexture);
|
|
|
|
//glBindTexture(GL_TEXTURE_2D, m_data->m_defaultTexturehandle);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2015-10-18 21:01:25 +00:00
|
|
|
void GLInstancingRenderer::clearZBuffer()
|
|
|
|
{
|
|
|
|
glClear(GL_DEPTH_BUFFER_BIT);
|
|
|
|
}
|
|
|
|
|
2015-05-01 18:42:14 +00:00
|
|
|
int GLInstancingRenderer::getMaxShapeCapacity() const
|
|
|
|
{
|
|
|
|
return m_data->m_maxShapeCapacityInBytes;
|
|
|
|
}
|
|
|
|
int GLInstancingRenderer::getInstanceCapacity() const
|
|
|
|
{
|
|
|
|
return m_data->m_maxNumObjectCapacity;
|
|
|
|
}
|
2016-06-30 23:03:38 +00:00
|
|
|
|
|
|
|
void GLInstancingRenderer::setRenderFrameBuffer(unsigned int renderFrameBuffer)
|
|
|
|
{
|
|
|
|
m_data->m_renderFrameBuffer = (GLuint) renderFrameBuffer;
|
|
|
|
}
|
|
|
|
|
2016-07-08 02:24:44 +00:00
|
|
|
int GLInstancingRenderer::getTotalNumInstances() const
|
|
|
|
{
|
|
|
|
return m_data->m_totalNumInstances;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-05-06 17:35:14 +00:00
|
|
|
#endif //NO_OPENGL3
|