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

Commit Graph

  • 1ad81d6ae5 scaled map correctly; fixed whacky cam tessallation Stefan Dresselhaus 2014-09-24 01:14:43 +02:00
  • 8630ef951d Merge branch 'master' into tessallation Stefan Dresselhaus 2014-09-15 15:09:58 +02:00
  • 24e05db27d objects now use their position and scale. Stefan Dresselhaus 2014-09-15 15:07:56 +02:00
  • 2a9de00213 (minor) Nodes now have record syntax master Jonas Betzendahl 2014-09-14 14:36:44 +02:00
  • 28e5f47596 added depth-buffer to map Stefan Dresselhaus 2014-08-29 22:07:18 +02:00
  • 0e13d1c5ba fixes #503 Stefan Dresselhaus 2014-08-29 21:25:31 +02:00
  • c10622d506 isolated error. Map Rendering is missing Depth-Comp Stefan Dresselhaus 2014-08-29 21:18:49 +02:00
  • 581cb142bb added shading, reduced debug-output Stefan Dresselhaus 2014-08-24 23:47:17 +02:00
  • c21863c03a re-enabled GUI Stefan Dresselhaus 2014-08-24 22:59:35 +02:00
  • b4710797fc mixed up vertexes and triangles .. would have been a hard to find error... Stefan Dresselhaus 2014-08-24 22:50:49 +02:00
  • dc2205d3dc it is showing something on the screen! finally! Stefan Dresselhaus 2014-08-24 22:46:53 +02:00
  • 53775c559d Merge branch 'rework_iqm' into tessallation Stefan Dresselhaus 2014-08-24 16:40:20 +02:00
  • 95b108b0c4 error is gone, object still not there. Stefan Dresselhaus 2014-08-24 16:39:29 +02:00
  • cb967df9c9 reworked loader. causes OutOfMemory-Errors on GPU. Stefan Dresselhaus 2014-08-21 22:57:36 +02:00
  • e5b2a7d620 chose other reference points. Stefan Dresselhaus 2014-08-17 23:50:28 +02:00
  • e265e5a021 fixed height-bug Stefan Dresselhaus 2014-08-17 23:27:31 +02:00
  • 40c0e3ef00 added ArrayBufferObject for TriangleIndex Stefan Dresselhaus 2014-08-10 23:00:53 +02:00
  • c9ef745a72 Merge branch 'master' into iqm Stefan Dresselhaus 2014-08-08 20:23:05 +02:00
  • c1605fb400 updated README. Stefan Dresselhaus 2014-08-08 20:22:43 +02:00
  • 1bc65c8ea7 added triangles to IQM-Parsing Stefan Dresselhaus 2014-08-08 20:13:31 +02:00
  • 138d16016b tried lot of stuff.. nothing worked. Stefan Dresselhaus 2014-07-08 15:32:14 +02:00
  • aedb5b5337 Merge remote-tracking branch 'origin/ui' into iqm Stefan Dresselhaus 2014-07-07 15:23:13 +02:00
  • 81131de915 changed to wireframe-rendering Stefan Dresselhaus 2014-07-07 15:22:57 +02:00
  • ae1f1d6815 ui: generalized viewport to access camera object via lens tpajenka 2014-06-20 16:27:11 +02:00
  • 41e75dcdeb upper bound of 0.001s for frame diff time (Main.hs), added second viewport widget to GUI (currently just an empty shell) tpajenka 2014-06-20 00:19:02 +02:00
  • 702ea19253 camera is recalculated on mouse action instead of at every frame tpajenka 2014-06-19 22:24:58 +02:00
  • 8605440539 moved GLMapState: _renderedMapTexture to State: _mapTexture tpajenka 2014-06-19 17:02:49 +02:00
  • b095907d9b tried with WriterT, undid most of it; compiles Stefan Dresselhaus 2014-06-17 16:37:49 +02:00
  • 13b814fa0a TessallationFactor now gets updated correcty Stefan Dresselhaus 2014-06-17 15:41:17 +02:00
  • 5578bb401a tessallation-factor will now change max once every 5 sec Stefan Dresselhaus 2014-06-15 03:42:58 +02:00
  • e512149461 Merge branch 'ui' into iqm Stefan Dresselhaus 2014-06-15 03:29:03 +02:00
  • 3cd3ba55f9 disabled culling Stefan Dresselhaus 2014-06-11 00:07:06 +02:00
  • 32f1043d7c minor cleanup Stefan Dresselhaus 2014-06-10 23:37:05 +02:00
  • 1e9c6a24fd minor Stefan Dresselhaus 2014-06-10 23:15:59 +02:00
  • 4bbf80ecab not changing to Data.Vector and staying on C-Array Stefan Dresselhaus 2014-06-10 22:59:48 +02:00
  • d8747c0bd3 minor cleanup Stefan Dresselhaus 2014-06-02 08:11:44 +02:00
  • ac832268ca iqm now gets read in more correctly Stefan Dresselhaus 2014-06-01 23:22:12 +02:00
  • eaeae7d4e2 cleanup & debug-output Stefan Dresselhaus 2014-06-01 23:13:28 +02:00
  • fc72fd8095 corrected compile-mistakes due to indentation Stefan Dresselhaus 2014-06-01 23:05:39 +02:00
  • 6bb915c25c added sample box-model with all files Stefan Dresselhaus 2014-06-01 23:02:15 +02:00
  • 3db6d6f9eb live-Coding Stefan Dresselhaus 2014-05-30 15:28:09 +02:00
  • b3323ef054 live-Coding Stefan Dresselhaus 2014-05-30 15:26:12 +02:00
  • c7ea247b70 introducing window resize event, main viewport resizing to actual window size tpajenka 2014-05-24 13:47:47 +02:00
  • 9761e7c6c2 Merge branch 'master' into ui tpajenka 2014-05-21 14:57:39 +02:00
  • 9523e733c6 new UI-Widget type: Viewport, removed old hacked code (except mouse wheel) to handle camera movement and using viewport instead tpajenka 2014-05-21 14:10:47 +02:00
  • 03d99c5fcc bugfix mouse motion handler: handler has been invoked with wrong coordinates, motion handler is now also called while leaving while still mouse-active tpajenka 2014-05-21 14:03:28 +02:00
  • 8a84e7ba95 press/release handlers receive boolean as parameter to indicate if the click is inside widget tpajenka 2014-05-21 11:51:40 +02:00
  • e72e8c9333 more strictness to Types.hs: UIState tpajenka 2014-05-20 20:38:02 +02:00
  • 74fc3af201 haddock tpajenka 2014-05-20 20:34:05 +02:00
  • 91ad0f5e38 hlint Stefan Dresselhaus 2014-05-20 11:09:04 +02:00
  • c2dc6e28f1 cleaned up Stefan Dresselhaus 2014-05-20 11:01:37 +02:00
  • 9c33af543c fixed bits & pieces here and there Stefan Dresselhaus 2014-05-20 08:57:42 +02:00
  • cea71238f1 played a bit with shaders .. won't render. Stefan Dresselhaus 2014-05-20 00:12:16 +02:00
  • 7c8c7cac98 a bit refactoring to get the imperative stuff shorter Stefan Dresselhaus 2014-05-20 00:06:53 +02:00
  • 1cded31ecc works now again - still renders nothing. Stefan Dresselhaus 2014-05-19 22:29:16 +02:00
  • fe73c3a6b0 removed dysfunctional code Stefan Dresselhaus 2014-05-19 21:45:09 +02:00
  • 324d7037bf changed much render-code. Stefan Dresselhaus 2014-05-19 21:42:58 +02:00
  • 3dc26c45eb Merge branch 'tessallation' into iqm Stefan Dresselhaus 2014-05-19 19:59:43 +02:00
  • f6e52d732c haddock & small fix Stefan Dresselhaus 2014-05-18 07:30:19 +02:00
  • bb75883f7d Merge branch 'master' into tessallation Stefan Dresselhaus 2014-05-18 07:27:54 +02:00
  • ef549eac4d fixed haddock for UI Stefan Dresselhaus 2014-05-18 00:14:19 +02:00
  • aa6a5c060f added some helper-functions for handling gamestate Stefan Dresselhaus 2014-05-17 23:19:34 +02:00
  • 481a386e0e Merge branch 'master' into iqm Stefan Dresselhaus 2014-05-17 12:59:35 +02:00
  • 35364b50aa Merge branch 'STM' Stefan Dresselhaus 2014-05-17 12:58:23 +02:00
  • 230e31bf63 changed TMVar to TVar Stefan Dresselhaus 2014-05-17 12:57:49 +02:00
  • 0d65a485d5 changed constant in Map.Map Stefan Dresselhaus 2014-05-17 11:40:23 +02:00
  • 27d7873595 reworked Types to support STM Stefan Dresselhaus 2014-05-16 22:05:27 +02:00
  • 2944d36703 changed camera-height Stefan Dresselhaus 2014-05-16 19:06:05 +02:00
  • ffa45515c3 attempting to compensate once more Jonas Betzendahl 2014-05-16 18:59:26 +02:00
  • c624121e23 Clamped reference points Jonas Betzendahl 2014-05-16 18:48:46 +02:00
  • cd4250336b moar reference points Jonas Betzendahl 2014-05-16 17:56:03 +02:00
  • a71ce917ec fixed floor/ceiling crap Jonas Betzendahl 2014-05-16 17:43:31 +02:00
  • 5b2537188f (\_/) =(^.^)= (")_(") bunny approves this commit! (rewrote the whole damn camera-height-function. Should be better now.) Jonas Betzendahl 2014-05-16 17:26:40 +02:00
  • 15d55e1577 compensating for stripe depth Jonas Betzendahl 2014-05-16 15:58:07 +02:00
  • 1c1aedda30 Grass is back, bettered mountains Jonas Betzendahl 2014-05-16 11:39:29 +02:00
  • f2fbf101ef Camera function not NaNing / breaking anymore / merge tessalation Jonas Betzendahl 2014-05-16 11:30:15 +02:00
  • da3a334121 iqm still does not render, starts again. Stefan Dresselhaus 2014-05-16 09:10:09 +02:00
  • a6efea80cf Merge branch 'tessallation' into iqm Stefan Dresselhaus 2014-05-16 08:04:48 +02:00
  • 4285cefa31 Merge branch 'ui' into tessallation Stefan Dresselhaus 2014-05-16 07:57:03 +02:00
  • 696269c1b5 non-ASCI characters on output (e.g. in compiler messages) may break certain shells preventing compiling tpajenka 2014-05-16 00:39:29 +02:00
  • 271497be81 using (and corrected) refined button handler invocation TODO: "old" camera handler interferes with left mouse clicks/drags tpajenka 2014-05-15 22:08:43 +02:00
  • ee5eb95a2e builds, but does not work. Stefan Dresselhaus 2014-05-15 21:57:15 +02:00
  • c17852d8e1 Merge branch 'master' into ui tpajenka 2014-05-15 21:47:15 +02:00
  • 51c48e62db revising preliminary inflexible button handling callback tpajenka 2014-05-15 21:43:26 +02:00
  • e37832371c WIP, does not compile. Stefan Dresselhaus 2014-05-15 21:18:28 +02:00
  • a3f0043591 WIP, does not compile. Stefan Dresselhaus 2014-05-15 21:16:43 +02:00
  • 5b9378c317 Merge branch 'ui' into tessallation Stefan Dresselhaus 2014-05-15 15:19:02 +02:00
  • d83c87db1d cam now moves with height. Stefan Dresselhaus 2014-05-15 15:10:10 +02:00
  • b7be183c25 Merge branch 'Mapping' into tessallation Stefan Dresselhaus 2014-05-15 13:41:19 +02:00
  • cc3efb9ec5 merged Stefan Dresselhaus 2014-05-15 13:40:47 +02:00
  • 8e2d46c7ef Fixed the hell out of that snow! Jonas Betzendahl 2014-05-15 12:06:18 +02:00
  • eb3ee975e8 Restructured Node constructors. Ripples are getting worse! (╯°□°）╯︵ ┻━┻ Jonas Betzendahl 2014-05-15 12:01:30 +02:00
  • 67428146ca added height function Jonas Betzendahl 2014-05-15 10:44:54 +02:00
  • 87946cb501 modified camara-height-limit to reflect later game better Stefan Dresselhaus 2014-05-14 20:13:40 +02:00
  • db0631eb4b forgot file Stefan Dresselhaus 2014-05-14 20:04:06 +02:00
  • 45fe3f8493 revising preliminary inflexible button handling callback tpajenka 2014-05-14 13:19:00 +02:00
  • b5a4d03f8c array-objects get initialized Stefan Dresselhaus 2014-05-13 15:04:20 +02:00
  • 4d31866256 Merge branch 'tessallation' into iqm Stefan Dresselhaus 2014-05-13 14:11:25 +02:00
  • 1bfec031e2 fixed import Stefan Dresselhaus 2014-05-13 14:11:02 +02:00
  • 527d620da6 Merge branch 'Mapping' into tessallation Stefan Dresselhaus 2014-05-13 13:04:26 +02:00