Now includes generated make/proj files, other small changes

Author: flipcoder

.gitignore

@@ -4,3 +4,5 @@ bin/log.txt
 bin/*.exe
 bin/*.dll
 bin/*.so
+obj/*
+build/obj/*

bin/data/base/shaders/bump.fp

@@ -44,7 +44,7 @@ void main(void)
 	if(shine > EPSILON)
 	{
 		shine = 1.0 / shine;
-		specular = pow(clamp(dot(reflect(-eye, bump), light), 0.0, 1.0), shine) * 1.0;
+		specular = pow(clamp(dot(reflect(-eye, bump), light), 0.0, 1.0), shine) * 0.5; // 1.0
 	}
 	else
 		specular = 0.0f;
@@ -79,12 +79,12 @@ void main(void)
 	else
 		atten_frag = 1.0;
 
-	/*vec4 fog_color = vec4(0.0, 0.0, 0.0, 1.0);*/
-	/*float fog_factor = eye_dist / 20.0f;*/
+    vec4 fog_color = vec4(0.0, 0.0, 0.0, 1.0);
+    float fog_factor = eye_dist / 20.0f;
+    
+    vec4 lit = color_frag * occ * atten_frag * lightcolor;
 
-	vec4 lit = color_frag * occ * atten_frag * lightcolor;
-	
-	gl_FragColor = lit;
-	/*gl_FragColor = mix(lit, fog_color, clamp(fog_factor,0.0,1.0));*/
+	/*gl_FragColor = lit;*/
+    gl_FragColor = mix(lit, fog_color, clamp(fog_factor,0.0,1.0));
 }
 

build.sh

@@ -1,7 +1,11 @@
 #!/bin/bash
 
-rm bin/qor
+rm bin/qor > /dev/null
+
+# generate project/make files
+premake4 vs2010 > /dev/null
 premake4 gmake > /dev/null
-pushd build > /dev/null
+
+# run native make file
 make 2>&1
-popd
+

premake4.lua

@@ -1,7 +1,6 @@
 solution("qor")
     configurations {"Debug", "Release"}
 
-    location("build")
     targetdir("bin")
 
     configuration "Debug"

src/Actor.cpp

@@ -13,7 +13,7 @@ Actor::Actor(Input* input)
     m_fAccel = 80.0f;
     m_fDecel = 20.0f;
     m_fRadius = 0.3f;
-    m_fHeight = 2.0f, // 1.6
+    m_fHeight = 1.6f, // 2.0
     m_fJumpAccel = 100.0f;
     m_fJumpLength = 1.0f/16.0f;
     m_fJumpForce = m_fJumpLength;

src/Console.h

