added pch on xcode, fixed Node move semantic

This commit is contained in:
Omar Mohamed Ali Mudhir
2017-01-27 14:55:16 +00:00
parent a4be7c0e4d
commit baaade6050
4 changed files with 14 additions and 2 deletions

View File

@@ -170,6 +170,8 @@ void Node::load(const char* path)
tinyxml2::XMLDocument xml;
auto ret = xml.LoadFile(path);
if (ret != tinyxml2::XMLError::XML_SUCCESS)
return;
load_internal(xml.RootElement());
}

View File

@@ -110,7 +110,7 @@ public:
glm::vec4 m_clip;
Node(const Node&) = delete;
Node& operator=(const Node&) = delete;
Node& operator=(Node&& o) { return Node(std::forward<Node>(o)); }
Node&& operator=(Node&& o) { return std::forward<Node>(o); }
Node(Node&& o)
{
children = std::move(o.children);

View File

@@ -1,4 +1,4 @@
#pragma once
//#pragma once
#ifdef __APPLE__
#include <OpenGL/gl3.h>
@@ -12,6 +12,7 @@
#include <gl\GL.h>
#endif
#ifdef __cplusplus
#include <map>
#include <cmath>
#include <stack>
@@ -32,3 +33,4 @@
#include <tinyxml2.h>
#include <yoga/Yoga.h>
#endif