Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Sofa.GL] Fix OglModel crash when texture file is not found #5182

Merged
merged 1 commit into from
Dec 27, 2024
Merged

[Sofa.GL] Fix OglModel crash when texture file is not found #5182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 22 additions & 17 deletions Sofa/GL/Component/Rendering3D/src/sofa/gl/component/rendering3d/OglModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ OglModel::OglModel()
, blendEquation( initData(&blendEquation, "blendEquation", "if alpha blending is enabled this specifies how source and destination colors are combined") )
, sourceFactor( initData(&sourceFactor, "sfactor", "if alpha blending is enabled this specifies how the red, green, blue, and alpha source blending factors are computed") )
, destFactor( initData(&destFactor, "dfactor", "if alpha blending is enabled this specifies how the red, green, blue, and alpha destination blending factors are computed") )
, tex(nullptr)
, m_tex(nullptr)
, vbo(0), iboEdges(0), iboTriangles(0), iboQuads(0)
, VBOGenDone(false), initDone(false), useEdges(false), useTriangles(false), useQuads(false), canUsePatches(false)
, oldVerticesSize(0), oldNormalsSize(0), oldTexCoordsSize(0), oldTangentsSize(0), oldBitangentsSize(0), oldEdgesSize(0), oldTrianglesSize(0), oldQuadsSize(0)
Expand Down Expand Up @@ -88,11 +88,16 @@ void OglModel::parse(core::objectmodel::BaseObjectDescription* arg)

void OglModel::deleteTextures()
{
if (tex!=nullptr) delete tex;
if (m_tex != nullptr)
{
delete m_tex;
m_tex = nullptr;
}

for (unsigned int i = 0 ; i < textures.size() ; i++)
{
delete textures[i];
textures[i] = nullptr;
}
}

Expand Down Expand Up @@ -162,7 +167,7 @@ void OglModel::drawGroup(int ig, bool transparent)
if (transparent ^ isTransparent) return;


if (!tex && m.useTexture && m.activated)
if (!m_tex && m.useTexture && m.activated)
{
//get the texture id corresponding to the current material
size_t indexInTextureArray = size_t(materialTextureIdMap[g.materialId]);
Expand Down Expand Up @@ -288,7 +293,7 @@ void OglModel::drawGroup(int ig, bool transparent)
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
}

if (!tex && m.useTexture && m.activated)
if (!m_tex && m.useTexture && m.activated)
{
int indexInTextureArray = materialTextureIdMap[g.materialId];
if (indexInTextureArray < int(textures.size()) && textures[size_t(indexInTextureArray)])
Expand Down Expand Up @@ -379,12 +384,12 @@ void OglModel::internalDraw(const core::visual::VisualParams* vparams, bool tran
glEnableClientState(GL_NORMAL_ARRAY);
glEnableClientState(GL_VERTEX_ARRAY);

if ((tex || d_putOnlyTexCoords.getValue()) )
if ((m_tex || d_putOnlyTexCoords.getValue()) )
{
if(tex)
if(m_tex)
{
glEnable(GL_TEXTURE_2D);
tex->bind();
m_tex->bind();
}

const size_t textureArrayByteSize = vtexcoords.size()*sizeof(vtexcoords[0]);
Expand Down Expand Up @@ -522,11 +527,11 @@ void OglModel::internalDraw(const core::visual::VisualParams* vparams, bool tran
glDepthMask(GL_TRUE);
}

if ( (tex || d_putOnlyTexCoords.getValue()) )
if ( (m_tex || d_putOnlyTexCoords.getValue()) )
{
if (tex)
if (m_tex)
{
tex->unbind();
m_tex->unbind();
glDisable(GL_TEXTURE_2D);
}
glDisableClientState(GL_TEXTURE_COORD_ARRAY);
Expand Down Expand Up @@ -582,15 +587,15 @@ bool OglModel::hasTransparent()

bool OglModel::hasTexture()
{
return !textures.empty() || tex;
return !textures.empty() || m_tex;
}

bool OglModel::loadTexture(const std::string& filename)
{
helper::io::Image *img = helper::io::Image::Create(filename);
if (!img)
return false;
tex = new sofa::gl::Texture(img, true, true, false, d_srgbTexturing.getValue());
m_tex = new sofa::gl::Texture(img, true, true, false, d_srgbTexturing.getValue());
return true;
}

Expand Down Expand Up @@ -696,9 +701,9 @@ void OglModel::doInitVisual(const core::visual::VisualParams*)

void OglModel::initTextures()
{
if (tex)
if (m_tex)
{
tex->init();
m_tex->init();
}
else
{
Expand Down Expand Up @@ -755,7 +760,7 @@ void OglModel::initVertexBuffer()
positionsBufferSize = (vertices.size()*sizeof(Vec3f));
normalsBufferSize = (vnormals.size()*sizeof(Vec3f));

if (tex || d_putOnlyTexCoords.getValue() || !textures.empty())
if (m_tex || d_putOnlyTexCoords.getValue() || !textures.empty())
{
textureCoordsBufferSize = vtexcoords.size() * sizeof(vtexcoords[0]);

Expand Down Expand Up @@ -847,7 +852,7 @@ void OglModel::updateVertexBuffer()
positionsBufferSize = (vertices.size()*sizeof(Vec3f));
normalsBufferSize = (vnormals.size()*sizeof(Vec3f));

if (tex || d_putOnlyTexCoords.getValue() || !textures.empty())
if (m_tex || d_putOnlyTexCoords.getValue() || !textures.empty())
{
textureCoordsBufferSize = (vtexcoords.size() * sizeof(vtexcoords[0]));

Expand All @@ -873,7 +878,7 @@ void OglModel::updateVertexBuffer()
normalBuffer);

////Texture coords
if (tex || d_putOnlyTexCoords.getValue() || !textures.empty())
if (m_tex || d_putOnlyTexCoords.getValue() || !textures.empty())
{
glBufferSubData(GL_ARRAY_BUFFER,
positionsBufferSize + normalsBufferSize,
Expand Down
4 changes: 2 additions & 2 deletions Sofa/GL/Component/Rendering3D/src/sofa/gl/component/rendering3d/OglModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class SOFA_GL_COMPONENT_RENDERING3D_API OglModel : public sofa::component::visua
Data<sofa::helper::OptionsGroup> destFactor; ///< if alpha blending is enabled this specifies how the red, green, blue, and alpha destination blending factors are computed
GLenum blendEq, sfactor, dfactor;

sofa::gl::Texture *tex; //this texture is used only if a texture name is specified in the scn
sofa::gl::Texture *m_tex; //this texture is used only if a texture name is specified in the scn
GLuint vbo, iboEdges, iboTriangles, iboQuads;
bool VBOGenDone, initDone, useEdges, useTriangles, useQuads, canUsePatches;
size_t oldVerticesSize, oldNormalsSize, oldTexCoordsSize, oldTangentsSize, oldBitangentsSize, oldEdgesSize, oldTrianglesSize, oldQuadsSize;
Expand Down Expand Up @@ -126,7 +126,7 @@ class SOFA_GL_COMPONENT_RENDERING3D_API OglModel : public sofa::component::visua
bool isUseTriangles() { return useTriangles; }
bool isUseQuads() { return useQuads; }

sofa::gl::Texture* getTex() const { return tex; }
sofa::gl::Texture* getTex() const { return m_tex; }
GLuint getVbo() { return vbo; }
GLuint getIboEdges() { return iboEdges; }
GLuint getIboTriangles() { return iboTriangles; }
Expand Down
Loading