Merge branch 'iqm'

src/Main.hs

@@ -132,6 +132,7 @@ main =
                         }
               , _io                  = IOState
                         { _clock               = now
+                        , _tessClockFactor     = 0
                         }
               , _mouse               = MouseState
                         { _isDown              = False
@@ -228,17 +229,30 @@ run = do
       }
     -}
 
-    mt <- liftIO $ do
-        let double = fromRational.toRational :: (Real a) => a -> Double
+    (mt,tc,sleepAmount) <- liftIO $ do
+        let 	double = fromRational.toRational :: (Real a) => a -> Double
+		targetFramerate = 40.0
+		targetFrametime = 1.0/targetFramerate
+		targetFrametimeμs = targetFrametime * 1000000.0
         now <- getCurrentTime
-        diff <- return $ diffUTCTime now (state ^. io.clock) -- get time-diffs
-        title <- return $ unwords ["Pioneers @ ",show ((round . double $ 1.0/diff)::Int),"fps"]
+        let diff  = diffUTCTime now (state ^. io.clock) -- get time-diffs
+            title = unwords ["Pioneers @ ",show ((round . double $ 1.0/diff)::Int),"fps"]
         setWindowTitle (env ^. windowObject) title
-        sleepAmount <- return $ floor (max 0 (0.04 - diff))*1000000 -- get time until next frame in microseconds
-        threadDelay sleepAmount
-        return now
+        let 	sleepAmount = floor ((targetFrametime - double diff)*1000000) :: Int -- get time until next frame in microseconds
+                clockFactor = (state ^. io.tessClockFactor)
+		tessChange
+			| (clockFactor > (2*targetFrametimeμs)) && (state ^. gl.glMap.stateTessellationFactor < 5) = ((+)1 :: Int -> Int) 
+									-- > factor < 5 & 10% of frame idle -> increase graphics
+			| sleepAmount < 0 && (state ^. gl.glMap.stateTessellationFactor > 1) = (flip (-) 1 :: Int -> Int)
+									-- frame used up completely -> decrease
+			| otherwise = ((+)0 :: Int -> Int)              -- 0ms > x > 10% -> keep settings
+        when (sleepAmount > 0) $ threadDelay sleepAmount
+        return (now,tessChange,sleepAmount)
     -- set state with new clock-time
-    modify $ io.clock .~ mt
+    modify $ (io.clock .~ mt)
+           . (gl.glMap.stateTessellationFactor %~ tc)
+           . (io.tessClockFactor %~ (((+) (fromIntegral sleepAmount)).((*) 0.99)))
+    -- liftIO $ putStrLn $ concat $ ["TessFactor at: ",show (state ^. gl.glMap.stateTessellationFactor), " - slept for ",show sleepAmount, "μs."]
     shouldClose' <- return $ state ^. window.shouldClose
     unless shouldClose' run
 

src/Render/Render.hs

@@ -22,6 +22,8 @@ import           Types
 import           Render.Misc
 import           Render.Types
 import           Graphics.GLUtil.BufferObjects              (makeBuffer)
+import		 Importer.IQM.Parser
+import           Importer.IQM.Types
 
 mapVertexShaderFile :: String
 mapVertexShaderFile = "shaders/map/vertex.shader"
@@ -32,6 +34,11 @@ mapTessEvalShaderFile = "shaders/map/tessEval.shader"
 mapFragmentShaderFile :: String
 mapFragmentShaderFile = "shaders/map/fragment.shader"
 
+objectVertexShaderFile :: String
+objectVertexShaderFile = "shaders/mapobjects/vertex.shader"
+objectFragmentShaderFile :: String
+objectFragmentShaderFile = "shaders/mapobjects/fragment.shader"
+
 uiVertexShaderFile :: String
 uiVertexShaderFile = "shaders/ui/vertex.shader"
 uiFragmentShaderFile :: String
@@ -113,6 +120,21 @@ initMapShader tessFac (buf, vertDes) = do
 
    texts <- genObjectNames 6
    
