Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-07 09:19:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
1384 commits 22 branches 28 tags 1.2 GiB
Commit graph

329 commits

Author SHA1 Message Date
Stephen Birarda
9f10be749e Merge remote-tracking branch 'upstream/master' into 19170B 2013-04-09 17:04:20 -07:00
Stephen Birarda
ae7f3e71d8 broadcast to VS and avatar mixer on position change 2013-04-09 16:56:19 -07:00
Jeffrey Ventrella
3dae70e665 removed glm::dvec3 and replaced with glm::vec3 in most of avatar code, except for velocity 2013-04-09 15:23:59 -07:00
Jeffrey Ventrella
09af8d153f added camera modes and also set initial avatar yaw to 90 2013-04-09 15:05:37 -07:00
Leonardo Murillo
f07714ce5c Debugging 2013-04-09 15:51:08 -06:00
Leonardo Murillo
1cf75b37f3 Changes to interface side of code 2013-04-09 15:30:30 -06:00
ZappoMan
42e1355f1e add back voxels.render() call 2013-04-09 14:11:55 -07:00
Jeffrey Ventrella
e90dd52da4 resolve merge conflicts with origin/master 2013-04-09 13:30:26 -07:00
Jeffrey Ventrella
87c26a39fb adding more changes and small improvements to camera, and head... 2013-04-09 12:54:59 -07:00
ZappoMan
2ec3f6b210 Adding new AgentTypes.h and moving over to new constants 2013-04-09 10:37:07 -07:00
vincent
56aac7077c changes after merge 2013-04-09 19:12:49 +02:00
Philip Rosedale
60dc43041f added rendering lines between avatar bones 2013-04-08 22:42:45 -07:00
Philip Rosedale
87fd0f7a91 Fixed avatar lighting, head scaling, removed some extra log messages 2013-04-08 21:13:20 -07:00
ZappoMan
7480283dd4 cleanup of packet header constants 2013-04-08 19:54:14 -07:00
Jeffrey Ventrella
191ee71dbb Merge remote-tracking branch 'origin' 2013-04-08 18:46:28 -07:00
Jeffrey Ventrella
cd1533dc7c Lots of small changes in the head (evolving into "avatar") to include skeleton. Also, added camera behaviors for navigation 2013-04-08 18:46:00 -07:00
Stephen Birarda
69fa462151 don't steal ping replies from AgentList 2013-04-08 18:10:20 -07:00
ZappoMan
53cfd0ecdd adding CounterStats class and support for showing running average stats on voxels recieved, created, and colored in client 2013-04-08 17:03:22 -07:00
ZappoMan
23429441ac Merge branch 'master' of https://github.com/worklist/hifi 2013-04-08 11:18:51 -07:00
ZappoMan
aee27bfc16 Hmmm, when painting, X and Z are not flipped? I'm totally confused, but now 
but LOD and painting seems to work.
 2013-04-08 11:18:07 -07:00
Philip Rosedale
dbd9688f1f Turned off default for star field rendering until we find/fix the rendering bug 2013-04-08 09:34:19 -07:00
ZappoMan
aa40fd96d4 added -/% to menu text 2013-04-07 12:49:15 -07:00
ZappoMan
d3fd5d1a75 added keyboard commands for erase all and add scene 2013-04-07 12:45:46 -07:00
ZappoMan
5415543dcd adding Z command to voxel server and interface, Z command allows sending "erase all" and "add scene" commands 2013-04-06 12:03:46 -07:00
Jeffrey Ventrella
87fe21f835 got a basic avatar skeleton with a simpler starter user interaction for moving the right hand 2013-04-05 16:21:13 -07:00
Jeffrey Ventrella
a0f09b597a got a basic avatar skeleton with a simpler starter user interaction for moving the right hand 2013-04-05 16:19:23 -07:00
ZappoMan
16ad4fc220 hack to always send voxels to client (even if already visited), added paint mode features to client 2013-04-05 10:54:39 -07:00
Jeffrey Ventrella
5b2d1ec198 thingy3 2013-04-05 10:52:10 -07:00
Jeffrey Ventrella
e57e2bdf38 thingy2 2013-04-05 10:48:08 -07:00
ZappoMan
57829785eb fix to LOD bug caused by flip-flopped X and Z, add color randomization to inserted voxels on server, added head position display to display_stats() 2013-04-04 20:50:51 -07:00
Jeffrey Ventrella
d3f6c19e83 adding Camera and some utility classes and start of prototype avatar 2013-04-04 18:04:32 -07:00
tosh
de4734d6fb tightens ogl state handling (also fixes unreadably thick text for stats display) 2013-04-04 10:59:57 +02:00
ZappoMan
f859d8ed9c Added PaintMode, toggle for stars, etc. 2013-04-03 22:42:02 -07:00
Stephen Birarda
66a2b1a86f move stars.txt to S3 bucket 2013-04-03 15:24:26 -07:00
tosh
2341af271b Merge branch 'master' of git://github.com/worklist/hifi into 19188 
Conflicts:
	interface/CMakeLists.txt
	interface/src/main.cpp
	shared/src/SharedUtil.cpp
	shared/src/SharedUtil.h
	shared/src/VoxelTree.cpp
 2013-04-03 22:44:22 +02:00
