Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-27 04:16:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
4499 commits 71 branches 56 tags 1.2 GiB
Commit graph

666 commits

Author SHA1 Message Date
Andrzej Kapolka
5a113fd546 Added a stub for a Qt application class that creates a menu (which, since it's 
unparented, will only appear on OS X) with a test item connected to a slot.
 2013-05-10 12:07:47 -07:00
ZappoMan
e84d2696f9 fixed menu behavior 2013-05-10 12:04:52 -07:00
Philip Rosedale
7d69eb09c2 Merge remote-tracking branch 'upstream/master' 2013-05-10 10:55:39 -07:00
Stephen Birarda
2f9c16f495 have the oculus drive the body yaw, head pitch, and head roll 2013-05-10 10:55:26 -07:00
Philip Rosedale
f8701e6c0c Re-added Head Mouse working correctly with invensense 2013-05-10 10:55:05 -07:00
Stephen Birarda
cc38e4c5c4 Merge remote-tracking branch 'upstream/master' into oculus 2013-05-10 10:18:36 -07:00
Stephen Birarda
04447dfcbd drive body yaw and render pitch with oculus when connected 2013-05-10 10:17:21 -07:00
Andrzej Kapolka
beadb6a93d Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
 2013-05-10 10:03:05 -07:00
Andrzej Kapolka
f6fcdd78b2 Adding/removing voxels at different sizes. 2013-05-10 09:53:53 -07:00
Jeffrey Ventrella
470349d662 made avatars taller an fixed proportions a bit 2013-05-09 23:31:45 -07:00
ZappoMan
6b5eceeae1 Merge pull request #269 from Ventrella/master 
improved camera first person mode and cleaned up some camera code
 2013-05-09 22:26:59 -07:00
ZappoMan
f0b4dde388 Merge pull request #267 from PhilipRosedale/master 
Stars meridians removed and count reduced, some log cleanup
 2013-05-09 22:25:56 -07:00
Philip Rosedale
8521a9e146 added one more log line 2013-05-09 22:23:15 -07:00
Jeffrey Ventrella
751254ab56 set default camera mode back to third person 2013-05-09 22:22:21 -07:00
ZappoMan
bd3ea6ef65 create and delete voxels locally 2013-05-09 22:20:13 -07:00
Jeffrey Ventrella
6254a6886f cleaned up camera code and improved first person mode 2013-05-09 22:11:33 -07:00
Philip Rosedale
eefd0c36f1 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-09 22:06:57 -07:00
Philip Rosedale
527b65f6a4 Log cleanup. removed star field meridians. 2013-05-09 22:06:32 -07:00
Jeffrey Ventrella
6dfa20976d Merge remote-tracking branch 'upstream/master' 2013-05-09 17:24:50 -07:00
Philip Rosedale
cdab62c10c Merge pull request #265 from ZappoMan/render_voxels_optimization 
Optimized Voxel Rendering Performance by implementing blended VBO strategy
 2013-05-09 17:21:05 -07:00
ZappoMan
33fc9f5389 fixed partial VBO updates 2013-05-09 17:01:20 -07:00
Andrzej Kapolka
78b37fe920 Starting on coloring support. 2013-05-09 16:26:51 -07:00
Andrzej Kapolka
ecd12e0ac4 Show the voxels to be added/deleted as wireframe cubes. 2013-05-09 16:09:07 -07:00
Stephen Birarda
999ab5cb20 initial setup to connect to oculus and grab sensors 2013-05-09 15:45:09 -07:00
Jeffrey Ventrella
c2deba6e39 improved avatar touch code 2013-05-09 15:15:28 -07:00
Philip Rosedale
52337a1fae Merge remote-tracking branch 'upstream/master' 2013-05-09 15:03:45 -07:00
Stephen Birarda
613066f786 add linking of LibOVR to interface CMakeLists.txt 2013-05-09 15:03:14 -07:00
ZappoMan
7b22300164 Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-09 14:39:41 -07:00
Jeffrey Ventrella
3ba93397bd fixed a bug in menu clicking 2013-05-09 14:37:13 -07:00
Andrzej Kapolka
c411083057 Working on adding an "add voxel in front of avatar" command. 2013-05-09 14:30:50 -07:00
ZappoMan
c73d4ddfa4 Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-09 14:06:42 -07:00
ZappoMan
f490f3ed53 More work on partial VBO updates still not working 100% correctly 2013-05-09 14:04:08 -07:00
Philip Rosedale
ef1848a68c Merge remote-tracking branch 'upstream/master' 2013-05-09 14:03:03 -07:00
Philip Rosedale
dd33cedf8d Removed old serial code for Maple ADC 2013-05-09 14:01:22 -07:00
Andrzej Kapolka
145c6484f4 Fixed issue with mouse pressed state, use mouse buttons to add/delete voxels 
(numbers now switch between modes).
 2013-05-09 13:33:23 -07:00
