Drezil/pioneers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'tessallation' of pwning.de:/pioneers into tessallation

Browse Source
This commit is contained in:
Nicole Dresselhaus 2014-02-10 16:26:51 +01:00
commit 17301f0635
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shaders/tessEval.shader
View File

@ -4,8 +4,8 @@ layout(triangles, equal_spacing, cw) in;
in vec3 tcPosition[]; in vec3 tcPosition[];
in vec4 tcColor[]; in vec4 tcColor[];
in vec3 tcNormal[]; in vec3 tcNormal[];
out vec3 tePosition;
out vec4 teColor; out vec4 teColor;
smooth out vec3 tePosition;
smooth out vec3 teNormal; smooth out vec3 teNormal;
smooth out float gmix; //mixture of gravel smooth out float gmix; //mixture of gravel
//out vec3 tePatchDistance; //out vec3 tePatchDistance;

4
src/Main.hs
View File

@ -50,7 +50,7 @@ import qualified Debug.Trace as D (trace)
main :: IO () main :: IO ()
main = do main = do
SDL.withInit [InitVideo, InitAudio] $ do --also: InitNoParachute -> faster, without parachute! SDL.withInit [InitVideo, InitAudio] $ do --also: InitNoParachute -> faster, without parachute!
SDL.withWindow "Pioneers" (Position 1500 100) (Size 1024 768) [WindowOpengl -- we want openGL SDL.withWindow "Pioneers" (Position 100 100) (Size 1024 600) [WindowOpengl -- we want openGL
,WindowShown -- window should be visible ,WindowShown -- window should be visible
,WindowResizable -- and resizable ,WindowResizable -- and resizable
,WindowInputFocus -- focused (=> active) ,WindowInputFocus -- focused (=> active)
@ -422,4 +422,4 @@ processEvent e = do
} }
Quit -> modify $ \s -> s {stateWinClose = True} Quit -> modify $ \s -> s {stateWinClose = True}
-- there is more (joystic, touchInterface, ...), but currently ignored -- there is more (joystic, touchInterface, ...), but currently ignored
_ -> liftIO $ putStrLn $ unwords ["Not processing Event:", show e] _ -> liftIO $ putStrLn $ unwords ["Not processing Event:", show e]