Merge branch 'iqm' into tessallation

Conflicts:
	src/Render/Render.hs
	src/Types.hs

src/Render/Render.hs

@@ -288,6 +288,10 @@ renderOverview = do
         checkError "draw map"
 -}
 
+renderObject :: MapObject -> IO ()
+renderObject (MapObject model (L.V3 x y z) _{-state-}) = 
+	undefined
+		
 
 render :: Pioneers ()
 render = do
@@ -384,6 +388,12 @@ render = do
 
         checkError "draw map"
 
+	---- RENDER MAPOBJECTS --------------------------------------------
+	
+	currentProgram $= Just (state ^. gl.glMap.objectsProgram)
+
+	mapM_ renderObject (state ^. gl.glMap.mapObjects)
+
         -- set sample 1 as target in renderbuffer
         {-framebufferRenderbuffer
                 DrawFramebuffer              --write-only