+   testobj <- parseIQM "sample.iqm"
+
+   let
+	objs = [MapObject testobj (L.V3 0 10 0) (MapObjectState ())]
+
+   ! vertexSource' <- B.readFile objectVertexShaderFile
+   ! fragmentSource' <- B.readFile objectFragmentShaderFile
+   vertexShader' <- compileShaderSource VertexShader vertexSource'
+   checkError "compile Object-Vertex"
+   fragmentShader' <- compileShaderSource FragmentShader fragmentSource'
+   checkError "compile Object-Fragment"
+   objProgram <- createProgramUsing [vertexShader', fragmentShader']
+   checkError "compile Object-Program"
+   
+   currentProgram $= Just objProgram
 
    checkError "initShader"
    return GLMapState
@@ -132,6 +154,8 @@ initMapShader tessFac (buf, vertDes) = do
         , _mapVert            = vertDes
         , _overviewTexture    = overTex
         , _mapTextures        = texts
+	, _mapObjects         = objs
+	, _objectProgram      = objProgram
         }
 
 initHud :: IO GLHud
@@ -266,6 +290,16 @@ renderOverview = do
 -}
 
 
+-- | renders an IQM-Model at Position with scaling
+renderIQM :: IQM -> L.V3 CFloat -> L.V3 CFloat -> IO ()
+renderIQM m p@(L.V3 x y z) s@(L.V3 sx sy sz) = do
+	return ()
+
+renderObject :: MapObject -> IO ()
+renderObject (MapObject model pos@(L.V3 x y z) _{-state-}) = 
+	renderIQM model pos (L.V3 1 1 1)
+		
+
 render :: Pioneers ()
 render = do
     state <- RWS.get
@@ -354,8 +388,19 @@ render = do
         cullFace $= Just Front
 
         glDrawArrays gl_PATCHES 0 (fromIntegral numVert)
+
+
+	currentProgram $= Just (state ^. gl.glMap.objectProgram)
+	
+
         checkError "draw map"
 
+	---- RENDER MAPOBJECTS --------------------------------------------
+	
+	currentProgram $= Just (state ^. gl.glMap.objectProgram)
+
+	mapM_ renderObject (state ^. gl.glMap.mapObjects)
+
         -- set sample 1 as target in renderbuffer
         {-framebufferRenderbuffer
                 DrawFramebuffer              --write-only

src/Types.hs

@@ -8,12 +8,15 @@ import           Foreign.C                            (CFloat)
 import qualified Data.HashMap.Strict                  as Map
 import           Data.Time                            (UTCTime)
 import Linear.Matrix (M44)
+import Linear (V3)
 import Control.Monad.RWS.Strict (RWST)
 import Control.Lens
 import Graphics.Rendering.OpenGL.GL.Texturing.Objects (TextureObject)
 import Render.Types
+import Importer.IQM.Types
 import UI.UIBase
 
+data Coord3D a = Coord3D a a a
 
 --Static Read-Only-State
 data Env = Env
@@ -49,6 +52,7 @@ data CameraState = CameraState
 
 data IOState = IOState
     { _clock               :: !UTCTime
+    , _tessClockFactor     :: !Double
     }
 
 data GameState = GameState
@@ -113,8 +117,16 @@ data GLMapState = GLMapState
     , _renderedMapTexture   :: !TextureObject --TODO: Probably move to UI?
     , _overviewTexture      :: !TextureObject
     , _mapTextures          :: ![TextureObject] --TODO: Fix size on list?
+    , _objectProgram        :: !GL.Program
+    , _mapObjects           :: ![MapObject]
     }
 
+data MapObject = MapObject !IQM !MapCoordinates !MapObjectState
+
+data MapObjectState = MapObjectState ()
+
+type MapCoordinates = V3 CFloat
+
 data GLHud = GLHud
     { _hudTexture               :: !TextureObject       -- ^ HUD-Texture itself
     , _hudTexIndex              :: !GL.UniformLocation  -- ^ Position of Overlay-Texture in Shader