Skip to content

Null Pointer Checks #2

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

Open
ManindraDeMel wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Null Pointer Checks #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb7db63
null pointer checks
ManindraDeMel May 8, 2024
23d88cc
update naming
ManindraDeMel May 8, 2024
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
4 changes: 3 additions & 1 deletion engine3D/scene.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,9 @@ Scene::Scene(glm::vec3 position,float angle,float hwRelation,float near, float f
{
shaders[shaderIndx]->Bind();
shaders[shaderIndx]->Update(cameras[0]->GetViewProjection()*glm::scale(glm::vec3(10,10,10)),Normal*glm::scale(glm::vec3(10,10,10)),0);
axisMesh->draw(GL_LINES); //main axis
if (axisMesh->meshExists()) {
axisMesh->draw(GL_LINES); //main axis
}
}
}

Expand Down
23 changes: 20 additions & 3 deletions engine3D/shape.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,25 @@ void Shape::addLineMesh(LineVertex* vertices, unsigned int numVertices,unsigned
void Shape::draw(int mode)
{
//transformations
if(tex)
if (tex) {
tex->Bind();
if(mesh)
}
else {
std::cerr << "Warning: No texture bound." << std::endl;
}
if (mesh) {
mesh->Draw(mode);
if(lineMesh)
}
else {
std::cerr << "Error: mesh is not initialized." << std::endl;
}

if (lineMesh) {
lineMesh->Draw();
}
else {
std::cerr << "Error: lineMesh is not initialized." << std::endl;
}
}

Shape::~Shape(void)
Expand All @@ -90,4 +103,8 @@ Shape::~Shape(void)
void Shape::getPoints(std::list<glm::vec3> &pList)
{

}

bool Shape::meshExists() {
return (mesh != nullptr);
}
1 change: 1 addition & 0 deletions engine3D/shape.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class Shape : public MovableGLM
void addLineMesh(LineVertex* vertices, unsigned int numVertices,unsigned int* indices, unsigned int numIndices);
void draw(int mode);
void getPoints(std::list<glm::vec3> &pList);
bool meshExists();
virtual ~Shape(void);
};