main scene set up

Wilhelman · Oct 2, 2018 · b2be9d4 · b2be9d4
1 parent 13e6445
commit b2be9d4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Tabula Rasa Engine/3D_Engine/3D_Engine.vcxproj b/Tabula Rasa Engine/3D_Engine/3D_Engine.vcxproj
@@ -217,7 +217,7 @@
     <ProjectGuid>{2AF9969B-F202-497B-AF30-7BEF9CE8005E}</ProjectGuid>
     <RootNamespace>tabula_rasa_engine</RootNamespace>
     <ProjectName>Tabula Rasa Engine</ProjectName>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

diff --git a/Tabula Rasa Engine/3D_Engine/trMainScene.cpp b/Tabula Rasa Engine/3D_Engine/trMainScene.cpp
@@ -12,6 +12,7 @@
 #include "PArrow.h"
 #include "PFrustum.h"
 #include "PCylinder.h"
+#include "PSphere.h"
 
 #include "trPrimitives.h"
 
@@ -91,6 +92,12 @@ void trMainScene::Draw()
 
 	PFrustum frustum;
 	frustum.Render();
+
+	PSphere sphere(math::vec(2.f, 3.f, -2.f), 1);
+	sphere.Render();
+
+	PSphere sphere2(math::vec(2.f, 6.f, -2.f), 3);
+	sphere2.Render();
 
 }