From 78ab808b8b8212899e95b48b463e7c2e8d1f99dd Mon Sep 17 00:00:00 2001 From: omigamedev Date: Thu, 19 Jan 2017 13:45:21 +0000 Subject: [PATCH] added Yoga and TinyXML2 libraries and created a testing layout.xml --- data/layout.xml | 4 ++++ engine.vcxproj | 26 ++++++++++++++++++++++---- engine.vcxproj.filters | 9 +++++++++ engine/app.cpp | 6 ++++++ engine/pch.h | 4 ++++ 5 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 data/layout.xml diff --git a/data/layout.xml b/data/layout.xml new file mode 100644 index 0000000..1d49482 --- /dev/null +++ b/data/layout.xml @@ -0,0 +1,4 @@ + + + + diff --git a/engine.vcxproj b/engine.vcxproj index c5c5c86..0dfa780 100644 --- a/engine.vcxproj +++ b/engine.vcxproj @@ -71,22 +71,22 @@ true - libs\glm;libs\glew-2.0.0\include;libs\stb;$(IncludePath) + libs\glm;libs\glew-2.0.0\include;libs\stb;libs\tinyxml2;libs\yoga;$(IncludePath) libs\glew-2.0.0\lib\Release\$(Platform);$(LibraryPath) true - libs\glm;libs\glew-2.0.0\include;libs\stb;$(IncludePath) + libs\glm;libs\glew-2.0.0\include;libs\stb;libs\tinyxml2;libs\yoga;$(IncludePath) libs\glew-2.0.0\lib\Release\$(Platform);$(LibraryPath) false - libs\glm;libs\glew-2.0.0\include;libs\stb;$(IncludePath) + libs\glm;libs\glew-2.0.0\include;libs\stb;libs\tinyxml2;libs\yoga;$(IncludePath) libs\glew-2.0.0\lib\Release\$(Platform);$(LibraryPath) false - libs\glm;libs\glew-2.0.0\include;libs\stb;$(IncludePath) + libs\glm;libs\glew-2.0.0\include;libs\stb;libs\tinyxml2;libs\yoga;$(IncludePath) libs\glew-2.0.0\lib\Release\$(Platform);$(LibraryPath) @@ -162,6 +162,24 @@ + + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + diff --git a/engine.vcxproj.filters b/engine.vcxproj.filters index 4ab85ae..a436275 100644 --- a/engine.vcxproj.filters +++ b/engine.vcxproj.filters @@ -36,6 +36,15 @@ Source Files + + Source Files + + + Source Files + + + Source Files + diff --git a/engine/app.cpp b/engine/app.cpp index 68f0302..2fc3d8f 100644 --- a/engine/app.cpp +++ b/engine/app.cpp @@ -52,6 +52,12 @@ void App::init() "void main(){" " frag = col;" "}"; + + tinyxml2::XMLDocument xml; + auto ret = xml.LoadFile("data\\layout.xml"); + auto root = xml.RootElement(); +// root-> + shader.create(shader_v, shader_f); shader_color.create(shader_color_v, shader_color_f); shader_uv.create(shader_v, shader_uv_f); diff --git a/engine/pch.h b/engine/pch.h index 102ff13..0cd8bcf 100644 --- a/engine/pch.h +++ b/engine/pch.h @@ -25,3 +25,7 @@ #include #include #include + +#include +#include +#include