Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions src/cpp/web-ifc/geometry/representation/IfcGeometry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ namespace webifc::geometry {
return resultMat;
}

uint32_t IfcGeometry::GetVertexData()
uintptr_t IfcGeometry::GetVertexData()
{
// unfortunately webgl can't do doubles
if (fvertexData.size() != vertexData.size())
Expand All @@ -228,17 +228,17 @@ namespace webifc::geometry {
{
return 0;
}
return (uint32_t)(size_t)&fvertexData[0];
return (uintptr_t)(size_t)&fvertexData[0];
}

uint32_t IfcGeometry::GetVertexDataSize()
{
return (uint32_t)fvertexData.size();
}

uint32_t IfcGeometry::GetIndexData()
uintptr_t IfcGeometry::GetIndexData()
{
return (uint32_t)(size_t)&indexData[0];
return (uintptr_t)(size_t)&indexData[0];
}

uint32_t IfcGeometry::GetIndexDataSize()
Expand Down
4 changes: 2 additions & 2 deletions src/cpp/web-ifc/geometry/representation/IfcGeometry.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ namespace webifc::geometry {
void AddPart(Geometry geom);
void AddGeometry(Geometry geom, glm::dmat4 trans = glm::dmat4(1), double scx = 1, double scy = 1, double scz = 1, glm::dvec3 origin = glm::dvec3(0, 0, 0));
void MergeGeometry(Geometry geom);
uint32_t GetVertexData();
uintptr_t GetVertexData();
uint32_t GetVertexDataSize();
uint32_t GetIndexData();
uintptr_t GetIndexData();
uint32_t GetIndexDataSize();
SweptDiskSolid GetSweptDiskSolid();
glm::dmat4 Normalize();
Expand Down
5 changes: 4 additions & 1 deletion src/cpp/web-ifc/parsing/IfcFileStream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@

IfcTokenStream::IfcFileStream::~IfcFileStream()
{
delete _buffer;
if (_buffer != nullptr) {
delete[] _buffer;
_buffer = nullptr;
}
}

void IfcTokenStream::IfcFileStream::load()
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/web-ifc/parsing/IfcTokenChunk.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace webifc::parsing
bool IfcTokenStream::IfcTokenChunk::Clear(bool force)
{
if (_fileStream==nullptr && !force) return false;
if (_chunkData!=nullptr) delete[] _chunkData;
if (_chunkData!=nullptr) { delete[] _chunkData; _chunkData = nullptr; }
_loaded=false;
return true;
}
Expand Down