Jeffrey Ventrella
17c61c88c7 cleaned up avatar slow-down upon nearness; fixed mouse pressed bug; 2013-05-09 13:04:22 -07:00
Andrzej Kapolka
dcd42096a5 Tabs -> spaces. 2013-05-09 10:56:08 -07:00
Andrzej Kapolka
7ff8b84f4c Return the box face, as well as the distance, from the ray intersection test. 
Use it to determine which voxel neighbor we create when adding.
 2013-05-09 10:46:52 -07:00
Andrzej Kapolka
4a0657fead Set up the lights after applying the camera transform so that they will be in 
world, not view, space.
 2013-05-09 10:29:15 -07:00
Andrzej Kapolka
0cff127082 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-09 09:56:58 -07:00
Andrzej Kapolka
785e55e06f Working on voxel editing. 2013-05-09 09:56:35 -07:00
Philip Rosedale
ddc97a6ac9 Merge remote-tracking branch 'upstream/master' 2013-05-08 19:36:45 -07:00
Philip Rosedale
76c5a74876 Added gyro pitch to view, moved onscreen displays around to look nicer. 2013-05-08 19:35:48 -07:00
Jeffrey Ventrella
fc549b73bd fixed merge conflict 2013-05-08 19:25:23 -07:00
Jeffrey Ventrella
bbd85664d6 Merge remote-tracking branch 'upstream/master' 2013-05-08 19:24:07 -07:00
Jeffrey Ventrella
7a24c50063 put orientation back in avatar folder (this should be put in a more logical place at some point) - also did some work on avatar renderer 2013-05-08 19:22:21 -07:00
ZappoMan
bf81587e1b Merge pull request #243 from PhilipRosedale/master 
Procedural noise support added on client, adds a bit of noise when moving
 2013-05-08 17:44:15 -07:00
Philip Rosedale
5052f4af5e Added render option for avatars, code cleanup. 2013-05-08 17:26:44 -07:00
Philip Rosedale
ebf06187b7 Merge remote-tracking branch 'upstream/master' 2013-05-08 16:16:27 -07:00
Andrzej Kapolka
caeccf59ec When the stars and the atmosphere are both on, adjust the stars' alpha value 
based on the distance from the atmosphere.
 2013-05-08 13:13:56 -07:00
Andrzej Kapolka
8a21823469 Render the stars, when enabled, before the atmosphere. 2013-05-08 12:11:48 -07:00
Andrzej Kapolka
c34b6df2f4 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	voxel-server/src/main.cpp
 2013-05-08 11:56:03 -07:00
Philip Rosedale
de6627f922 Merge remote-tracking branch 'upstream/master' 2013-05-08 10:40:05 -07:00
Andrzej Kapolka
8d4a74cf03 Render environment -> render atmosphere. 2013-05-08 10:00:31 -07:00
Philip Rosedale
355cff21c5 Merge remote-tracking branch 'upstream/master' 2013-05-08 09:06:13 -07:00
Philip Rosedale
baf64c07dc Added Procedural audio noise when moving, scaled to velocity 2013-05-08 09:04:38 -07:00
ZappoMan
de969891d8 Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-08 01:19:35 -07:00
ZappoMan
ddf49ffdec removed addRandomSphere() which was dead code 2013-05-08 00:46:02 -07:00
Andrzej Kapolka
80cdd597f4 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-07 17:53:27 -07:00
ZappoMan
085bfa384a Merge pull request #225 from PhilipRosedale/master 
Added perlin noise example function noiseTest()
 2013-05-07 17:53:07 -07:00
ZappoMan
005b2fce35 Merge pull request #223 from Ventrella/master 
cleaned up a bunch of spacings inside of parentheses
 2013-05-07 17:51:43 -07:00
Andrzej Kapolka
7c8a06ed4d Added wrapper classes for shaders/shader programs to ease the process of 
compiling, linking, assigning uniforms, etc.  They're modeled after the ones
included in QtOpenGL, which we can't use at the moment because they require
a Qt OpenGL context.
 2013-05-07 17:40:55 -07:00
Andrzej Kapolka
c7e31ec414 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	libraries/shared/src/PacketHeaders.h
 2013-05-07 14:44:17 -07:00
