josh
8a74d6dd2a
introduced tunable shot angle
2012-10-07 08:14:47 -04:00
josh
f1809bf193
fix Shot trajectory calculation
2012-10-07 07:54:38 -04:00
josh
1741476456
trying to fix Shot position calculation, better, but still wrong
2012-10-06 22:47:29 -04:00
josh
69f403cee1
add Client::create_shot(); only send one shot to server
2012-10-06 22:13:23 -04:00
josh
59b81aebe0
add sphere object, attempting to draw shot but position is way wrong
2012-10-06 22:03:37 -04:00
josh
f0b1b91a9f
client removes Shot objects when they expire
2012-10-06 21:28:15 -04:00
josh
1ceacd913d
Shots keep track of their launch time
2012-10-06 21:27:55 -04:00
josh
3237d4e0e6
Client creates a Shot object when player sends a shot (not drawing it yet)
2012-10-06 21:11:42 -04:00
josh
bfc8a6f25b
add initial Shot class, fully untested
2012-10-06 20:58:23 -04:00
josh
3e22ad70e1
send slightly more accurate shot distance to server
2012-10-04 00:38:10 -04:00
josh
11a9b70522
draw slightly lower damaged tile model for damaged tiles
2012-10-04 00:30:16 -04:00
josh
81eda3f71d
add hex-tile-damaged model
2012-10-04 00:27:34 -04:00
josh
ef4780ab3c
not sure what that was
2012-10-03 23:27:39 -04:00
josh
b36725e471
avoid implicit conversion from vec4 to varying vec3
2012-10-03 23:22:04 -04:00
josh
b20d7ab037
print shader source when it fails to compile
2012-10-03 23:22:04 -04:00
josh
7b9fe3aa6d
fix SFML path for Windows
2012-10-03 23:22:04 -04:00
josh
8598c40360
Merge remote-tracking branch 'chris/master'
2012-10-01 22:23:36 -04:00
josh
b0b8de00fa
toggle cursor grabbing status with F1
2012-10-01 22:22:53 -04:00
josh
47fc4098a2
use "m_" prefix for Client instance variables
2012-09-30 11:03:24 -04:00
josh
71368d1ed6
draw shot ring focus point where shot will land
2012-09-29 21:39:48 -04:00
josh
8f29d08fe9
decrease player hover when not above tile (just on client for now)
2012-09-29 21:11:09 -04:00
josh
4a40b403d9
draw borders on shot ring
2012-09-28 00:26:09 -04:00
josh
f68a4a682a
draw shot ring
2012-09-28 00:22:30 -04:00
josh
741a325a5f
add shot-ring shader and create shot-ring attributes buffer
2012-09-27 23:01:52 -04:00
josh
eacfd38e15
draw overlay hover bar
...
draw border around overlay map
Changed from refptr<map<U8, Player> > to map<U8, refptr<player> >
minor bugfix - using more memory on sky than needed
Fixed some bugs with multiplayer
CCFS: print error when unable to find file by default
simplify GLProgram creation with stdarg
2012-09-25 19:17:43 -04:00
josh
7df681082a
simplify GLProgram creation with stdarg
2012-09-24 22:11:29 -04:00
josh
889ba4735a
CCFS: print error when unable to find file by default
2012-09-24 22:05:52 -04:00
josh
249e7a626c
minor bugfix - using more memory on sky than needed
2012-09-23 22:31:34 -04:00
josh
a5b1f5c131
draw border around overlay map
2012-09-23 15:35:01 -04:00
josh
24ee6b011e
draw overlay hover bar
2012-09-23 15:17:45 -04:00
josh
3e178b4d97
make Client::draw_player() accept a player argument
2012-09-23 11:58:08 -04:00
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