Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Removed selfmade conversion functions

  • Loading branch information...
commit ca6481f45ee6e21b6b247537fa29406e9564fdfc 1 parent 913138d
@Phosfor Phosfor authored
View
6 include/Core/Utils.hpp
@@ -53,12 +53,6 @@ class Utils : public singleton<Utils>
ptime getCurrentTime() const;
void writeTimestamp();
string getTimeDifference();
-
- string bool2string(bool var) { return(var ? "true" : "false"); }
- string vec2string(const vec3 &v) { return FORMAT("vec3(x=%1%;y=%2%;z=%3%)", v.x % v.y % v.z); }
- string vec2string(const vec2 &v) { return FORMAT("vec2(x=%1%;y=%2%)", v.x % v.y); }
- string quat2string(const quat &q) { return FORMAT("quat(w=%1%;x=%2%;y=%3%;z=%4%)", q.w % q.x % q.y % q.z); }
- string color2string(const colour &c) { return FORMAT("color(r=%1%;g=%2%;b=%3%;a=%4%)", c.r % c.g % c.b % c.a); }
};
#endif
View
4 src/Managers/Entities/Camera.cpp
@@ -74,8 +74,8 @@ Camera *Camera::dump()
LOG_NOFORMAT(FORMAT("\t%1%: %2%\n", "FOV" % mCamera->getFOVy()));
LOG_NOFORMAT(FORMAT("\t%1%: %2%\n", "Near clip distance" % mCamera->getNearClipDistance()));
LOG_NOFORMAT(FORMAT("\t%1%: %2%\n", "Far clip distance" % mCamera->getFarClipDistance()));
- LOG_NOFORMAT(FORMAT("\t%1%: %2%\n", "Auto aspect ratio" % utils.bool2string(mCamera->getAutoAspectRatio())));
- LOG_NOFORMAT(FORMAT("\t%1%: %2%\n", "Active camera" % utils.bool2string(graphicSystem.getViewport()->getCamera() == mCamera)));
+ LOG_NOFORMAT(FORMAT("\t%1%: %2%\n", "Auto aspect ratio" % mCamera->getAutoAspectRatio()));
+ LOG_NOFORMAT(FORMAT("\t%1%: %2%\n", "Active camera" % (graphicSystem.getViewport()->getCamera() == mCamera)));
LOG_NOFORMAT(FORMAT("\t%1%: %2%\n", "Camera type" % mCamTypeStr));
return this;
}
View
8 src/Managers/Entities/Entity.cpp
@@ -153,8 +153,8 @@ void Entity::defaultDump()
LOG_NOFORMAT("\t ---Common settings---\n");
LOG_NOFORMAT(FORMAT("\t%1%: %2%\n", "Resource group" % mResGroup));
LOG_NOFORMAT(FORMAT("\t%1%: %2%\n", "Entity mesh" % mEntityMesh));
- LOG_NOFORMAT(FORMAT("\t%1%: %2%\n", "Visible" % utils.bool2string(isDrawable())));
- LOG_NOFORMAT(FORMAT("\t%1%: %2%\n", "Position" % utils.vec2string(getPosition())));
- LOG_NOFORMAT(FORMAT("\t%1%: %2%\n", "Orientation" % utils.quat2string(getOrientation())));
- LOG_NOFORMAT(FORMAT("\t%1%: %2%\n", "Scale" % utils.vec2string(getScale())));
+ LOG_NOFORMAT(FORMAT("\t%1%: %2%\n", "Visible" % isDrawable()));
+ LOG_NOFORMAT(FORMAT("\t%1%: %2%\n", "Position" % getPosition()));
+ LOG_NOFORMAT(FORMAT("\t%1%: %2%\n", "Orientation" % getOrientation()));
+ LOG_NOFORMAT(FORMAT("\t%1%: %2%\n", "Scale" % getScale()));
}
Please sign in to comment.
Something went wrong with that request. Please try again.