Commit Graph
92 Commits
Author SHA1 Message Date
josh b785304adf make lava slowly move over time 2012-09-21 22:05:22 -04:00
josh b1163044b8 draw lava all the way to the sky 2012-09-21 21:47:58 -04:00
josh 1f80d8e870 add lava GLSL program and render lava floor 2012-09-21 21:43:04 -04:00
josh 76e9390437 fix lava texture path 2012-09-21 18:57:27 -04:00
josh 254079d8dc update SFML path 2012-09-21 18:52:20 -04:00
josh d4d2793ecf attempt to load texture using sfml-graphics; not building on linux 2012-09-20 00:49:17 -04:00
josh 8d2a03c4c1 ignore tags file 2012-09-19 23:03:08 -04:00
josh d1b6d15afa lighten hex tile model 2012-09-17 22:46:24 -04:00
josh b739bed248 add sky 2012-09-17 22:41:59 -04:00
josh d5301b6d6c add Player::hover 2012-09-17 21:08:11 -04:00
josh 41b06a1de7 fix link errors on Windows 2012-09-17 19:29:00 -04:00
josh 49b91ec088 draw red player point on overlay map 2012-09-16 15:45:19 -04:00
josh 6f0aa56976 move and rotate overlay map with player 2012-09-16 14:22:06 -04:00
josh 23b4177962 draw tile borders in overlay map 2012-09-16 14:13:00 -04:00
josh c095df40d4 increase default client resolution 2012-09-16 14:05:24 -04:00
josh 728fe2dc14 missing Z coordinate in overlay_hex_attributes 2012-09-16 14:03:14 -04:00
josh 1378353226 attempt to draw overlay map - strange results 2012-09-16 13:47:48 -04:00
josh ca50407d90 make GLMatrix::to_uniform() const 2012-09-16 12:39:42 -04:00
josh 932b0b55f6 remove scale uniform from shaders 2012-09-15 20:53:14 -04:00
josh a1a81d66e1 add GLProgram::uniform() 2012-09-15 20:35:48 -04:00
josh 05dc0b021f import obj shader changes into obj_tex 2012-09-15 08:43:59 -04:00
josh c7af7f8f2f rename shaders 2012-09-15 08:43:59 -04:00
josh ac79196325 getting ready to draw a map overlay 2012-09-14 00:05:26 -04:00
josh 84aecf957c draw each tile with its own size 2012-09-13 23:47:48 -04:00
josh 89fc42251f create buffers for overlay hex tiles 2012-09-13 23:43:04 -04:00
josh ab65139951 only determine uniform locations once 2012-09-13 23:16:12 -04:00
josh 56fb845630 chmod -x some source files 2012-09-13 22:57:00 -04:00
josh 0e9e54bc7a move OpenGL/SFML code to Client-gl.cc 2012-09-13 22:55:25 -04:00
josh 013f0f30ab Map is an array of HexTiles 2012-09-11 23:13:33 -04:00
josh 3bcf26fc20 scale down player size and move speed 2012-09-11 22:58:46 -04:00
josh be67a414db draw hex tiles for map tiles 2012-09-11 22:52:32 -04:00
josh 10bb7f6042 add hex-tile model 2012-09-11 22:29:15 -04:00
josh aa52be8801 HexTile cleanup 2012-09-11 19:18:43 -04:00
josh 46c9a81c11 use gl3w instead of glew; render map with shaders 2012-09-11 19:16:08 -04:00
josh 2569e3a007 fix GLMatrix::rotate() bug 2012-09-11 19:06:44 -04:00
josh 8d0d11bc3b add GLBuffer::bind() and GLProgram::use() 2012-09-11 19:05:18 -04:00
josh 386d012ff7 small fragment shader tweak 2012-09-10 23:26:30 -04:00
josh eb0a24b8d4 fix normal_i calculation 2012-09-10 23:24:52 -04:00
josh cfa2850292 positioning with shaders working, normals not 2012-09-10 23:14:02 -04:00
josh 4a6d38ddb9 add projection and modelview matrices to obj shader 2012-09-10 21:29:11 -04:00
josh fb749eef11 make scons quieter 2012-09-10 21:25:16 -04:00
josh 05dfd6f8a7 add look_at() and built-in stack to GLMatrix 2012-09-10 21:20:59 -04:00
josh a9c99fbe4a build with debugging information for now 2012-09-10 21:04:02 -04:00
josh f77df195e0 simpler HexTile::point_within() 2012-09-10 21:04:02 -04:00
josh 433d702096 use #define for HexTile 2012-09-09 23:56:00 -04:00
josh 19b3a79f33 add HexTile class 2012-09-09 23:25:48 -04:00
josh f072eec36a add a dumb new quickly drawn tank model 2012-09-08 00:59:03 -04:00
josh 22b52f5fcc add scale factor to obj shader and scale tank object up 2012-09-08 00:15:41 -04:00
josh abb0d99553 draw tank object using shader from model file 2012-09-08 00:12:36 -04:00
josh c70cc450cc load tank model, not drawing it yet 2012-09-07 23:59:16 -04:00
josh 4d3f088e3f wfobj: ignore object name directive for now 2012-09-07 23:57:43 -04:00
josh 465c2c50be strange wfobj coding bug 2012-09-07 23:57:04 -04:00
josh bf8ee88cd2 create a GLProgram for object shader 2012-09-07 23:44:31 -04:00
josh 99a9e2b67f declare CCFS instance as extern in header file 2012-09-07 23:26:37 -04:00
josh aead49d6de add initial tank model... have to start somewhere 2012-09-06 23:10:33 -04:00
josh cf227cc5ab pass antialias level and compatibility context flags to Client 2012-09-06 21:49:14 -04:00
josh 305fa696f6 copy glew32 library to bin directory on windows 2012-09-06 21:49:14 -04:00
josh b7e22a375d add command-line options for antialias_level and compatibility_context 2012-09-06 21:49:14 -04:00
josh f5399ee5ac use sys.platform for platform detection 2012-09-06 21:49:14 -04:00
josh 471e9984db add GLMatrix class 2012-09-06 01:13:11 -04:00
josh ac434fab3e move GL* sources into src/client/GL 2012-09-06 00:36:25 -04:00
josh 2adebf36f4 add include path for all source directories 2012-09-06 00:33:40 -04:00
josh e2ebe6afa4 build with GLEW on Windows 2012-09-04 09:59:53 -04:00
josh 39bd1778bf add WFObj object-loading library sources 2012-09-03 09:14:47 -04:00
josh db3ffa84af add get_uniform_location{,s}() 2012-09-03 00:55:45 -04:00
josh ed3b5fa454 add GLProgram class 2012-09-03 00:29:05 -04:00
josh 378c13c869 add GLShader class 2012-09-02 23:17:01 -04:00
josh 92eea9e39c remove GLBuffer constructor parameters 2012-09-02 23:16:48 -04:00
josh f9b12c3df0 add dependencies to readme 2012-09-02 22:36:19 -04:00
josh af522a2d53 add GLBuffer class 2012-09-02 22:33:53 -04:00
josh be56fd0aa5 initialize GLEW from Client 2012-09-02 22:28:06 -04:00
josh a6df74a757 link with GLEW 2012-09-02 22:00:38 -04:00
josh 9b993f2028 allow source files in arbitrary subdirectories under src/*; allow C source files in addition to C++ 2012-08-29 23:20:10 -04:00
josh f06dbf7bac mouse wheel rotates player 2012-08-29 01:07:52 -04:00
josh 7b076cdc13 temporarily be able to move player around 2012-08-29 00:33:59 -04:00
josh ee38a6f655 use camera-position based drawing with gluLookAt() 2012-08-28 21:22:55 -04:00
josh 9c90adbc75 add assets/fs directory with initial OpenGL shaders and CCFS generation script 2012-08-28 20:57:03 -04:00
josh 38dbf27c82 draw a simple box for the client-controlled player 2012-08-22 23:00:47 -04:00
josh a568ab8fa8 add a basic Player class 2012-08-22 21:20:01 -04:00
josh 2c7e454ca8 add a simple Map class and draw it from the Client 2012-08-20 20:13:41 -04:00
josh 3eff7d6097 use a different object file suffix for server object files to avoid scons environment conflict 2012-08-20 19:20:06 -04:00
josh 832e63fb81 link with sfml-graphics library 2012-08-16 00:24:28 -04:00
josh f1c3d2c95b add a server main.cc 2012-08-15 22:36:55 -04:00
josh 4bb7a8dab7 fix GL projection matrix adjustment on window resize 2012-08-14 22:16:55 -04:00
josh aedc9b664c add simple fixed-functionality OpenGL demo to client for now 2012-08-14 22:11:31 -04:00
josh 34e909fca8 split client into main.cc and Client class 2012-08-14 21:46:41 -04:00
josh c216b9d09e linux build fix from Chris 2012-08-14 00:12:25 -04:00
josh fee19eab42 statically link with SFML on Windows 2012-08-13 23:46:05 -04:00
josh 91bbc211c1 update to build on linux 2012-08-13 23:43:03 -04:00
josh eae0dc9e34 update template to use SFML-2.0-rc 2012-08-13 23:27:33 -04:00
josh 31d9ab8f10 initial build system
working to compile from cygwin in Windows with SFML-1.6
2012-08-13 23:07:37 -04:00
josh 4c22f07923 add README.md 2012-08-13 22:02:02 -04:00