From 581cb142bb0a34a586f4d47de13fca0c3bffba10 Mon Sep 17 00:00:00 2001
From: Stefan Dresselhaus <sdressel@techfak.uni-bielefeld.de>
Date: Sun, 24 Aug 2014 23:47:17 +0200
Subject: [PATCH] added shading, reduced debug-output

---
 models/holzfaellerHaus1.iqm        | Bin 0 -> 12824 bytes
 sample.iqm                         | Bin 3104 -> 0 bytes
 shaders/mapobjects/fragment.shader |  13 ++++++++++++-
 shaders/mapobjects/vertex.shader   |   5 +++--
 src/Importer/IQM/Parser.hs         |  14 +++++++-------
 src/Render/Render.hs               |  11 ++++++-----
 6 files changed, 28 insertions(+), 15 deletions(-)
 create mode 100644 models/holzfaellerHaus1.iqm
 delete mode 100644 sample.iqm

diff --git a/models/holzfaellerHaus1.iqm b/models/holzfaellerHaus1.iqm
new file mode 100644
index 0000000000000000000000000000000000000000..f24cc3cf40b76cab2892d07237b704738a7b53be
GIT binary patch
literal 12824
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
KyqDh<wEqFym$<nA

literal 0
HcmV?d00001

diff --git a/sample.iqm b/sample.iqm
deleted file mode 100644
index 44a9d4607b18d9834d46352efe43593c03b4a54d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3104
zcmeH}%}bO~6vl5;+LxwT*@rgs`jLfLOw_KXJ7%+xGAom4BO$nwDUI3%&bpP*CMv?9
zphY`f2$HYRB5GxSL17#JfHu+M?fK2T7cT?R8$zo&aOOVe+~=Ho&T&T0;MJRj8`nqs
zFBgV}FBPtslrbh~(1&Ed^pSLnbXHm~Jt2K7<?h=~V^(*Wa?HwZIsR1!9*$3#i}&tU
zK2Bw`r^|1-G`xlImXqxQTcv@DqAmm<b#qZZV;{WywhEtXcrs0(MmQ02fai7?Q-?$1
ze0lZvKJ~+<zITPe!0qtb;*jmT|I31B=WpenuCC?4Z<>4aFGil1{XRb{PQ#bA+|<|;
zyQn<%$^-UeeLSlCCzT(LAM3yC<JWq3PVd6^WBq#kcYVKKr=Q2?JAdPPOWt9>mukPO
z0l&lWU2L`A^@!hLzn5yis|~-y@LjC$2fG@;ehogq@)xgtZhiu#a3jZ`aVEF292AP-
zdSuTe!JXoYcR@edg(SFL+>S!gMp4s360Dpyt(sEi&e^1xy6F}E-*8)85BwxJqkg*;
z13wAwjpqqJ35HjZl6A<KBp9~OtJ$@A{O|9>#y7Txl23qr#_dJyL~g%f-(ja?|6w=6
z)*58A_86^oWz1TK%}UrP-4o-c*lyOjSK1;4?~84Awgb{uDfnP)AJTbPdPE9ti|uxu
zN2O^gI1}4}&JJm(6x=1n?v@^t_Qd#jY||Tk&?mjn7lKWF_z-$#CUEJAd&HjyJ#$Y^
zX22aMHnGfz{N!X#%!hm4VIJJ$V^+js<0mgZ=0+XZ%#Awmk&FD;_}yH|#T^{t$wl5s
z^6~3CJGRtgi{lT%so~Gd6X{lqP77E5Pw`tVS>l~U(TsgOI6ePz^3}P?pEF@!UH|zH
J&ps{r{NI61n*#s<

diff --git a/shaders/mapobjects/fragment.shader b/shaders/mapobjects/fragment.shader
index 6c05c3a..b95f268 100644
--- a/shaders/mapobjects/fragment.shader
+++ b/shaders/mapobjects/fragment.shader
@@ -5,6 +5,17 @@ in vec3 vNormal;
 
 out vec4 fgColor;
 
+uniform mat4 ViewMatrix;
+
 void main () {
-    fgColor = vec4(1.0,0.0,1.0,0.5);
+    //heliospheric lighting
+    vec4 light = vec4(1.0,1.0,1.0,1.0);
+    vec4 dark  = vec4(0.0,0.0,0.0,1.0);
+    //direction to sun from origin
+    vec3 lightDir = normalize(ViewMatrix * vec4(5.0,5.0,1.0,0.0)).xyz;
+
+    float costheta = dot(vNormal, lightDir);
+    float a = costheta * 0.5 + 0.5;
+
+    fgColor = vec4(0.5,0.5,0.5,1)*mix(dark,light,a);
 }
diff --git a/shaders/mapobjects/vertex.shader b/shaders/mapobjects/vertex.shader
index ff05a30..fb092dc 100644
--- a/shaders/mapobjects/vertex.shader
+++ b/shaders/mapobjects/vertex.shader
@@ -6,7 +6,7 @@ layout(location=2) in vec2 TexCoord;
 uniform mat4 ProjectionMatrix;
 uniform mat4 ViewMatrix;
 uniform mat3 NormalMatrix;
-uniform vec3 PositionOffset = vec3(5,5,5);
+uniform vec3 PositionOffset = vec3(5,2,5);
 uniform float TessLevelInner = 1.0; // controlled by keyboard buttons
 uniform float TessLevelOuter = 1.0; // controlled by keyboard buttons
 
@@ -15,6 +15,7 @@ out vec3 vNormal;
 
 void main () {
    vPosition = Position;
-   gl_Position = vec4(Position,1);//ProjectionMatrix * ViewMatrix * vec4(PositionOffset + Position, 1);
+   //gl_Position = vec4(Position,1);
+   gl_Position = ProjectionMatrix * ViewMatrix * vec4(PositionOffset + Position, 1);
    vNormal = Normal;
 }
diff --git a/src/Importer/IQM/Parser.hs b/src/Importer/IQM/Parser.hs
index 8a98ab2..e000429 100644
--- a/src/Importer/IQM/Parser.hs
+++ b/src/Importer/IQM/Parser.hs
@@ -259,9 +259,9 @@ parseIQM a =
             bufferData ElementArrayBuffer $= (fromIntegral byteLen, p, StaticDraw)
         checkError "bufferData tris"
         return $ castPtr p
-    putStrLn "Triangles:"
-    printPtrAsWord32Array tris ((*3).fromIntegral.num_triangles.bareheader $ bare) 3
-    print bare
+    --putStrLn "Triangles:"
+    --printPtrAsWord32Array tris ((*3).fromIntegral.num_triangles.bareheader $ bare) 3
+    --print bare
     return $ IQM
         { header               = bareheader bare
         , texts                = baretexts bare
@@ -275,14 +275,14 @@ parseIQM a =
 
 createVAO :: [(IQMVertexArray, BufferObject)] -> IO ()
 createVAO bo = do
-        print bo
+        --print bo
         initVAO (AttribLocation 0) IQMPosition bo
         initVAO (AttribLocation 1) IQMNormal   bo
         initVAO (AttribLocation 2) IQMTexCoord bo
 
 initVAO :: AttribLocation -> IQMVertexArrayType -> [(IQMVertexArray, BufferObject)] -> IO ()
 initVAO l t bo = do
-	print $ concat ["adding ", show t, " to vertexBufferObject"]
+	--print $ concat ["adding ", show t, " to vertexBufferObject"]
 	let (IQMVertexArray _ _ _ num _ _,buf) = case filter (\(IQMVertexArray ty _ _ _ _ _, _) -> ty == t) bo of
 							[(a,b)] -> (a,b)
 							_ -> error "IQM-Object not render-able with current shader-mechanics"
@@ -325,11 +325,11 @@ readInVAO d vcount (IQMVertexArray type' a format num offset ptr) =
         putStrLn $ concat ["Allocating ", show vcount ,"x", show num,"x",show (vaSize format)," = ", show byteLen, " Bytes at ", show p, " for ", show type']
         putStrLn $ concat ["Filling starting at ", show offset, " with: "]
         unsafeUseAsCString data' (\s -> copyBytes p s byteLen)
-        case type' of
+        {-case type' of
             IQMBlendIndexes -> printPtrAsUByteArray p numElems 4
             IQMBlendWeights -> printPtrAsUByteArray p numElems 4
             IQMTexCoord     -> printPtrAsFloatArray p numElems 2
-            _ -> printPtrAsFloatArray p numElems 3
+            _ -> printPtrAsFloatArray p numElems 3-}
         return $ IQMVertexArray type' a format num offset $ castPtr p
 
 -- | Real internal Parser.
diff --git a/src/Render/Render.hs b/src/Render/Render.hs
index 17aff76..be4f216 100644
--- a/src/Render/Render.hs
+++ b/src/Render/Render.hs
@@ -180,7 +180,7 @@ initMapShader tessFac (buf, vertDes) = do
    putStrLn $ unlines $ "Model-Uniforms: ":map show uni'
    putStrLn $ unlines $ ["Model-Indices: ", show (texIndex', normalIndex', vertexIndex')]
    
-   testobj <- parseIQM "models/box.iqm"
+   testobj <- parseIQM "models/holzfaellerHaus1.iqm"
    let objs = [MapObject testobj (L.V3 0 10 0) (MapObjectState ())]
 
    currentProgram $= Nothing
@@ -288,10 +288,11 @@ renderIQM :: IQM -> L.V3 CFloat -> L.V3 CFloat -> IO ()
 renderIQM m p@(L.V3 x y z) s@(L.V3 sx sy sz) = do
     withVAO (vertexArrayObject m) $ do
         vertexAttribArray (AttribLocation 0) $= Enabled
+        vertexAttribArray (AttribLocation 1) $= Enabled
         checkError "setting array to enabled"
         bindBuffer ElementArrayBuffer $= Just (triangleBufferObject m)
         checkError "bindBuffer"
-        let n = fromIntegral.num_triangles.header $ m
+        let n = fromIntegral.(*3).num_triangles.header $ m
         --print $ concat ["drawing ", show n," triangles"]
         drawElements Triangles n UnsignedInt nullPtr
         checkError "drawing model"
@@ -332,7 +333,7 @@ drawMap = do
 
         glPatchParameteri gl_PATCH_VERTICES 3
 
-        cullFace $= Nothing --Just Front
+        cullFace $= Just Front
         polygonMode $= (Fill,Fill)
 
         glDrawArrays gl_PATCHES 0 (fromIntegral numVert)
@@ -491,11 +492,11 @@ render = do
         currentProgram $= Just (state ^. gl.glMap.objectProgram)
         checkError "setting up shadowmap-program"
         --set up projection (= copy from state)
-        {-mat44ToGPU frust projmo "mapObjects-projection"
+        mat44ToGPU frust projmo "mapObjects-projection"
         --set up camera
         mat44ToGPU cam' vmatmo "mapObjects-cam"
         --set up normal
-        mat33ToGPU nmap nmatmo "mapObjects-nmat"-}
+        mat33ToGPU nmap nmatmo "mapObjects-nmat"
 
         mapM_ renderObject (state ^. gl.glMap.mapObjects)
         checkError "draw mapobjects"