Stephen Birarda
e6d278ea12
Merge remote-tracking branch 'upstream/master' into agentlist-array
2013-04-25 17:01:17 -07:00
birarda
1f8177e708
Merge pull request #144 from Ventrella/master
...
added some camera functionality and redesigned the concept of avatar position
2013-04-25 16:53:18 -07:00
Stephen Birarda
3df81cc92a
resolve conflicts on merge with upstream master
2013-04-25 16:41:35 -07:00
Stephen Birarda
cdb8b1b144
Merge remote-tracking branch 'upstream/master' into agentlist-array
2013-04-25 16:40:20 -07:00
Jeffrey Ventrella
7a94310d4e
Merge remote-tracking branch 'upstream/master'
2013-04-25 16:32:27 -07:00
Jeffrey Ventrella
86e72a90d4
working on camera view shifting from first person to third person
2013-04-25 16:31:42 -07:00
Stephen Birarda
edc908b1cd
AgentList type squishes across project
2013-04-25 16:25:49 -07:00
Stephen Birarda
81322d01e5
spacing fixes in AgentList
2013-04-25 16:19:33 -07:00
Stephen Birarda
7e0dab6224
spacing fixes in Avatar class
2013-04-25 16:18:17 -07:00
Stephen Birarda
507f39a052
fix readability of agent dereference
2013-04-25 16:14:38 -07:00
Stephen Birarda
da6bbacc8e
type squish in main.cpp
2013-04-25 16:12:43 -07:00
Stephen Birarda
2bda700753
put iterator statements on one line in main.cpp
2013-04-25 16:12:22 -07:00
Stephen Birarda
215efe3b78
bunch of const changes for glm::vec3 in Avatar and Orientation
2013-04-25 16:10:55 -07:00
Stephen Birarda
8370fd2d19
spacing fixes in Avatar class
2013-04-25 16:04:08 -07:00
Stephen Birarda
be37237b84
fix indent in Avatar class
2013-04-25 15:58:42 -07:00
Stephen Birarda
114f949a6e
spacing cleanup in Avatar class
2013-04-25 15:58:03 -07:00
Stephen Birarda
8deee63f74
remove line breaks in DS for loop
2013-04-25 15:56:26 -07:00
Stephen Birarda
569fa76dde
prefer arrow notation in avatar-mixer iterator loop
2013-04-25 15:52:16 -07:00
Stephen Birarda
f7e83b2080
squish types in audio mixer, use -> notation for other avatars
2013-04-25 15:51:10 -07:00
Stephen Birarda
625a963918
prefer -> notation to (*TYPE) for AgentList iterator
2013-04-25 15:49:25 -07:00
Andrzej Kapolka
d5da35e91a
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-25 15:41:57 -07:00
Andrzej Kapolka
620e1c728c
Removed kludge; it turned out lighting was enabled.
2013-04-25 15:41:09 -07:00
birarda
c03cf2a34a
Merge pull request #143 from PhilipRosedale/master
...
Added local gravity fields
2013-04-25 15:37:04 -07:00
Stephen Birarda
dac660efda
resolve conflicts after merge with upstream master
2013-04-25 15:30:57 -07:00
Stephen Birarda
5ddd9a9f4f
Merge remote-tracking branch 'upstream/master' into agentlist-array
2013-04-25 15:27:40 -07:00
Stephen Birarda
89da132bf2
update voxel-server to use new AgentList iterator
2013-04-25 15:26:21 -07:00
Andrzej Kapolka
d041072d40
Delete support (though the one on my numeric keypad doesn't work?),
...
sending key states.
2013-04-25 15:26:05 -07:00
Stephen Birarda
88eca95020
fix domain-server to use new AgentList iterator
2013-04-25 15:24:36 -07:00
Stephen Birarda
ef6593eb89
update audio-mixer to use new AgentList iterator
2013-04-25 15:21:56 -07:00
Stephen Birarda
f86704fa94
update avatar-mixer to use new AgentList iterator
2013-04-25 15:21:44 -07:00
Stephen Birarda
ad530b4eb8
fix bug based on dynamic end of agentList iterator
2013-04-25 15:10:08 -07:00
Stephen Birarda
2850d74a84
add typedefs for stl iterator implementation
2013-04-25 14:48:07 -07:00
Jeffrey Ventrella
7a0ed469b8
added methods to camera class to check for when the view frustum needs to be reshaped (but the calls are not yet being made - need to make sure the right place to use it)
2013-04-25 14:25:28 -07:00
Andrzej Kapolka
675d06e4b9
More chat bits; basic functionality now working.
2013-04-25 14:03:31 -07:00
Jeffrey Ventrella
5a0a1c1cec
increased YAW_MAG (faster turning), redesigned the concept of avatar position, and reset Eve's position accordingly. Also added _frustumNeedsReshape in camera in anticipation of fixing problem where setting fov doesn't reshape the frustum.
2013-04-25 13:51:20 -07:00
Stephen Birarda
836d286b75
initial transition from vector to multi-dimensional array in AgentList
2013-04-25 13:11:13 -07:00
Jeffrey Ventrella
9a4d27c0b5
cleaned up some camera code and added some functionality for first-person view
2013-04-25 12:19:23 -07:00
Jeffrey Ventrella
68b3f54f5c
tiny change
2013-04-25 10:44:01 -07:00
Philip Rosedale
9e62728c33
Changed velocity to be dvec3
2013-04-25 10:18:30 -07:00
Philip Rosedale
b9fb888073
Small speed/cleanup to thrust setting
2013-04-25 10:02:14 -07:00
Philip Rosedale
ba55175870
Gravity is ON near origin, off in space, and a gravity field can be created with getGravity()
2013-04-25 09:50:35 -07:00
Andrzej Kapolka
10a9f31d65
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-25 09:41:13 -07:00
ZappoMan
2c48139ff3
some cleanup
2013-04-25 00:02:51 -07:00
ZappoMan
0bec7156aa
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
2013-04-24 23:50:57 -07:00
ZappoMan
785ef88820
Code cleanup, change readBitstreamToTree() to support multiple trees, first cut at new loadBitstream()
...
- some small tweaks to cod to match coding standard for pointers
- changed readBitstreamToTree() to handle multiple trees in a single packet
- first cut at new version of loadBitstream() which is currently not in use
2013-04-24 23:47:38 -07:00
ZappoMan
9bc2f667b6
adding some temporary debugging code
2013-04-24 23:46:47 -07:00
ZappoMan
732b4879e0
added a test routine for testing insertIntoSortedArrays()
2013-04-24 23:20:20 -07:00
ZappoMan
0c692ca0c0
added isLeaf(), isInView(), and distanceToCamera() helper methods
2013-04-24 22:54:55 -07:00
ZappoMan
f449eafa63
added typedef for location enum
2013-04-24 22:53:34 -07:00
ZappoMan
bbdf97ccc4
added some helper functions for debugging and for improved voxel protocol
...
- added outputBufferBits() which will output an entire buffer as debug bits/bytes
- tweak to outputBits() to allow caller to ask for NewLine or not
- added insertIntoSortedArrays() which keeps a set of arrays sorted by a key
2013-04-24 22:50:40 -07:00
