Merge branch 'master' of https://github.com/Faerbit/swp

converter/converter.cc

@@ -264,6 +264,7 @@ std::vector<int> Converter::newComposition(int type, float posX, float posZ){
     XMLElement* trigger = doc->NewElement("trigger");
     newComposition->InsertEndChild(trigger);
     XMLElement* name = doc->NewElement("name");
+    XMLElement* undo = doc->NewElement("undo");
     XMLElement* xPosition = doc->NewElement("xPosition");
     XMLElement* yPosition = doc->NewElement("yPosition");
     XMLElement* zPosition = doc->NewElement("zPosition");
@@ -278,6 +279,7 @@ std::vector<int> Converter::newComposition(int type, float posX, float posZ){
     XMLElement* toChangeObjNum = doc->NewElement("toChangeObjNum");
     
     name->SetText("-");
+    undo->SetText("false");
     xPosition->SetText("0");
     yPosition->SetText("0");
     zPosition->SetText("0");
@@ -292,6 +294,7 @@ std::vector<int> Converter::newComposition(int type, float posX, float posZ){
     toChangeObjNum->SetText("0");
     
     trigger->InsertEndChild(name);
+    trigger->InsertEndChild(undo);
     trigger->InsertEndChild(xPosition);
     trigger->InsertEndChild(yPosition);
     trigger->InsertEndChild(zPosition);

data/levels/Level1.xml

@@ -11921,18 +11921,19 @@
     <idBlue>105</idBlue>
     <typeID>20</typeID>
     <trigger>
-        <name>-</name>
+        <name>resetPlayer</name>
+        <undo>false</undo>
         <xPosition>0</xPosition>
-        <yPosition>0</yPosition>
+        <yPosition>-100000</yPosition>
         <zPosition>0</zPosition>
         <targetIdGreen>-</targetIdGreen>
         <targetIdBlue>-</targetIdBlue>
-        <distance>1.0</distance>
+        <distance>100015</distance>
         <isBiggerThan>false</isBiggerThan>
         <objectNum>0</objectNum>
-        <luaScript>-</luaScript>
+        <luaScript>resetPlayer.lua</luaScript>
         <toChangeIdGreen>0</toChangeIdGreen>
-        <toChangeIdBlue>0</toChangeIdBlue>
+        <toChangeIdBlue>105</toChangeIdBlue>
         <toChangeObjNum>0</toChangeObjNum>
     </trigger>
 </composition>
@@ -12114,7 +12115,7 @@
 </terrain>
 
 <skydome>
-    <texture>skydome.png</texture>
+    <texture>skydomeNew.png</texture>
 </skydome>
 
 <physics>

data/levels/scripts/resetPlayer.lua

@@ -0,0 +1,17 @@
+local global = require( "global" )
+if(global.triggeredResetPlayer == nil) then
+    global.triggeredResetPlayer = false
+end
+function trigger(objectToChange)
+    if(global.triggeredResetPlayer == false) then
+        if(not level) then
+            print("No level found in Lua!")
+            return
+        end
+        
+        level:resetPlayer()
+        
+        --global.triggeredResetPlayer = true
+        print("reset player")
+    end
+end

data/shader/skydome.fsh

@@ -0,0 +1,18 @@
+#version 150
+
+in vec2 vTexCoord;
+in vec4 fragPosition;
+
+out vec4 oColor;
+
+uniform sampler2D uTexture;
+uniform float farPlane;
+uniform vec4 fogColor;
+uniform vec3 cameraCenter;
+
+void main() {
+    float distanceCameraCenter = distance(cameraCenter, vec3(fragPosition));
+    float fogFactor = clamp((1.0 - ((farPlane - 35.0) -distanceCameraCenter)/30.0), 0.0, 1.0);
+    fogFactor *= clamp((1.0-((fragPosition.y-40.0)/30.0)), 0.0, 1.0);
+    oColor = mix(texture(uTexture, vTexCoord), fogColor, fogFactor);
+}

data/shader/skydome.vsh

@@ -0,0 +1,17 @@
+#version 150
+
+in vec3 aPosition;
+in vec3 aNormal;
+in vec2 aTexCoord;
+
+uniform mat4 modelMatrix;
+uniform mat4 modelViewProjectionMatrix;
+
+out vec2 vTexCoord;
+out vec4 fragPosition;
+
+void main() {
+    fragPosition = modelMatrix * vec4(aPosition, 1.0);
+    vTexCoord = aTexCoord;
+    gl_Position = modelViewProjectionMatrix * vec4(aPosition, 1.0);
+}

graphics.cc

@@ -70,6 +70,9 @@ void Graphics::init(Level* level) {
     lightingShader = ShaderProgramCreator("phong").attributeLocations(
             vao->getAttributeLocations()).create();
 
+    skydomeShader = ShaderProgramCreator("skydome").attributeLocations(
+            vao->getAttributeLocations()).create();
+    
     depthShader = ShaderProgramCreator("depth")
         .attributeLocations(vao->getAttributeLocations()).create();
 
@@ -236,6 +239,17 @@ void Graphics::render(double time)
     framebuffer_light->bind();
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
+    //set view and projection matrix
+    glm::mat4 lightingViewProjectionMatrix = glm::perspective(1.571f, (float)windowSize.x/(float)windowSize.y, 0.1f, farPlane) * buildViewMatrix(level);
+
+    //render skydome
+    skydomeShader->use();
+    // set fog Parameters
+    skydomeShader->setUniform("farPlane", farPlane);
+    skydomeShader->setUniform("fogColor", level->getFogColour());
+    skydomeShader->setUniform("cameraCenter", level->getCameraCenter()->getPosition());
+    level->getSkydome()->render(skydomeShader, false, true, &lightingViewProjectionMatrix);
+    
     lightingShader->use();
 
     //set lighting parameters
@@ -273,9 +287,6 @@ void Graphics::render(double time)
     lightingShader->setUniform("ambientColor", level->getAmbientLight());
     lightingShader->setUniform("camera", level->getPhysics()->getCameraPosition());
     
-    //set view and projection matrix
-    glm::mat4 lightingViewProjectionMatrix = glm::perspective(1.571f, (float)windowSize.x/(float)windowSize.y, 0.1f, farPlane) * buildViewMatrix(level);
-    
     // render the level
     level->render(lightingShader, true, &lightingViewProjectionMatrix, &depthBiasVPs);
 
@@ -285,7 +296,6 @@ void Graphics::render(double time)
     glEnable(GL_CULL_FACE);
     glCullFace(GL_BACK);
 
-
     // draw with colors
     flameShader->setUniform("viewProjectionMatrix", lightingViewProjectionMatrix);
     flameShader->setUniform("modelViewProjectionMatrix", lightingViewProjectionMatrix);

graphics.hh

@@ -31,6 +31,7 @@ class Graphics {
         float farPlane;
         std::vector<Light> closestLights;
         SharedShaderProgram lightingShader;
+        SharedShaderProgram skydomeShader;
         SharedShaderProgram depthCubeShader;
         SharedShaderProgram depthShader;
         SharedShaderProgram flameShader;

level.cc

@@ -38,6 +38,7 @@ void Level::load() {
         .addFunction("deleteObject", &Level::deleteObject)
         .addFunction("getObjectCount", &Level::getPhysicsObjectsVectorSize)
         .addFunction("moveObject", &Level::moveObject)
+        .addFunction("resetPlayer", &Level::resetPlayer)
         .endClass();
     //Push the level to Lua as a global variable
     luabridge::push(luaState, this);
@@ -49,9 +50,11 @@ void Level::load() {
 void Level::render(ACGL::OpenGL::SharedShaderProgram shader, bool lightingPass,
         glm::mat4* viewProjectionMatrix, std::vector<glm::mat4>* shadowVPs) {
     for(unsigned int i = 0; i<objects.size(); i++) {
-        // do not project shadow of skydome 
+        if (lightingPass) {
-        if(lightingPass || (objects.at(i) != skydome)) {
+            objects.at(i)->render(shader, lightingPass, true, viewProjectionMatrix, shadowVPs);
-            objects.at(i)->render(shader, lightingPass, viewProjectionMatrix, shadowVPs);
+        }
+        else {
+            objects.at(i)->render(shader, lightingPass, false, viewProjectionMatrix, shadowVPs);
         }
     }
 }
@@ -185,7 +188,12 @@ void Level::deleteObject(int objectIndex){
 void Level::resetPlayer(){
     Loader loader = Loader();
     glm::vec3 newPosition = loader.reloadPlayerPosition(xmlFilePath, this);
-    //TODO cameraCenter.setPosition(newPosition);
+    physics.forceMove(newPosition, playerIndex);
+    physics.forceMoveCamera(newPosition + glm::vec3(1,0,0));
+}
+
+void Level::setPlayerIndex(int index){
+    playerIndex = index;
 }
 
 void Level::setStrength(float strength) {
@@ -247,3 +255,7 @@ lua_State* Level::getLuaState() {
 Terrain* Level::getTerrain() {
     return &terrain;
 }
+
+Object* Level::getSkydome() {
+    return skydome;
+}

level.hh

@@ -36,6 +36,7 @@ class Level {
         glm::vec4 getFogColour();
         void setSkydomeSize(float size);
         float getSkydomeSize();
+        Object* getSkydome();
         std::vector<Object*>* getObjects();
         std::vector<Object*>* getPhysicsObjects();
         void deleteObject(int objectIndex);
@@ -56,6 +57,7 @@ class Level {
         lua_State* getLuaState();
         Terrain* getTerrain();
         void resetPlayer();
+        void setPlayerIndex(int index);
     private:
         lua_State* luaState=nullptr;
         std::vector<Object*> objects;
@@ -66,6 +68,7 @@ class Level {
         glm::vec4 fogColour;
         Light directionalLight;
         Object* cameraCenter;
+        int playerIndex;
         Object* skydome;
         Physics physics;
         Camera camera;

loader.cc

@@ -85,7 +85,6 @@ void Loader::load(std::string filePath, Level* level, std::string compositionsPa
     Material skydomeMaterial = Material(skydomeTexture, 0.7f, 0.0f, 0.0f, 0.0f);
     Object* skydomeObject = new Object(skydomeModel, skydomeMaterial, glm::vec3(0.0f, 0.0f, 0.0f),
         glm::vec3(0.0f, 0.0f, 0.0f), true);
-    level->addObject(skydomeObject);
     level->setSkydomeObject(skydomeObject);
     
     //load lighting parameters
@@ -259,6 +258,7 @@ void Loader::load(std::string filePath, Level* level, std::string compositionsPa
                             
                             if(compositionType == 20){
                                 level->setCameraCenter(object);
+                                level->setPlayerIndex(objectIdentifier[1]);
                             }
                         }//objectData found
                     }//finding the objectData

object.cc

@@ -14,18 +14,22 @@ Object::~Object() {
 }
 
 void Object::render(ACGL::OpenGL::SharedShaderProgram shader, bool lightingPass,
-    glm::mat4* viewProjectionMatrix, std::vector<glm::mat4>* additionalMatrices) {
+    bool texturePass, glm::mat4* viewProjectionMatrix,
+    std::vector<glm::mat4>* additionalMatrices) {
     if (!renderable) {
         return;
     }
     glm::mat4 modelMatrix = glm::translate(getPosition()) * getRotation() * glm::scale<float>(glm::vec3(model.getScale()));
+    if(texturePass) {
+        shader->setTexture("uTexture", material.getReference(), 0);
+        shader->setUniform("modelMatrix", modelMatrix);
+    }
     if (lightingPass) {
     // set lightning parameters for this object
         shader->setUniform("ambientFactor", material.getAmbientFactor());
         shader->setUniform("diffuseFactor", material.getDiffuseFactor());
         shader->setUniform("specularFactor", material.getSpecularFactor());
         shader->setUniform("shininess", material.getShininess());
-        shader->setTexture("uTexture", material.getReference(), 0);
         // set model matrix
         shader->setUniform("modelMatrix", modelMatrix);
         // set shadowMVPs

object.hh

@@ -16,7 +16,8 @@ class Object : public Entity {
         Object();
         ~Object();
         void render(ACGL::OpenGL::SharedShaderProgram shader, bool lightingPass,
-            glm::mat4* viewProjcetionMatrix, std::vector<glm::mat4>* additionalMatrices);
+            bool texturePass, glm::mat4* viewProjcetionMatrix,
+            std::vector<glm::mat4>* additionalMatrices=0);
     private:
         Model model;
         Material material;

physics.cc

@@ -414,6 +414,26 @@ void Physics::addSphere(float rad, Entity entity, float mass, float dampningL, f
         throw std::invalid_argument( "Bodies out of Sync" );
 }
 
+void Physics::prepareCollisionDetection()
+{
+    playerTerrainCol = playerObjectColision = false;
+    int numManifods = world->getDispatcher()->getNumManifolds();
+    
+    for (int i=0;i<numManifods;i++)
+    {
+    }
+}
+
+bool Physics::playerWithGround()
+{
+    return playerTerrainCol;
+}
+
+bool Physics::playerWithObject()
+{
+    return playerObjectColision;
+}
+
 void Physics::addCamera() //Camera Creator automatically called when player is created
 {
     btSphereShape* sphere = new btSphereShape(0.2f); //we use this to make a more interesting camera, that does not interpenetrate with the terrain/objects
@@ -496,7 +516,7 @@ void Physics::updateCameraPos(glm::vec2 mouseMovement, float strength, float dis
         currentDirection = compare;
     }
     
-    currentDirection = currentDirection.rotate(btVector3(0,1,0),mouseMovement.y/100);
+    currentDirection = currentDirection.rotate(btVector3(0,1,0),-mouseMovement.y/100);
     currentDirection.normalize();
 }
 
@@ -557,6 +577,14 @@ void Physics::addStaticGroundPlane()
 void Physics::forceMove(glm::vec3 newPosition, unsigned indice)//ugly, but needed for reset
 {
     bodies[indice]->setCenterOfMassTransform(btTransform(btQuaternion(0,0,0,1),btVector3(newPosition.x,newPosition.y,newPosition.z)));
+    bodies[indice]->setLinearVelocity(btVector3(0,0,0));
+}
+
+void Physics::forcePlayer(glm::vec3 newPosition)//ugly, but needed for reset
+{
+    playerBall->setCenterOfMassTransform(btTransform(btQuaternion(0,0,0,1),btVector3(newPosition.x,newPosition.y,newPosition.z)));
+    playerBall->setLinearVelocity(btVector3(0,0,0));
+    forceMoveCamera(newPosition + glm::vec3(currentDirection.x()*cameraDistance,currentDirection.y()*cameraDistance,currentDirection.z()*cameraDistance));
 }
 
 void Physics::forceMoveCamera(glm::vec3 newPosition)

physics.hh

@@ -74,6 +74,10 @@ class Physics {
 	void forceMove(glm::vec3 newPosition, unsigned indice);
 	void forceMoveCamera(glm::vec3 newPosition);    
 	void addConvexBody(Entity entity, std::string path, float mass, float dampningL, float dampningA, unsigned indice, float scaling, bool rotate);
+	void prepareCollisionDetection();
+	bool playerWithGround();
+	bool playerWithObject();
+    void forcePlayer(glm::vec3 newPosition);
 
     struct positionConstraint{btRigidBody* body; float strength; btVector3 position;};
 
@@ -98,6 +102,8 @@ class Physics {
     int counter = 0;
     std::string geometryPath;
     float cameraDistance = 5; //distance of the camera to the player.
+    bool playerTerrainCol = false;
+    bool playerObjectColision = false;
 };
 
 enum collisionTypes{