ZappoMan
9220ba3ee5 Added agentTypes to AgentList::broadcastToAgents() 
Make voxel server rebroadcast "remove voxel" messages to all it's connected heads
Cleaned up processing of Remove voxel messages to live in VoxelTree
 2013-04-03 12:42:24 -07:00
ZappoMan
ad0b2f024b Fixed a couple of complier warnings, and added a new PerfStat class for monitoring runtime performance 2013-03-31 20:43:23 -07:00
vincent
622053b38c #19197 Create basic visual studio 2013-03-29 20:20:52 +01:00
tosh
8f458b0bea changes case/naming to agreed conventions 2013-03-29 13:41:33 +01:00
Stephen Birarda
3186254a93 initial LOD drop off when moving back 2013-03-29 03:42:54 -07:00
ZappoMan
270f77799d added random color options, cleaned up compiler warnings, add reAverageParentColors when modifying voxel tree 2013-03-28 17:21:47 -07:00
tosh
df7f3942e1 straightens data pipeline and several bugs after exhaustive testing 2013-03-29 01:08:24 +01:00
ZappoMan
ebceaf06dc added --domain command line option to interface 2013-03-28 15:22:10 -07:00
ZappoMan
6ec9949098 Add --local support to interface command line 2013-03-28 14:03:16 -07:00
ZappoMan
fe8b6f7d63 * Moved load file and create sphere from VoxelSystem to VoxelTree 
* Added --local command line support to domain and voxel servers so that
  you can run them locally without recompiling.
* made command line option parsing more cross platform
* added --NoColorRandomizer to interface when loading local models
* added -i file load support to voxel server to load in a preexisting model at launch
* added --NoRandomVoxelSheet to voxel server to NOT create the built in voxel sheet
* added first cut at 'I' command from clients to voxel server to insert voxels into voxel tree
* changed ambient light settings in interface to not be so aggressive
* added randInIntRange() helper to SharedUtils
* tweat to pruneTree() to also repair child mask
* some coding standard refactoring
 2013-03-28 13:54:28 -07:00
vincent
1c1b7369ae #19197 Create basic visual studio 2013-03-28 18:32:52 +01:00
vincent
83abc571f1 #19197 Create basic visual studio 2013-03-28 18:20:50 +01:00
Philip Rosedale
c0cb88e21b Added keyboard controls for smooth rotation, more junk removed from main.cpp 2013-03-27 15:54:54 -07:00
tosh
704ae4acb2 removes default limit loading stars 2013-03-27 15:50:25 +01:00
Philip Rosedale
ef9c704bb1 Merge remote-tracking branch 'origin' 2013-03-26 17:33:21 -07:00
Philip Rosedale
642b64dfd6 First commit to improve avatar movement 2013-03-26 17:32:54 -07:00
Stephen Birarda
7c1470c07e remove debug send to 10.0.0.10 2013-03-26 16:22:42 -07:00
Stephen Birarda
bb14a90f86 remove constants re-added on merge 2013-03-25 23:00:36 -07:00
ZappoMan
23c6a9017c Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
	shared/src/SharedUtil.cpp
	shared/src/SharedUtil.h
 2013-03-25 22:51:59 -07:00
