fixed Player Texture

fixed ViewLimits&Speed
playermodel is used for player

diff --git a/Weave/Game.cpp b/Weave/Game.cpp
index d4c58174337b951ce8f237b93509aa081f1da8a4..31eab2fc6c1597a9935fd23f4a24a2bf1c99b40d 100644 (file)
--- 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 d989594449638f11daa9d037283bc3c4feec719c..6c261240f01a889cb66a17d71baac235a0469082 100644 (file)
--- 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 92259ff3bc18225c9fce6507dfa41f196193b3f8..b90e3339f77ff81a842148398d59009c452f0c83 100644 (file)
--- 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 70e1ab184ab538509fc3862c7d19b91368a02ee9..d37eb4357cfdfdc414fa1f356020dd9525f3ea4f 100644 (file)
--- 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 64ce3052629d7e996c2b4b7acaef83d570bf6076..c8bc3f6319d8df877b7d1207051c5566391b44cb 100644 (file)
--- 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 e2a4d9da5ed545025e191e2d60ed736663a6e103..19601c1a18b3cb596f24dfe1f6054761e3c6b0bb 100644 (file)
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 88e4fcca88adb3b6dca09f75295e831b10693ec9..d082b39a7028fa62c4e9e1d806106a64aa55ed2e 100644 (file)
Binary files a/textures/model_player.psb and b/textures/model_player.psb differ