Skip to content

#120 XmlMapLoader: Remove support for exit door <end> #191

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
kaif3007 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

#120 XmlMapLoader: Remove support for exit door <end> #191

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
1 change: 0 additions & 1 deletion include/radix/data/map/XmlMapLoader.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ class XmlMapLoader : public MapLoader {
*/
void extractSpawn();
void extractLights();
void extractDoor();
void extractWalls();
void extractAcids();
void extractDestinations();
Expand Down
19 changes: 1 addition & 18 deletions source/data/map/XmlMapLoader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ void XmlMapLoader::load(const std::string &path) {

extractMaterials();
extractSpawn();
extractDoor();
extractModels();
extractLights();
extractWalls();
Expand Down Expand Up @@ -132,23 +131,6 @@ void XmlMapLoader::extractLights() {
}
}

void XmlMapLoader::extractDoor() {
PROFILER_BLOCK("XmlMapLoader::extractDoor", profiler::colors::Red100);
tinyxml2::XMLElement *endElement = rootHandle.FirstChildElement("end").ToElement();

if (endElement) {
entities::StaticModel &door = world.entityManager.create<entities::StaticModel>();
Vector3f position;
XmlHelper::extractPosition(endElement, position);
door.setPosition(position);
Vector3f angles;
XmlHelper::extractRotation(endElement, angles);
door.setOrientation(Quaternion().fromAero(angles));
door.material = MaterialLoader::loadFromXML("door/door");
door.mesh = MeshLoader::getMesh("Door.obj");
}
}

void XmlMapLoader::extractWalls() {
PROFILER_BLOCK("XmlMapLoader::extractWalls", profiler::colors::Red100);
tinyxml2::XMLElement *wallBoxElement = rootHandle.FirstChildElement("wall").ToElement();
Expand Down Expand Up @@ -263,4 +245,5 @@ void XmlMapLoader::extractModels() {
} while ((modelElement = modelElement->NextSiblingElement("model")) != nullptr);
}
}

} /* namespace radix */