ZappoMan
2f6b2466ea Fixed getCommandOption and cmOptionExists to be more porable 
added support for --NoConnect command line option to test running without connecting
added pruneTree to VoxelTree
 2013-03-25 22:39:24 -07:00
Stephen Birarda
d76fafda67 remove call that included getCmdOption 2013-03-25 16:45:49 -07:00
Stephen Birarda
507b6e0064 use abstracted DS check in method from AgentList 2013-03-25 16:24:14 -07:00
tosh
7d32eeb20a adjusts to function renaming in FieldOfView 2013-03-25 10:50:45 +01:00
ZappoMan
0711539fc6 Changed colors of spheres to be a gradient along phi between to random colors 
this gives the spheres a little bit more natural look.
Also increased the level of detail (smaller voxels)
 2013-03-24 13:00:23 -07:00
ZappoMan
ef8694dd60 1) Added createSphere() to VoxelSystem to create a sphere 
2) Added pointToVoxel() to SharedUtils, this will give you a voxel code
   given x,y,z,s,r,g,b
3) Added '.' keyboard interface to create a random sphere in the local
   voxel system
 2013-03-24 10:06:43 -07:00
tosh
5de3ec035b leftover changes / minor corrections 2013-03-24 06:30:33 +01:00
ZappoMan
8ecc0d53ad Added a utility to VoxelSystem for loading voxels from a local file 
Also added a couple shared utility functions for reading command
line options (since that's how you can load a local file at this
point).
 2013-03-23 21:59:27 -07:00
Stephen Birarda
6346a14cb5 remove voxelServerAddCallback 2013-03-22 10:48:41 -07:00
Stephen Birarda
95926cb7fc conditional chdir for OS X resources, revert windows Head changes 2013-03-21 17:02:41 -07:00
Stephen Birarda
d61ae179ae hide the cloud again 2013-03-21 16:16:25 -07:00
Stephen Birarda
0b48eab1fb Merge branch 'master' of github.com:worklist/hifi 2013-03-21 16:12:09 -07:00
Stephen Birarda
4552140f61 add a sound when moving so we aren't ninjas 2013-03-21 16:11:17 -07:00
Kees van Prooijen
f308d8e004 merge with upstream master 2013-03-21 10:10:33 -07:00
Stephen Birarda
abc0deaa78 increase the far clip 2013-03-20 16:22:24 -07:00
Kees van Prooijen
9ae11ffe77 more windows port 2013-03-20 12:13:14 -07:00
Stephen Birarda
c7213d6593 conditionally include winsock2.h instead of UNIX socket stuff 2013-03-19 11:46:53 -07:00
Stephen Birarda
8ef885aaaf remove extra tokens after endif for WIN32 conditionals 2013-03-19 11:10:42 -07:00
Kees van Prooijen
cd27c74a2d prelimanary changes for windows port 2013-03-19 11:01:08 -07:00
Stephen Birarda
158270f20d only use SerialInterface if on UNIX machine 2013-03-18 15:36:26 -07:00
Stephen Birarda
95eb241fdd remove OS X specific menu, have voxel server point to correct DS 2013-03-13 11:07:46 -07:00
Stephen Birarda
e97aba03a3 move StdDev to shared library 2013-03-12 10:09:07 -07:00
Philip Rosedale
674bd8d798 transmitter full movement, and audio jitter buffer tweaks/debugging data 2013-03-11 16:19:55 -07:00
Philip Rosedale
5c1bd68580 Merge remote-tracking branch 'origin/master' 2013-03-08 16:00:17 -08:00
Philip Rosedale
f014fcd0ac transmitter tweaks 2013-03-08 15:58:49 -08:00
Stephen Birarda
5535b8a4f5 allow client to request loopback from mixer 2013-03-08 15:37:41 -08:00
Stephen Birarda
686404be2b add a voxel server 2013-03-08 14:32:06 -08:00
Philip Rosedale
26fd44f030 100,000 voxel death star with concentric shells 2013-03-06 16:58:38 -08:00
Philip Rosedale
e7aa142082 Merge remote-tracking branch 'origin' 2013-03-06 15:23:40 -08:00
Philip Rosedale
89d205f304 turn cloud back off 2013-03-06 14:45:24 -08:00
Philip Rosedale
f98f64e8f7 Added red 'laser pointer' to hand 2013-03-06 14:40:24 -08:00
Stephen Birarda
f004479e39 bump up to 300000 voxels, with color 2013-03-06 14:34:14 -08:00
Stephen Birarda
e16cd4ffc3 use vertex buffer objects to speed up voxel rendering 2013-03-06 13:56:11 -08:00
Stephen Birarda
0fbb534566 randomly draw 50000 voxels for glDrawElements test 2013-03-06 12:04:27 -08:00
Philip Rosedale
04bd98cf85 Merge remote-tracking branch 'origin' 2013-03-04 17:01:24 -08:00
Philip Rosedale
2903ff9f73 Adding support for transmitter data 2013-03-04 17:00:30 -08:00
Philip Rosedale
f3d086f6dd Merge pull request #10 from heracek/19095 
Code Review for Job #19095
 2013-03-04 16:59:53 -08:00
