From: Peter Schaefer <schaeferpm@gmail.com>
Date: Wed, 15 Apr 2015 14:31:09 +0000 (+0200)
Subject: fixed Player Texture
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=ba2264f60be0b595a7f8717a4874341c3827997d;p=cgue_weave.git

fixed Player Texture
fixed ViewLimits&Speed
playermodel is used for player
---

diff --git a/Weave/Game.cpp b/Weave/Game.cpp
index d4c5817..31eab2f 100644
--- a/Weave/Game.cpp
+++ b/Weave/Game.cpp
@@ -39,14 +39,14 @@ Game::Game() : playing(true)
 {
 	srand((int)time(NULL));
 	// Hauptfenster
-	Scene* tmp_Scene = new Scene(0, 0, Graphix::getWindowWidth(), Graphix::getWindowHeight(), 45, 0.1f, 10, vec3(0.0f, 0.0f, -2.0f));
+	Scene* tmp_Scene = new Scene(0, 0, Graphix::getWindowWidth(), Graphix::getWindowHeight(), 45, 0.1f, 15, vec3(0.0f, 0.0f, 0.f));
 	layer[0] = tmp_Scene;
 
 	//Allg Shader
 	Shader* shader1 = new Shader("basicTexture_VS.hlsl", "lightingTexture_FS.hlsl");
 
 	//Player
-	SceneObject* tmp_playerObject = new SceneObject(shader1, translate(vec3(1.f, 0.f, 1.f)), "cow/cow.dae", "model_cow.jpg");
+	SceneObject* tmp_playerObject = new SceneObject(shader1, translate(vec3(1.f, 0.f, 1.f)), "Player.dae", "model_player.png");
 
 	//tmp_playerObject->setIntelligenz(new PlayerI(tmp_playerObject));
 	tmp_Scene->addObject(tmp_playerObject);
diff --git a/Weave/Graphix/MetaModel.cpp b/Weave/Graphix/MetaModel.cpp
index d989594..6c26124 100644
--- a/Weave/Graphix/MetaModel.cpp
+++ b/Weave/Graphix/MetaModel.cpp
@@ -1,6 +1,5 @@
 #include "MetaModel.h"
 
-#include <list>
 #include <assimp/Importer.hpp>
 #include <assimp/scene.h>
 #include <assimp/postprocess.h>
diff --git a/Weave/Graphix/Scene.cpp b/Weave/Graphix/Scene.cpp
index 92259ff..b90e333 100644
--- a/Weave/Graphix/Scene.cpp
+++ b/Weave/Graphix/Scene.cpp
@@ -89,7 +89,7 @@ void Scene::update(float deltaT)
 	//int reset = Events::getAction2();
 
 	// XYAchse um den Player
-	viewPort->rotateView(0.005f*Events::getViewX(), 0.002f*Events::getViewY());
+	viewPort->rotateView(0.002f*Events::getViewX(), 0.001f*Events::getViewY());
 
 	// MOVE Player
 	if (move_x)
diff --git a/Weave/Graphix/ViewPort.cpp b/Weave/Graphix/ViewPort.cpp
index 70e1ab1..d37eb43 100644
--- a/Weave/Graphix/ViewPort.cpp
+++ b/Weave/Graphix/ViewPort.cpp
@@ -5,7 +5,7 @@
 
 #include "Shader.h"
 
-#define VIEW_TOP_LIM 0.8f
+#define VIEW_TOP_LIM 0.9f
 #define VIEW_BOT_LIM -0.3f
 
 
@@ -59,14 +59,14 @@ void ViewPort::rotateView(float angle_x, float angle_y){
 		if (view_angle_y < VIEW_BOT_LIM)
 			view_angle_y = VIEW_BOT_LIM;
 
-		view = translate(vec3(0.f, 0.f, -view_dist))*rotate(view_angle_y *(float)M_PI_4, vec3(1.f, 0.f, 0.f))*rotate(view_angle_x * (float)M_PI_4, vec3(0.f, 1.f, 0.f));
+		view = translate(vec3(0.f, 0.f, -view_dist))*rotate(view_angle_y *(float)M_PI_2, vec3(1.f, 0.f, 0.f))*rotate(view_angle_x * (float)M_PI_2, vec3(0.f, 1.f, 0.f));
 
 	}
 
 }
 
 vec3 ViewPort::rotateDirection(const vec3 & direction) const{
-	return glm::rotateY(direction, -view_angle_x * (float)M_PI_4);
+	return glm::rotateY(direction, -view_angle_x * (float)M_PI_2);
 }
 
 unsigned int ViewPort::getXPos() const
diff --git a/Weave/Weave.vcxproj b/Weave/Weave.vcxproj
index 64ce305..c8bc3f6 100644
--- a/Weave/Weave.vcxproj
+++ b/Weave/Weave.vcxproj
@@ -55,6 +55,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)include/freetype2</AdditionalIncludeDirectories>
+      <BrowseInformation>true</BrowseInformation>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -64,6 +65,9 @@
       <IgnoreSpecificDefaultLibraries>
       </IgnoreSpecificDefaultLibraries>
     </Link>
+    <Bscmake>
+      <PreserveSbr>true</PreserveSbr>
+    </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='bin|Win32'">
     <ClCompile>
diff --git a/textures/model_player.png b/textures/model_player.png
index e2a4d9d..19601c1 100644
Binary files a/textures/model_player.png and b/textures/model_player.png differ
diff --git a/textures/model_player.psb b/textures/model_player.psb
index 88e4fcc..d082b39 100644
Binary files a/textures/model_player.psb and b/textures/model_player.psb differ