Andrzej Kapolka
47f3566929 Wavelengths, switch for environment rendering, far plane adjustment. 2013-05-07 14:40:30 -07:00
Stephen Birarda
92daa8e6e0 revert the type squish 2013-05-07 13:43:07 -07:00
Stephen Birarda
9be92cebdd revert type squish, spacing, code review comment 2013-05-07 13:41:48 -07:00
Stephen Birarda
d5d9479b65 make eve send her ID to identify with the avatar mixer 2013-05-07 13:38:56 -07:00
Philip Rosedale
0ae700d746 Merge remote-tracking branch 'upstream/master' 2013-05-07 12:53:19 -07:00
Stephen Birarda
0566330a8a some magic number removals 2013-05-07 12:44:45 -07:00
Andrzej Kapolka
7faa9e4318 More work on atmosphere rendering; rendering now working. 2013-05-07 12:40:15 -07:00
Stephen Birarda
85dfb23fbd add constant for UNKNOWN_AGENT_ID 2013-05-07 12:39:35 -07:00
Stephen Birarda
83e59b1aa8 more deletions 2013-05-07 12:05:32 -07:00
Stephen Birarda
5c90b4575e trivial deletions for cleanup 2013-05-07 12:05:25 -07:00
Stephen Birarda
4eeb1ed5b1 have interface clients tell the avatar-mixer and voxel-server what their ID is 2013-05-07 12:05:19 -07:00
Philip Rosedale
331d4116d9 Finished noiseTest example (in util.h) that uses Perlin noise to draw a bitmap in 2D. 2013-05-07 11:14:12 -07:00
Philip Rosedale
be1b803656 Noise Test function, adjust chat position 2013-05-07 10:41:39 -07:00
Jeffrey Ventrella
fe11d929e3 cleaned up code spacing 2013-05-07 08:43:14 -07:00
Philip Rosedale
c7635604a9 Fixes in merge. 2013-05-07 08:40:11 -07:00
Jeffrey Ventrella
65181cb4e0 changed some spacing formatting things 2013-05-06 22:23:16 -07:00
Jeffrey Ventrella
ef76c6ba0a Merge remote-tracking branch 'upstream/master' 2013-05-06 18:29:42 -07:00
Jeffrey Ventrella
22a0e39d6c more work on avatar touch, reachable radius, and hand states 2013-05-06 18:29:20 -07:00
Philip Rosedale
631ee8f478 Merge remote-tracking branch 'upstream/master' 2013-05-06 18:23:06 -07:00
Stephen Birarda
55a1e26585 remove the Texture class no longer in use 2013-05-06 18:10:21 -07:00
Jeffrey Ventrella
9fc56a6230 working out avatar touch stuff 2013-05-06 16:59:43 -07:00
Philip Rosedale
ff88d1fc06 Created a drawVector() call that will draw a vector in 3-space with axes for testing 2013-05-06 16:18:27 -07:00
Andrzej Kapolka
2226d722cf Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	libraries/shared/src/PacketHeaders.h
 2013-05-06 13:31:46 -07:00
Andrzej Kapolka
b4dd6b57aa Starting on environment bits. 2013-05-06 13:30:07 -07:00
Jeffrey Ventrella
2a1bbcc168 improved avatar gravity code and moved source of gravity vector to main.cpp 2013-05-06 12:35:52 -07:00
Jeffrey Ventrella
40213dfedd Merge remote-tracking branch 'upstream/master' 2013-05-06 11:31:33 -07:00
Jeffrey Ventrella
5c7fd0fe7d a few small formatting and glitch fixes 2013-05-06 11:29:18 -07:00
Stephen Birarda
928beac8e0 Merge branch 'master' of github.com:worklist/hifi into invensense 2013-05-06 10:38:53 -07:00
Jeffrey Ventrella
707d513dac Merge remote-tracking branch 'upstream/master' 2013-05-03 16:12:01 -07:00
Jeffrey Ventrella
cb8e68f300 fixed a physics bug in avatar body spring (forgot to use deltaTime) - and adjusted various physics constants accordingly. 2013-05-03 16:11:35 -07:00
Stephen Birarda
66e2771135 some cleanup in interface main 2013-05-03 15:58:55 -07:00
Andrzej Kapolka
c1a3478954 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-03 15:44:14 -07:00
Stephen Birarda
24c1ea5e7f resolve conflicts on merge with upstream master 2013-05-03 15:37:22 -07:00
Jeffrey Ventrella
85ad5601d7 added avatar shadow 2013-05-03 15:22:01 -07:00
Stephen Birarda
31e9c18346 couple of extra line deletions in main.cpp 2013-05-03 15:09:44 -07:00
Stephen Birarda
da93b596de some deletion cleanup in main.cpp 2013-05-03 15:08:48 -07:00
Stephen Birarda
1a8564f9d9 store avatar position and yaw in file to restore on relaunch 2013-05-03 15:05:28 -07:00