@@ -10,7 +10,7 @@
 
 class Console : public IFallible
 {
-    static const int FONT_HEIGHT = 18;
+    static const int FONT_HEIGHT = 10;
 
     //Font* m_pFont;
     std::shared_ptr<FTGLPixmapFont> m_spFont;

src/EulerNode.cpp

@@ -154,7 +154,9 @@ void EulerNode :: tilt(float deg)
 
 glm::vec3 EulerNode :: getRotationHeading() const
 {
-    if(floatcmp(abs(m_pitch.degrees()), 90.0f))
+    if(floatcmp(m_pitch.degrees(), 90.0f))
+        return -Matrix::upXZ(*matrix_c());
+    else if(floatcmp(m_pitch.degrees(), -90.0f))
         return Matrix::upXZ(*matrix_c());
     return Matrix::headingXZ(*matrix_c());
     //    return matrix_c()->up().XZ().unit();

src/Light.h

@@ -21,7 +21,12 @@ class Light : public Node
         Light():
             m_Type(POINT),
             m_Atten(glm::vec3(1.0f, 0.0f, 0.0f))
-        {}
+        {
+            // TODO: Use light cutoffs for AABB, instead of temp:
+            m_Box.min = glm::vec3(-0.5f);
+            m_Box.max = glm::vec3(0.5f);
+        }
+        virtual ~Light() {}
 
         // bind: to be called only by Scene during a render
         //  id is generated at time of render and may change!
@@ -99,6 +104,9 @@ class Light : public Node
 
         virtual SCOPED_ENUM_TYPE(NodeType) nodeType() const { return NodeType::LIGHT; }
         virtual std::string nodeTypeString() const { return "light"; }
+
+        virtual const AABB* box(unsigned int flags = 0) const { return &m_Box; }
+        virtual AABB* box(unsigned int flags = 0) { return &m_Box; }
 
     private:
 
@@ -107,6 +115,8 @@ class Light : public Node
         Color m_Specular;
         glm::vec3 m_Atten; // c, l, q
         Type m_Type;
+
+        AABB m_Box;
 };
 
 #endif

src/Node.cpp

@@ -178,14 +178,20 @@ void Node :: render(Partitioner* partitioner, unsigned int flags) const
     //    glMultMatrixf(glm::value_ptr(*matrix_c()));
     //else
     //{
-        glm::mat4 modelview = *Renderer::get().getViewMatrix() * *matrix_c(S_WORLD);
-        glLoadMatrixf(glm::value_ptr(modelview));
+    //
     //}
     //glMultMatrixf(glm::value_ptr(*matrix_c()));
+    if(flags & RENDER_USE_STACK)
+        glMultMatrixf(glm::value_ptr(*matrix_c()));
 
     // render self
-    if(visible() && (!hasAttribute(NodeAttributes::SIZE) || inView(partitioner)))
+    if(visible() && (!hasAttribute(NodeAttributes::SIZE) || inView(partitioner))) {
+        if(!(flags & RENDER_USE_STACK)) {
+            glm::mat4 modelview = *Renderer::get().getViewMatrix() * *matrix_c(S_WORLD);
+            glLoadMatrixf(glm::value_ptr(modelview));
+        }
         renderSelf(partitioner, flags);
+    }
 
     // render children
     if(!(flags & RENDER_SELF_ONLY))

src/Node.h

@@ -1,21 +1,11 @@
-/**
- * @file Node.h
- * @author Grady O'Connell <grady <at> prolificaxis <dot> com>
+/*
+ * Node.h
  *
- * @section LICENSE
- *
- * For internal use only. Do not redistribute.
- * © 2011 Prolific Axis, LLC
- *
- * @section DESCRIPTION
- *
- * Basic Node Class
- * Connects to a parent to store hierarchal transformations
- * Handles children using a simple list (no smart ordering or partioning)
- * Handles position and transformation through a 4x4 Matrix.
- * Transform can be changed (to Euler or Quat, perhaps) by overloading matrix[_c]() accessors
- */
-
+* - Connects to a parent to store hierarchal transformations
+* - Handles children using a simple list (no smart ordering or partioning)
+* - Handles position and transformation through a 4x4 Matrix.
+* - Transform can be changed (to Euler or Quat, perhaps) by overloading matrix[_c]() accessors
+*/
 
 #ifndef _NODE_H
 #define _NODE_H
@@ -211,8 +201,9 @@ class Node : public std::enable_shared_from_this<Node>
     enum eRenderFlags
     {
         RENDER_USE_STACK=BIT(0),
-        RENDER_SELF_ONLY=BIT(1)
-        //RENDER_AMBIENT_PASS=BIT(2)
+        RENDER_SELF_ONLY=BIT(1),
+        RENDER_AMBIENT_PASS=BIT(2),
+        RENDER_INDICATORS=BIT(3)
     };
     virtual void renderSelf(Partitioner* partitioner = NULL, unsigned int flags = 0) const;
     virtual void render(Partitioner* partitioner = NULL, unsigned int flags = 0) const;

src/Scene.cpp

@@ -480,7 +480,7 @@ void Scene::render(Node* from) const
     // initial pass
     // TODO: bind an ambient shader here!
     glDisable(GL_BLEND);
-    m_spRoot->render(m_spPartitioner.get());
+    m_spRoot->render(m_spPartitioner.get(), Node::RENDER_AMBIENT_PASS);
 
     if(Renderer::get().lighting()) { // do multi-pass only if lighting is enabled
         // multi-pass light rendering utilizing partitioner

src/editor/SelectorNode.cpp

@@ -12,8 +12,10 @@ void SelectorNode :: logicSelf(unsigned int advance)
 
 void SelectorNode :: renderSelf(Frustum* view, unsigned int flags) const
 {
-    //if(!(flags & RENDER_AMBIENT_PASS))
-    //    return;
+    if(!(flags & RENDER_AMBIENT_PASS))
+        return;
+    if(!(flags & RENDER_INDICATORS))
+        return;
 
     glDisable(GL_DEPTH_TEST);
 

src/game/GameState.cpp

@@ -11,7 +11,7 @@ GameState::GameState(Engine* engine, TransitionInfo* trans)
     nullify();
     m_pEngine = engine;
 
-    m_pScene = new Scene("data/ne/maps/Apartment/apartment_scene.obj", Scene::F_PHYSICS);
+    m_pScene = new Scene("data/ne/maps/gothicTower/gothicTower.obj", Scene::F_PHYSICS);
     //m_pScene = new Scene("testmap.fml", Scene::F_PHYSICS);
     //m_pScene = new Scene("data/maps/office/ctf_office.obj");
 
@@ -28,8 +28,8 @@ GameState::GameState(Engine* engine, TransitionInfo* trans)
     //n = m_pScene->loadAI("data/assets/tree1.obj");
     //n->move(glm::vec3(-20.0, 0.0, 0.0));
 
-    n = m_pScene->loadAI("data/ne/environment/officebuilding.obj");
-    n->move(glm::vec3(20.0, 0.0, 0.0));
+    //n = m_pScene->loadAI("data/ne/environment/officebuilding.obj");
+    //n->move(glm::vec3(20.0, 0.0, 0.0));
 
     //for(int i=0; i<10; i++)
     //    for(int j=0; j<10; j++)
@@ -53,8 +53,8 @@ GameState::GameState(Engine* engine, TransitionInfo* trans)
     );
 
     //glm::vec3 gunpos = glm::vec3(0.15f,-0.2f,-0.4f);//glock
-    //glm::vec3 gunpos = glm::vec3(0.15f,-0.3f,-0.5f);
-    glm::vec3 gunpos = glm::vec3(0.0f,-0.25f,-0.2f); // ADS
+    glm::vec3 gunpos = glm::vec3(0.15f,-0.3f,-0.5f);//ump45
+    //glm::vec3 gunpos = glm::vec3(0.0f,-0.25f,-0.2f); //ump45 ADS
     *e->matrix() = glm::gtx::transform2::lookAt(glm::vec3(0.0f), glm::vec3(0.0, 0.0f, -1000.0f) - gunpos, Axis::Y);
     //Matrix::translation(*e->matrix(), glm::vec3(0.2f,-0.25f,-0.4f));
     Matrix::translation(*e->matrix(), gunpos);
@@ -92,11 +92,12 @@ GameState::GameState(Engine* engine, TransitionInfo* trans)
     // end particle system demo
 
     Light* light;
-    // add three lights
+    //// add three lights
     m_pScene->add(light = new Light());
     light->lightType(Light::DIRECTIONAL);
     light->atten(glm::vec3(1.0f, 0.0f, 0.0f));
-    light->diffuse(Color(0.2f, 0.1f, 0.6f));
+    light->diffuse(Color((ubyte)0xDC, (ubyte)0xCD, (ubyte)0xFF));
+    light->specular(Color(0.0f,0.0f,0.0f));
 
     // Colored Lights Demo
     //m_pScene->add(light = new Light());
@@ -115,22 +116,22 @@ GameState::GameState(Engine* engine, TransitionInfo* trans)
     //light->diffuse(Color(0.5f, 0.4f, 0.3f));
 
     // Other colors demo
-    //m_pScene->add(light = new Light());
-    //light->move(glm::vec3(-2.5f, 0.0, -5.0f));
-    //light->diffuse(Color(0.8f, 0.4f, 0.6f));
-    //light->atten(glm::vec3(0.0f, 0.0f, 0.5f));
-    //m_pScene->add(light = new Light());
-    //light->move(glm::vec3(2.5f, 0.0, -5.0f));
-    //light->diffuse(Color(0.0f, 0.5f, 0.5f));
-    //light->atten(glm::vec3(0.0f, 0.0f, 0.5f));
-    //m_pScene->add(light = new Light());
-    //light->move(glm::vec3(-5.0f, 0.0, -5.0f));
-    //light->diffuse(Color(0.1f, 0.1f, 0.3f));
-    //light->atten(glm::vec3(0.0f, 0.0f, 0.5f));
-    //m_pScene->add(light = new Light());
-    //light->move(glm::vec3(5.0f, 0.0, -5.0f));
-    //light->diffuse(Color(0.3f, 0.0f, 0.1f));
-    //light->atten(glm::vec3(0.0f, 0.0f, 0.5f));
+    m_pScene->add(light = new Light());
+    light->move(glm::vec3(-2.5f, 0.0, -5.0f));
+    light->diffuse(Color(0.8f, 0.4f, 0.6f));
+    light->atten(glm::vec3(0.0f, 0.0f, 0.1f));
+    m_pScene->add(light = new Light());
+    light->move(glm::vec3(2.5f, 0.0, -5.0f));
+    light->diffuse(Color(0.0f, 0.5f, 0.5f));
+    light->atten(glm::vec3(0.0f, 0.0f, 0.1f));
+    m_pScene->add(light = new Light());
+    light->move(glm::vec3(-5.0f, 0.0, -5.0f));
+    light->diffuse(Color(0.1f, 0.1f, 0.3f));
+    light->atten(glm::vec3(0.0f, 0.0f, 0.1f));
+    m_pScene->add(light = new Light());
+    light->move(glm::vec3(5.0f, 0.0, -5.0f));
+    light->diffuse(Color(0.3f, 0.0f, 0.1f));
+    light->atten(glm::vec3(0.0f, 0.0f, 0.1f));
 
     // Sound Demo
     //Sound* fire_sound = new Sound(