Added camera state to mainObj2.hs

2 files changed, 42 insertions, 31 deletions

diff --git a/MeshMaker.hs b/MeshMaker.hs
index d416023..6b7477a 100644
--- a/MeshMaker.hs
+++ b/MeshMaker.hs
@@ -9,14 +9,37 @@ import Foreign.C.Types
 import GI.Gdk
 import GI.GObject.Functions
 import GI.Gtk
+import Numeric.LinearAlgebra
 
 data MeshMaker = MeshMaker
     { mmWidget   :: GLArea
     , mmRealized :: IORef (Maybe State)
     }
 
+data Camera = Camera
+    { camHeightAngle   :: Float
+    , camTarget        :: Vector Float
+    , camDirection     :: Vector Float
+    , camDistance      :: Float
+    , camWidth         :: Float
+    , camHeight        :: Float
+    , camWorldToScreen :: Maybe (Matrix Float)
+    , camScreenToWorld :: Maybe (Matrix Float)
+    }
+
 data State = State
-    {
+    { stCamera :: IORef Camera
+    }
+
+initCamera = Camera
+    { camHeightAngle = pi/6
+    , camTarget      = fromList [0,0,0]
+    , camDirection   = fromList [0,0,-1]
+    , camDistance    = 10
+    , camWidth       = 0
+    , camHeight      = 0
+    , camWorldToScreen = Nothing
+    , camScreenToWorld = Nothing
     }
 
 new :: IO GLArea
@@ -44,8 +67,9 @@ onRealize mm@(MeshMaker w ref) = do
         , EventMaskScrollMask
         ]
     _ <- on w #event $ onEvent mm
+    cam <- newIORef initCamera
     writeIORef ref $ Just State
-        {
+        { stCamera = cam
         }
 
 onUnrealize :: MeshMaker -> IO ()
@@ -62,31 +86,6 @@ onRender :: MeshMaker -> GLContext -> IO Bool
 onRender (MeshMaker w ref) gl = do
     return True
 
-onScroll :: MeshMaker -> EventScroll -> IO Bool
-onScroll (MeshMaker w ref) ev = do
-    dx <- get ev #deltaX
-    dy <- get ev #deltaY
-    x <- get ev #x
-    y <- get ev #y
-    y_root <- get ev #yRoot
-    d <- get ev #direction
-    -- onScroll! ((0.0,0.0),(11.057525634765625,5.210357666015625),79.21035766601563)
-    putStrLn $ "onScroll! " ++ show (d,(dx,dy),(x,y),y_root)
-    return True
-
-onTouch :: MeshMaker -> Event -> IO Bool
-onTouch (MeshMaker w ref) ev = do
-    putStrLn $ "onTouch!"
-    return True
-
-onMotion :: MeshMaker -> EventMotion -> IO Bool
-onMotion (MeshMaker w ref) ev = do
-    putStrLn $ "onMotion!"
-    return True
-
-onDestroy mm = do
-    putStrLn "destory!"
-    return ()
 
 onEvent mm@(MeshMaker w ref) ev = do
     msrc <- eventGetSourceDevice ev
@@ -94,11 +93,23 @@ onEvent mm@(MeshMaker w ref) ev = do
         src <- get src #inputSource
         return src
     etype <- get ev #type
-    putStrLn $ "onEvent! " ++ show (etype,inputSource)
+    -- putStrLn $ "onEvent! " ++ show (etype,inputSource)
+    let put x = putStrLn (show inputSource ++ " " ++ show x)
     case etype of
+
         EventTypeMotionNotify -> do
-            m <- get ev #motion
-            _ <- onMotion mm m
+            mev <- get ev #motion
+            x <- get mev #x
+            y <- get mev #y
+            put (x,y)
             return ()
+
+        EventTypeScroll -> do
+            sev <- get ev #scroll
+            d <- get sev #direction
+            put d
+            return ()
+
         _ -> return ()
+
     return False
diff --git a/mainObj2.hs b/mainObj2.hs
index 6195950..7695120 100644
--- a/mainObj2.hs
+++ b/mainObj2.hs
@@ -20,7 +20,7 @@ main = do
 
     window <- do
         w <- windowNew WindowTypeToplevel
-        windowSetDefaultSize    w 720 720
+        windowSetDefaultSize    w 360 360
         windowSetTitle          w "Mesh Maker"
         _ <- on w #deleteEvent $ \_ -> mainQuit >> return True
         child <- mkChild