Skip to content

Commit 114a916

Browse files
committed
try to fix issue with include
1 parent a458c66 commit 114a916

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/DOM/MapCollisionDOMNode.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "GenUtil.hpp"
55
#include "imgui.h"
66
#include "../lib/bStream/bstream.h"
7-
#include "ImGuiFileDialog/ImGuiFileDialog.h"
7+
#include "ImGuiFileDialog.h"
88
#include "io/CollisionIO.hpp"
99
#include <thread>
1010
#include <mutex>
@@ -108,7 +108,7 @@ void LMapCollisionDOMNode::RenderDetailsUI(float dt)
108108
ImGui::SameLine();
109109
LUIUtility::RenderTextInput("##matPropertyLadder", &mMatColProp["Ladder"]);
110110
LUIUtility::RenderTooltip("Name of material property with ladder flag. Unused.");
111-
111+
112112
ImGui::Text("IgnorePointer");
113113
ImGui::SameLine();
114114
LUIUtility::RenderTextInput("##matPropertyIgnorePointer", &mMatColProp["IgnorePointer"]);
@@ -138,7 +138,7 @@ void LMapCollisionDOMNode::RenderDetailsUI(float dt)
138138
ImGui::Spinner("##loadmapSpinner", 5.0f, 2, col);
139139
ImGui::SameLine();
140140
ImGui::Text("Importing Obj Collision...");
141-
141+
142142
importLock.lock();
143143
if(isImportingCol == false){
144144
LGenUtility::Log << "[BooldozerEditor]: Joining Import Thread" << std::endl;
@@ -162,7 +162,7 @@ void LMapCollisionDOMNode::RenderDetailsUI(float dt)
162162

163163
bStream::CMemoryStream colStream(colFile->GetData(), colFile->GetSize(), bStream::Endianess::Big, bStream::OpenMode::In);
164164
Load(&colStream);
165-
165+
166166
LEditorScene::SetDirty();
167167

168168
}
@@ -175,7 +175,7 @@ void LMapCollisionDOMNode::RenderDetailsUI(float dt)
175175
importLock.unlock();
176176

177177
importModelThread = std::thread(&LMapCollisionDOMNode::ImportObj, std::ref(*this), path);
178-
178+
179179
ImGui::OpenPopup("Importing Obj");
180180

181181
}
@@ -188,7 +188,7 @@ bool LMapCollisionDOMNode::Load(bStream::CMemoryStream* stream)
188188
mModel.mVertices.clear();
189189
mModel.mNormals.clear();
190190
mModel.mTriangles.clear();
191-
191+
192192
mGridScale = glm::vec3(stream->readFloat(), stream->readFloat(), stream->readFloat());
193193
mMinBounds = glm::vec3(stream->readFloat(), stream->readFloat(), stream->readFloat());
194194
mAxisLengths = glm::vec3(stream->readFloat(), stream->readFloat(), stream->readFloat());
@@ -198,7 +198,7 @@ bool LMapCollisionDOMNode::Load(bStream::CMemoryStream* stream)
198198
uint32_t triangleDataOffset = stream->readUInt32();
199199
uint32_t triangleGroupOffset = stream->readUInt32();
200200
uint32_t gridIndexOffset = stream->readUInt32();
201-
201+
202202
// duplicated for some reason
203203
gridIndexOffset = stream->readUInt32();
204204

@@ -210,7 +210,7 @@ bool LMapCollisionDOMNode::Load(bStream::CMemoryStream* stream)
210210
{
211211
mModel.mVertices.push_back(glm::vec3(stream->readFloat(), stream->readFloat(), stream->readFloat()));
212212
}
213-
213+
214214
stream->seek(normalDataOffset);
215215
for (size_t i = 0; i < (triangleDataOffset - normalDataOffset) / 0x0C; i++)
216216
{

0 commit comments

Comments
 (0)