Stephen Birarda
a42fc47231 relink head to AudioRingBuffer, send source bearing 2013-02-28 15:58:57 -08:00
Stephen Birarda
29df6e6a3e send 256 samples per callback so mixer can reply with two channels 2013-02-28 12:21:38 -08:00
Philip Rosedale
27cc3a8ee5 Merge remote-tracking branch 'origin' 2013-02-26 17:34:26 -08:00
Philip Rosedale
fe2f2d5019 Reduce mouse force on hand. 2013-02-26 17:33:40 -08:00
Stephen Birarda
c123990d7a switch back to EC2 DS for sanity check 2013-02-26 13:59:33 -08:00
Stephen Birarda
c645830809 temporary test against birarda's domain server 2013-02-26 13:43:50 -08:00
Stephen Birarda
1783ee5f85 send interface client position to audio mixer 2013-02-26 13:13:40 -08:00
Philip Rosedale
26a87b3b43 Added critically damped spring behavior to hand, and added simulateHand() routine to main.cpp that uses mouse to correctly move hand controller. 2013-02-26 09:41:16 -08:00
Philip Rosedale
f7b20a7c9c Added ability to drag hand by clicking and dragging on the screen. 2013-02-25 15:06:28 -08:00
Stephen Birarda
d211eb6c84 use getters and setters for all member variables in AgentList and Agent 2013-02-25 12:51:52 -08:00
Stephen Birarda
4541a5fe78 AgentList returns agents vector and agentSocket by reference 2013-02-25 12:24:42 -08:00
Stephen Birarda
a20a162502 don't move user view with their gyro, temporarily hide hand 2013-02-22 16:43:41 -08:00
Stephen Birarda
88cac51c0c tweak sensitiviy on pitch and yaw changes 2013-02-22 16:28:58 -08:00
Stephen Birarda
2ab58e00ca revert last change to ignore position changes from self-gyro 2013-02-22 16:25:38 -08:00
Stephen Birarda
7d244bbd45 don't allow gyro to move user head for themselves 2013-02-22 16:17:07 -08:00
Stephen Birarda
af48f4aad2 switch back to EC2 domain server 2013-02-22 15:15:25 -08:00
Tomáš Horáček
4403f726bb Merge branch 'master' into 19095 2013-02-23 00:09:26 +01:00
Stephen Birarda
6a16d6e3bb clean up agent killing/re-adding for interface and domain 2013-02-22 14:54:19 -08:00
Stephen Birarda
b4184562e0 Merge remote-tracking branch 'origin/master' 2013-02-22 13:39:20 -08:00
Stephen Birarda
5d2cba0b2a add silent agent removal to AgentList class 2013-02-22 13:38:33 -08:00
Stephen Birarda
345ec8b938 fix threaded socket joins so that socket has timeout on blocking receive 2013-02-22 13:37:57 -08:00
Philip Rosedale
0453445b13 Render own manipulator hand in front of camera 2013-02-22 12:47:28 -08:00
Stephen Birarda
200982dddc fix for UDPSocket receive crash in Audio class and main.cpp 2013-02-22 12:20:16 -08:00
Philip Rosedale
41259f9ae0 Changed Hand to be a floating 'paddle' in front of the head 2013-02-22 12:10:29 -08:00
Tomáš Horáček
36a558d123 add "Scope" menu functionality 2013-02-22 18:38:25 +01:00
Tomáš Horáček
4741eb869e add Mac OS X "Scope" menu with empty action 2013-02-22 18:22:16 +01:00
Stephen Birarda
e7fc997f78 push and pop when drawing agent heads 2013-02-21 16:55:20 -08:00
Stephen Birarda
aa9f4f966e allow switchover to new audio mixer received from audio server 2013-02-21 15:43:52 -08:00
Stephen Birarda
1e00962fb7 fix crash on match to active socket, remove LD debug 2013-02-21 15:08:23 -08:00
Stephen Birarda
0becd86e6c show correct number of agents nearby 2013-02-21 15:04:17 -08:00
Stephen Birarda
4a60c5a07b switch back to EC2 domain server 2013-02-21 15:02:33 -08:00
Stephen Birarda
27c4702c7e move to agent head position before drawing it 2013-02-21 14:45:33 -08:00
Stephen Birarda
9ec51116d5 fix unecessary copy of Agent, blow away linkedData to rebuild it 2013-02-21 14:36:53 -08:00
Stephen Birarda
ea43988173 resolve conflicts on merge with master 2013-02-21 13:00:02 -08:00
Stephen Birarda
060f4dceca use AgentData class to abstract implemenation of linked data 2013-02-21 12:56:57 -08:00
Philip Rosedale
15fd9638d6 remove deadhead (of self) at origin. First commit of voxels with LOD, recursive test pattern. 2013-02-20 21:38:42 -08:00
Stephen Birarda
c57380012e hook domain server up to AgentList, pack sockets 2013-02-20 18:32:23 -08:00
Stephen Birarda
7205817476 remove AgentSocket abstraction to use sockaddr struct 2013-02-20 11:44:35 -08:00
Stephen Birarda
42927ec602 implement pingAgents method in AgentList 2013-02-19 17:46:49 -08:00
Stephen Birarda
9a514f56e5 have AgentList control the required UDPSocket instance 2013-02-19 17:34:34 -08:00
Stephen Birarda
9d5a800c6f begin abstraction of Agent communication to shared classes 2013-02-19 16:38:57 -08:00
Philip Rosedale
fd151fb7bc trivial change for gyro fix 2013-02-18 16:42:19 -08:00
Stephen Birarda
307fa9e5fa point to EC2 domain server instead of local machine 2013-02-18 16:33:31 -08:00
Stephen Birarda
dcb0e5add2 copy resources to OS X application bundle 2013-02-18 11:39:29 -08:00
Stephen Birarda
fd73b8de82 always store ports as unsigned short ports 2013-02-18 09:50:15 -08:00
Stephen Birarda
c3c0793ddc mixer needs to send port as unsigned short 2013-02-18 09:39:52 -08:00
Stephen Birarda
612662c475 actually allocate memory for the agent private address 2013-02-18 09:36:47 -08:00
Philip Rosedale
87b52b5d90 Merge remote-tracking branch 'origin' 2013-02-18 09:00:06 -08:00
Philip Rosedale
bd45740dc6 Partial progress on new voxel model. 2013-02-18 08:59:44 -08:00
Stephen Birarda
c6a8f6415e switch back to EC2 domain server for test 2013-02-18 08:56:32 -08:00
Stephen Birarda
d1433aa2bd a bad version of UDP hole punching for local agents 2013-02-18 08:53:16 -08:00
Philip Rosedale
31ce33f3a3 Fly turn and strafe faster 2013-02-15 17:02:10 -08:00
Philip Rosedale
01767719eb Merge remote-tracking branch 'origin' 2013-02-15 16:46:23 -08:00
Philip Rosedale
514a373acd Partial commit with head render angle fixes 2013-02-15 16:45:50 -08:00
Stephen Birarda
d0203158c8 initial setup of polling for newly connected headset 2013-02-15 14:58:07 -08:00
Philip Rosedale
ba683de026 Merge remote-tracking branch 'origin' 2013-02-15 12:54:20 -08:00
Philip Rosedale
27860b1f07 Added stats display of agent ping times and various agent functions to get the data. 2013-02-15 12:53:21 -08:00
Stephen Birarda
da8fd5f4ee hook space server up to shared UDPSocket class 2013-02-14 16:45:00 -08:00
Philip Rosedale
c360fabd96 Domain IP is used if static, else looked up. 2013-02-14 13:20:06 -08:00
Philip Rosedale
10ff074e38 Don't render head if you are inside it (it's your own) 2013-02-14 13:14:01 -08:00
Stephen Birarda
9c822b9d58 dynamic switchover of audio mixer 2013-02-13 20:43:10 -08:00
Stephen Birarda
815783732c make UDPSocket non-blocking, thread receive of data in interface 2013-02-13 15:27:16 -08:00
Stephen Birarda
28beb3ecfc undo changes to interface constants 2013-02-13 13:44:26 -08:00
Stephen Birarda
09dee91279 collect agent address on receive to send back audio 2013-02-13 13:42:23 -08:00
Philip Rosedale
9ad121ea00 Now looking up IP address of domain server on startup. 2013-02-13 11:50:10 -08:00
Philip Rosedale
ecc7eee161 changed to EC2 domain server by default in interface, increased domain server keep alive timeout to 5 seconds. 2013-02-13 10:53:03 -08:00
Philip Rosedale
4ed1971276 Made oscilloscope 2 channel, turned on by default (need to fix injecting the last audio buffer tho). 2013-02-13 10:14:31 -08:00
Philip Rosedale
53a3d1f8c9 Added audio waveform oscilloscope, fixing head rendering of other agents and self. 2013-02-12 23:27:36 -08:00
Philip Rosedale
8d5a53b2c9 Added agent type to domain server, interface client 2013-02-12 20:48:09 -08:00
Philip Rosedale
a48d9ecd95 Added ping detection between agents 2013-02-12 13:18:19 -08:00
Philip Rosedale
6f9d223454 Fixed network-to-host byte order problems when storing ports. 2013-02-12 10:58:30 -08:00
Philip Rosedale
b651032b06 Merge remote-tracking branch 'origin/master' 2013-02-12 01:52:23 -08:00
Philip Rosedale
82594c31ba stop failing texture load at startup, always show nearby agent count 2013-02-12 01:50:12 -08:00
Philip Rosedale
b58bb6fe80 Head data streaming to other users, domain server improved, network.cpp removed and replaced with UDPSocket objects, input audio drives mouth color and size. 2013-02-12 01:41:36 -08:00
Stephen Birarda
b45286c6e5 add copied AudioRingBuffer for mixer, comment crashing mouse calls 2013-02-11 17:16:18 -08:00
Stephen Birarda
d394035e7e switch back to ARB functions with glext include 2013-02-08 14:49:12 -08:00
Stephen Birarda
d79bf39a24 using OpenGL later than 2, remove ARB from calls 2013-02-08 14:09:44 -08:00
Stephen Birarda
54b4762830 conditional Apple OS include of call to glPointParameterfvARB 2013-02-08 14:01:35 -08:00
Stephen Birarda
95dc030f19 fix casing of include of finger.h 2013-02-08 13:59:09 -08:00
Stephen Birarda
b339e47be2 glut should be only inlude required for OpenGL 2013-02-08 13:25:34 -08:00
Stephen Birarda
cedb212597 make Field a proper class to avoid duplicate symbols 2013-02-08 13:11:56 -08:00
Stephen Birarda
13a0597ab6 dynamic header for GLUT include 2013-02-08 12:17:35 -08:00
Philip Rosedale
58e96f0ab8 Merge branch 'master' of github.com:worklist/hifi 2013-02-07 20:09:29 -08:00
Stephen Birarda
0359cdbc12 merge with origin/master 2013-02-07 17:30:08 -08:00
Stephen Birarda
f5cbe7a05a cmake build working for interface project 2013-02-07 17:29:01 -08:00
Stephen Birarda
f9b8d6cde0 don't use find module for glm/portaudio 2013-02-07 12:24:05 -08:00
Stephen Birarda
4860fb086d link glm library to interface target 2013-02-07 11:41:01 -08:00
Stephen Birarda
1111e4837e intial restructuring for CMake setup 2013-02-06 18:07:36 -08:00
Renamed from Source/main.cpp (Browse further)