Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 06:44:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
87495 commits 70 branches 56 tags 1.2 GiB
Commit graph

7056 commits

Author SHA1 Message Date
Brad Davis
7bd8bbf565 Merge branch 'vr_menus' into infoview 2015-04-27 18:33:45 -07:00
Brad Davis
10b5935063 Let QML take care of more of the height/width stuff 2015-04-27 18:11:19 -07:00
Brad Davis
1beaf18d1b Prevent the login dialog from spawning the address bar on enter keys 2015-04-27 16:00:23 -07:00
Brad Davis
fd28baac8c Working on message box and addressbar tweaks 2015-04-27 15:42:20 -07:00
Bradley Austin Davis
ca16d37ce5 Mac testing 2015-04-27 12:46:34 -07:00
Brad Davis
14b660baf7 Merge branch 'vr_menus' into infoview 
Conflicts:
	tests/ui/src/main.cpp
 2015-04-27 11:43:49 -07:00
Brad Davis
d55d467d3f Tweaking VR menu for PR 2015-04-27 11:35:57 -07:00
Brad Davis
0b1df891af Backporting visual work from branch 2015-04-27 10:53:58 -07:00
Brad Davis
b216689b45 Removing old infoview, testing new dialogs 2015-04-27 00:02:11 -07:00
Brad Davis
fa31ba0754 Info-view 2015-04-26 10:37:14 -07:00
Brad Davis
a96f69a673 Switching to a wrapper mechanism for VR menus 2015-04-25 16:20:15 -07:00
Brad Davis
ee30588fd4 More menu work 2015-04-25 10:41:06 -07:00
Brad Davis
fbdb9b143e Merge branch 'ui-refactor' into m_and_m 
Conflicts:
	interface/resources/qml/HifiMenu.qml
	interface/resources/qml/MessageDialog.qml
	interface/resources/qml/Root.qml
	interface/resources/qml/TestRoot.qml
	interface/resources/qml/controls/Dialog.qml
	interface/src/Application.cpp
	interface/src/ui/LoginDialog.cpp
	libraries/ui/src/MessageDialog.cpp
	libraries/ui/src/MessageDialog.h
	libraries/ui/src/OffscreenQmlDialog.h
	libraries/ui/src/OffscreenUi.cpp
	libraries/ui/src/OffscreenUi.h
	tests/ui/src/main.cpp
 2015-04-24 18:02:12 -07:00
Brad Davis
e7b8efc2d9 Cleaning up unused stuff 2015-04-24 16:44:48 -07:00
Brad Davis
08d60c6a01 Fixing message dialog 2015-04-24 16:19:39 -07:00
Brad Davis
99a6e1f86c Breaking up offscreen UI work 2015-04-24 13:21:21 -07:00
Brad Davis
1ff8c67576 More work on menus and some code cleanup 2015-04-24 12:54:11 -07:00
Brad Davis
d68d13489d Working on appearance of menus 2015-04-23 21:55:31 -07:00
Brad Davis
f17387fab4 Working on menus 2015-04-23 21:23:21 -07:00
Brad Davis
bb1c73adc7 Working on menus 2015-04-23 14:24:01 -07:00
Brad Davis
8cb298a55b Working on menus 2015-04-23 14:23:15 -07:00
Brad Davis
d2ff89aaec Cleaning up qml 2015-04-23 14:23:13 -07:00
Brad Davis
8269b9925b Adding first pass at message box 2015-04-23 14:23:12 -07:00
Brad Davis
a9d65f168b Working on marketplace dialog 2015-04-23 14:23:11 -07:00
Brad Davis
8d23bf874f Enable resizable dialogs 2015-04-17 17:43:54 -07:00
Brad Davis
16efa2a46f Improving toggle visibility and loading behavior 2015-04-17 16:59:04 -07:00
Brad Davis
ad585f7559 Fixing NaN reference in test dialog 2015-04-17 10:05:54 -07:00
Brad Davis
781abdd047 Tweaking test dialog and adding browser test 2015-04-17 09:53:40 -07:00
Brad Davis
fd0c130dc2 Working on simplifying new dialog creation 2015-04-16 22:20:49 -07:00
Bradley Austin Davis
f700607a65 Working on OSX functionality 2015-04-15 23:08:55 -07:00
Brad Davis
aba2b395a6 Working on testing the QML ui 2015-04-15 12:35:30 -07:00
Brad Davis
d14d5f3d29 Working on new-UI implementations of address bar and login 2015-04-15 00:36:04 -07:00
Grayson Stebbins
0fd17b3303 editEntities.js --> edit.js 2015-03-27 14:40:16 -07:00
Ryan Huffman
3f986229d1 Rename edit-entities-commands.html to edit-commands.html 2015-03-24 13:43:10 -07:00
Ryan Huffman
6c941d73d5 Update edit.js help 2015-03-24 13:34:14 -07:00
Grayson Stebbins
7c78e598b8 Update to .com instead of .io in Welcome dialog 2015-03-06 15:15:48 -08:00
Jason Hawks
d0b47a66ab removed at symbol and added enter for teleport box 2015-02-19 14:49:00 -05:00
Clément Brisset
d2ed782626 Merge pull request #4308 from Triplelexx/20315 
CR for Job #20315 - Update contents of the "welcome to Interface" dialog
 2015-02-19 10:27:27 -08:00
Triplelexx
ffc6a6883e Add images to welcome page 
Replaced SVG placeholder items with images in interface-welcome.html.
 2015-02-17 20:45:01 +00:00
Kai Ludwig
0de598586c removed id "g3322" in start-script.svg because it is no longer used and causes a "link rect899 hasn't been detected!" message on script editor open. 2015-02-17 18:37:23 +01:00
Triplelexx
4936aac61c Code fixes 
Fix for CentOS showing too small.
Horizontal bar removed.
 2015-02-13 04:42:23 +00:00
Triplelexx
a968c0dcf9 Code revision & integration 
Change C++ source to use new HTML file. Old file deleted.
HTML formatting revised, some incorrect code pulled.
 2015-02-13 00:07:56 +00:00
Triplelexx
2e62e6b1e9 Create interface-welcome.html 
Initial commit for feedback. I need to double-check against Worklist
coding standards.
 2015-02-12 22:44:49 +00:00
Andrzej Kapolka
b4cd13f0be Fix for misaligned color/material textures when resolution is greater than the 
height map.
 2015-01-20 13:07:35 -08:00
Andrzej Kapolka
dafa44570a That was not the shader change I wanted to check in. This was. 2015-01-19 17:15:58 -08:00
Andrzej Kapolka
e5f3d48ffb Fix for splatted textures against empty regions. 2015-01-19 16:33:41 -08:00
Andrzej Kapolka
c99e2c3ec6 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
 2015-01-08 14:57:03 -08:00
Brad Hefta-Gaub
58a2a5eb83 Merge pull request #4027 from huffman/grid-shader-updates 
Grid shader updates
 2015-01-05 13:00:05 -08:00
Andrzej Kapolka
3959f99910 Fixed voxel textures. 2015-01-02 13:57:27 -08:00
Ryan Huffman
b6b2388d41 Update grid rendering to fade from center location rather than distance from camera 2014-12-31 11:15:44 -08:00
Sam Gateau
37017d0c16 moving the deferrered shaders from the resource folder to built-in the executable 2014-12-30 17:42:10 -08:00
Sam Gateau
e752edc44a Moving the shaders used in Model.cpp from resources folder into the built-in executable 2014-12-30 12:35:00 -08:00
Sam Gateau
29726b1b70 removing shaders from resource 2014-12-25 20:05:00 -08:00
ZappoMan
208d3c8413 remove old unused shaders 2014-12-11 13:59:21 -08:00
Sam Gateau
ff4d28abeb hack a separate emissive information in the g-buffer 2014-11-25 18:27:49 -08:00
Sam Gateau
77077f4e9c hack a separate emissive information in the g-buffer 2014-11-25 18:17:28 -08:00
Sam Gateau
4fbb094978 No reason to change that... 2014-11-24 15:39:34 -08:00
Sam Gateau
1f10a44ae4 More typos in glsl 2014-11-24 15:38:12 -08:00
Sam Gateau
68e2df8fc2 add a emissive parameter value to the lightmap shaders 2014-11-24 14:35:42 -08:00
Sam Gateau
6591f4dac2 adjust lighmap shading equation 2014-11-24 11:18:21 -08:00
Sam Gateau
8b23a2cd1e adding the shader files for the lightmap case 2014-11-24 10:33:31 -08:00
Sam Gateau
1f22d5b493 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-11-24 10:05:39 -08:00
Sam Gateau
87471df7a1 First version of the lighmap working 2014-11-21 18:08:34 -08:00
Sam Gateau
764ad72471 adding the light map support from FBX 2014-11-20 09:54:41 -08:00
Andrzej Kapolka
6dc4abd286 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-14 13:22:37 -08:00
Andrzej Kapolka
779f5f7614 Default avatar fixes. 2014-11-14 13:02:02 -08:00
Andrzej Kapolka
d05bb49a74 Yet more heightfield spanner bits. 2014-11-12 15:40:54 -08:00
Andrzej Kapolka
caef237376 More work on spannerizing heightfields. 2014-11-11 14:40:05 -08:00
Andrzej Kapolka
e08a0144c2 Cleanup on aisle three! Removed the color/normal/voxelized spanner bits, as 
well as the throbbing/scripted guides and the notion of spanner masking.
 2014-11-06 19:15:43 -08:00
Andrzej Kapolka
fd00461b4e Perspective correction fix (lets us use lower tesselation on light volumes). 2014-11-05 16:50:34 -08:00
Andrzej Kapolka
1763d8f7f0 Switch to using cones/spheres (as opposed to screen-aligned quads) with depth 
testing for light geometry.
 2014-11-04 17:29:19 -08:00
Andrzej Kapolka
e76a8c2234 Fix for ambient occlusion in 3DTV mode. 2014-11-03 17:36:10 -08:00
Ryan Huffman
4f2fef0428 Add edit entities help window 2014-10-30 12:02:30 -07:00
Andrzej Kapolka
631419d23c Tweaks to heightfield conversion. 2014-10-22 18:22:21 -07:00
Andrzej Kapolka
3006950b83 Comment fix. 2014-10-14 18:24:44 -07:00
Andrzej Kapolka
fba383f6d3 Render voxel cursor on heightfields, too. 2014-10-14 15:21:45 -07:00
Andrzej Kapolka
d1c6aef953 Fixed my swizzle! 2014-10-10 17:36:21 -07:00
Andrzej Kapolka
1f63656a14 Comment fix. 2014-10-10 17:25:25 -07:00
Andrzej Kapolka
60da0f1567 Allow drawing cursor on dual contour surface, wired up material paint tool. 2014-10-10 17:18:52 -07:00
Andrzej Kapolka
c9fb73ecf8 Playing around with using points to represent distant voxel surfaces. 2014-10-06 18:52:10 -07:00
Andrzej Kapolka
0d5f81c062 Merge pull request #3540 from samcake/temp0 
replacing glutSolidSPhere by a cached Geometry
 2014-10-06 12:23:44 -07:00
Sam Gateau
bd5c6517a5 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 
Conflicts:
	interface/src/ui/MetavoxelEditor.cpp
	interface/src/ui/overlays/Sphere3DOverlay.cpp
 2014-10-03 17:31:05 -07:00
Andrzej Kapolka
91942e6188 Reduce the size of the smoothing step. 2014-10-03 17:17:22 -07:00
Andrzej Kapolka
3d88463569 Blend between cube face textures. 2014-10-03 17:05:14 -07:00
Sam Gateau
738369e21f Replacing glutSolidSphere by a cached Geometry 
Instead of calling glutSolidSphere, just call Application::getInstance()->getGeometryCache()->renderSphere(...)

- replaced all the instances of "glutSolidSphere"
- Changed the atmosphere shaders so instead of drawing a sphere of the size of the atmosphere, we draw a unit sphere, the vertices get scaled at the right radius in th vertex shader using  fOuterRadius
 2014-10-03 16:55:58 -07:00
Andrzej Kapolka
bf1c7b17fe Fix for texture coordinate generation. 2014-10-02 18:09:47 -07:00
Stephen Birarda
5b2b0c47c0 Merge pull request #3483 from stojce/20061 
Code Review for Job #20061
 2014-09-26 14:24:44 -07:00
stojce
039deb8b42 added go button active state icon 2014-09-24 23:26:34 +02:00
stojce
c14bf84af8 layout fix 2014-09-24 00:14:00 +02:00
Andrzej Kapolka
16cfaa6ea5 Use cubic texture coordinate generation for the dual contour surfaces. 2014-09-23 13:28:00 -07:00
Andrzej Kapolka
646c0dc48f Working on translucent model bits. 2014-09-19 15:31:46 -07:00
Andrzej Kapolka
446c2193ff Limit what we render for deferred point/spot lights based on the light's 
radius.
 2014-09-19 12:18:00 -07:00
Andrzej Kapolka
b9ae005e53 Working on the actual deferred lights. 2014-09-18 16:12:46 -07:00
Andrzej Kapolka
7580a1da89 Glow fix for simple shader. 2014-09-15 17:33:07 -07:00
Andrzej Kapolka
580d591dc4 Working on getting glow to work with deferred lighting. 2014-09-15 17:11:36 -07:00
Andrzej Kapolka
0f3a020b5d Working on getting particles/entities to work with deferred lighting; 
normalize normals from buffer.
 2014-09-15 16:07:48 -07:00
Andrzej Kapolka
e3a1341be1 Don't include the color on the skin. 2014-09-15 12:52:35 -07:00
Andrzej Kapolka
b3b82ba56c I think we need to include the color. 2014-09-15 12:49:51 -07:00
Andrzej Kapolka
70c8c146bc Fix for specular issue on Nvidia, try passing along material colors. 2014-09-15 12:44:25 -07:00
Andrzej Kapolka
4475759461 Revert the normal-based ambient occlusion; I wasn't crazy about the look of 
it.  Will perhaps revisit later.
 2014-09-15 11:52:44 -07:00
Andrzej Kapolka
48adbdfbd2 Shadow fix. 2014-09-12 19:05:49 -07:00
Andrzej Kapolka
24b193b5dc Alpha testing bits. 2014-09-12 18:11:46 -07:00
Andrzej Kapolka
42c8701b26 Don't use gl_Color for skin. 2014-09-12 17:36:58 -07:00
Andrzej Kapolka
72f38900bb Fix for blending on models. 2014-09-12 17:31:03 -07:00
Andrzej Kapolka
53933fc9c6 Working on deferred lighting for models. 2014-09-12 17:09:07 -07:00
Andrzej Kapolka
7074d96c04 Working on support for specular components in deferred lights. 2014-09-12 14:11:56 -07:00
Andrzej Kapolka
f954e4d7ea Fix for deferred lighting on voxels. 2014-09-11 19:06:29 -07:00
Andrzej Kapolka
e6f37544fd Use deferred lighting for voxels as well as metavoxels. 2014-09-11 18:06:56 -07:00
stojce
3339b92a49 Merge branch 'master' of https://github.com/highfidelity/hifi into 19964 2014-09-05 07:45:55 +02:00
Andrzej Kapolka
21f3f2b90e Switch to deferred lighting for metavoxels. 2014-09-04 17:17:44 -07:00
stojce
b527966db8 Merge branch 'master' of https://github.com/highfidelity/hifi into 19964 
Conflicts:
	interface/ui/preferencesDialog.ui
 2014-08-29 08:46:02 +02:00
Andrzej Kapolka
2dfabdfe64 Support for scaling splat textures in S and T, use mipmaps for them. 2014-08-22 16:43:09 -07:00
stojce
7e250bc899 Remove custom styling 2014-08-23 00:16:25 +02:00
Andrzej Kapolka
72500630b0 Basic splatting. 2014-08-20 19:26:06 -07:00
Andrzej Kapolka
416d9bac2e Working on texture rendering. 2014-08-20 14:48:02 -07:00
Andrzej Kapolka
668f6d3cfd Support for shadows on heightmaps. 2014-08-15 16:13:47 -07:00
Andrzej Kapolka
2c0f8ff57e Working on rejiggering the heightfield tiles. 2014-08-12 10:56:15 -07:00
Andrzej Kapolka
b7b1b018ee No need to use a texture for the cursor; we can just use a fragment shader. 2014-08-08 11:24:57 -07:00
Andrzej Kapolka
0fc34a47aa Show heightfield cursor. 2014-08-07 18:19:58 -07:00
Andrzej Kapolka
4696832ec6 Compute heightfield normals from adjacent values in vertex shader. 2014-08-05 15:13:50 -07:00
Andrzej Kapolka
c3c2265ddd Hide the unset (black) bits. 2014-07-30 18:14:11 -07:00
Andrzej Kapolka
6824479762 Progress on rendering heightfield buffers. 2014-07-29 16:06:35 -07:00
Andrzej Kapolka
aeee369286 Working on heightfield implementation. 2014-07-28 19:10:59 -07:00
Andrzej Kapolka
bbd977777a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-22 19:24:02 -07:00
Andrzej Kapolka
4f87524821 Switched back to using uniforms for light parameters, as using the fixed 
function state killed my frame rate.  Also cleaned up some of the location
tracking.
 2014-07-22 18:03:13 -07:00
Andrzej Kapolka
be028c2b01 Fixes for local lights. 2014-07-22 14:13:51 -07:00
Andrzej Kapolka
0ddd3e650c More point bits (trying a different tack). 2014-07-21 19:00:13 -07:00
TonyPeng
ef4b95c6e0 Merged from master. Get rid of redundant GL fog states. Moved local light parameters to shader uniform arrays. 2014-07-09 13:27:42 -07:00
TonyPeng
56eadcb0dc Get rid of redundant GL calls for fog. Enable and disable fog during rendering stage of voxels. Moved the local light parameters to shader uniform arrays. 2014-07-09 12:05:34 -07:00
TonyPeng
94e81da557 Added local lights to avatar. Added haze to voxel. 2014-07-08 09:44:28 -07:00
Chris Oates
2d9a42c07a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-02 13:12:37 -07:00
Chris Oates
e903b1659a Implemented Improved Perlin Noise in existing "textured voxels" option. 
TextureCache.cpp: modified so that permutation texture contains known permutation of 0..255 rather than random set of values. Does not noticeably affect visuals.
perlin_modulate.frag: implementation of improved noise, per 2002 SIGGRAPH paper, including "turbulence" summation.
 2014-07-02 13:09:16 -07:00
barnold1953
1af2996cf2 Properly use body orientation for Oculus camera 2014-06-27 09:53:31 -07:00
barnold1953
67c5281205 Fixed CMake for oculus. Gave Oculus its own camera for minimum latency. 2014-06-26 17:10:53 -07:00
barnold1953
6fcfde1100 Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 2014-06-26 11:27:47 -07:00
barnold1953
61b20b2be0 Working 3.2 Oculus SDK 2014-06-26 09:56:19 -07:00
Ryan Huffman
7a08ac76d2 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 
Conflicts:
	interface/src/Menu.cpp
	interface/ui/preferencesDialog.ui
 2014-06-17 20:27:16 -07:00
barnold1953
c593117ac5 New reticle for sixense and oculus mouse movement 2014-06-13 15:03:09 -07:00
Ryan Huffman
355fe01490 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/ui/PreferencesDialog.cpp
	interface/src/ui/RunningScriptsWidget.cpp
	interface/ui/preferencesDialog.ui
	interface/ui/runningScriptsWidget.ui
 2014-06-11 13:30:47 -07:00
Andrzej Kapolka
67921c474e Merge branch 'master' of https://github.com/highfidelity/hifi into cascade 2014-05-29 17:09:09 -07:00
Andrzej Kapolka
391902f79b Cascaded shadow maps for models. 2014-05-29 15:30:40 -07:00
Andrzej Kapolka
09231f01f3 Retain "simple" shadows, supply cascaded as option. 2014-05-29 12:48:41 -07:00
AndrewMeadows
21f045ebe0 Merge pull request #2939 from huffman/19648 
Code Review for Job #19648
 2014-05-29 08:53:31 -07:00
Andrzej Kapolka
ff77644caa Progress on selecting cascades. 2014-05-28 18:35:30 -07:00
Andrzej Kapolka
c3f6cab199 Working on cascading shadow maps. 2014-05-28 15:20:09 -07:00
Andrzej Kapolka
7c12417653 Use multisampling on the shadow maps for the voxels, too. 2014-05-27 17:26:19 -07:00
Ryan Huffman
44c5e56a4b Update JSConsole colors 2014-05-27 14:09:53 -07:00
Andrzej Kapolka
e22d239d4d What the heck; let's try using some multisampling on the shadow maps. 2014-05-27 12:30:45 -07:00
Ryan Huffman
4a0a9f8a36 Update console style 2014-05-27 08:57:29 -07:00
Ryan Huffman
9af0269151 Update console style 2014-05-27 08:05:56 -07:00
Andrzej Kapolka
67e3454a86 Missed a few files. 2014-05-23 16:37:12 -07:00
Andrzej Kapolka
0baf757c0d Basic support for shadows on models. 2014-05-23 16:35:51 -07:00
Andrzej Kapolka
bfd00f1b15 Use local viewer model for specular. 2014-05-23 10:57:14 -07:00
Ryan Huffman
4115e0fab2 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 
Conflicts:
	interface/src/Application.cpp
	interface/ui/preferencesDialog.ui
 2014-05-21 13:42:37 -07:00
Andrzej Kapolka
4f4b4c08bb Restore specular lighting--but, per the OpenGL spec, shut off specular 
contribution if the surface isn't facing the light.
 2014-05-19 12:29:49 -07:00
Kai Ludwig
51965fd283 changed 
float specular = max(0.0, dot(normalize(gl_LightSource[0].position + vec4(0.0, 0.0, 1.0, 0.0)), normalizedNormal));
to
    float specular = max(0.0, dot(gl_LightSource[0].position, normalizedNormal));

Calculation for specular value has to be done like in all other shaders with the unmodified unnormalized lightsource position. Otherwise the specular effect will have weird behaviour.
 2014-05-16 15:44:07 +02:00
Ryan Huffman
cfb1e5ac4e Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 
Conflicts:
	interface/ui/runningScriptsWidget.ui
 2014-05-14 17:33:47 -07:00
Ryan Huffman
38a5b5b8d1 Add ScriptsLocation settings value 2014-05-14 00:28:11 -07:00
Stojce Slavkovski
7ffb700564 fixed mention sounds dir for deployment 2014-05-12 20:55:24 +02:00
Andrzej Kapolka
d0537e7ead Specular map support. 2014-05-06 17:32:10 -07:00
Ryan Huffman
f4cb17ba4a Merge remote-tracking branch 'upstream/master' into 19640 2014-05-06 16:18:25 -07:00
Ryan Huffman
911b8cd623 Update welcome screen 2014-05-06 16:17:40 -07:00
Stojce Slavkovski
4d8e1b5bd4 repled audio files 2014-05-02 23:52:12 +02:00
Stojce Slavkovski
d6b7dac649 Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-01 01:41:11 +02:00
Ryan Huffman
edcff0b67f Merge remote-tracking branch 'upstream/master' into RunningScripts 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/FramelessDialog.cpp
	interface/src/ui/FramelessDialog.h
 2014-04-29 16:28:36 -07:00
Stojce Slavkovski
ca2c8d2fff Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-04-29 22:31:47 +02:00
Clément Brisset
02d527baae Merge pull request #2740 from stojce/19617 
Code Review for Job #19617
 2014-04-29 11:29:12 -07:00
Stojce Slavkovski
d24b55871f Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-04-29 19:05:16 +02:00
Stojce Slavkovski
9f070406ed missing 'extra debugging' check icon; fix font 2014-04-29 00:02:24 +02:00
Ryan Huffman
46d4a31f01 Update login images 2014-04-28 13:16:06 -07:00
Ryan Huffman
23397a4b10 Add LoginDialog 2014-04-28 08:55:03 -07:00
Stojce Slavkovski
5c7fb3eca5 Add chat mention notifications 2014-04-26 22:19:33 +02:00
Ryan Huffman
792ab7e17e Update icon for Load Script button 2014-04-25 15:57:10 -07:00
Ryan Huffman
c65d5f08ca Merge remote-tracking branch 'upstream/master' into 19554-2 2014-04-23 10:54:51 -07:00
Ryan Huffman
9bea70ac54 Revert "Add emoticons to chat" 
This reverts commit 3c9b6264a8.
 2014-04-23 10:49:22 -07:00
Thijs Wenker
c016d6557e - few Adjustments in Application class for Script editor 
- Shortkey for script editor (Alt+S)
- highlighter: bold true/false , single line comments
- Run scripts from the editor works
- More icons from Maximillian, Thanks
- Run on the fly checkbox, works if the script is running.
- Load/save features
 2014-04-21 05:25:28 +02:00
Ryan Huffman
3c9b6264a8 Add emoticons to chat 2014-04-17 19:51:25 -07:00
Ryan Huffman
2de9848a37 Merge remote-tracking branch 'upstream/master' into 19554-2 2014-04-16 14:42:20 -07:00
Ryan Huffman
4afea2d228 Remove chat window docking 2014-04-16 09:55:12 -07:00
Thijs Wenker
8e6130091d Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-16 11:28:46 +02:00
Stojce Slavkovski
1a3e6595c5 Allow users to set the destination of Snapshots 2014-04-15 19:36:02 +02:00
Thijs Wenker
1634e574d7 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-15 00:40:48 +02:00
Thijs Wenker
af47510b05 Initial script editor widget / icons made by MaximillianMerlin ty 2014-04-15 00:30:01 +02:00
Ryan Huffman
aaddecd024 Merge remote-tracking branch 'upstream/master' into 19554 
Conflicts:
	interface/resources/resources.qrc
	interface/ui/chatWindow.ui
 2014-04-14 11:20:49 -07:00
Atlante45
c39434f4e3 Merge branch 'master' of https://github.com/highfidelity/hifi into remove_qrc_from_sources 
Conflicts:
	interface/resources/resources.qrc
 2014-04-11 12:08:17 -07:00
Atlante45
18b364d9d9 Removed QResources from Interface 2014-04-11 11:57:25 -07:00
Philip Rosedale
8ccc0a2081 Merge pull request #2650 from thoys/chatwindow-docking-feature 
Fixed docking of ChatWindow
 2014-04-11 07:21:53 -07:00
Stojce Slavkovski
3af3b29588 removed dependency on QT resource 2014-04-11 00:54:54 +02:00
Thijs Wenker
f0463a5679 Fixed docking of ChatWindow 
Temporary Pin Icon, replace with a nice looking one please
 2014-04-11 00:45:38 +02:00
Stojce Slavkovski
459fed5c7b Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-04-10 21:52:37 +02:00
Ryan Huffman
de475ee46c Update behavior of chat window close button 
Use a stylesheet to suppress highlighting of the background when
pressing the button down.  Instead, it will change the image.

Unfortunately I wasn't able to find a way to do this without requiring
an extra image, or by doing it through the icon system.  The different
icon states didn't seem to take effect for button presses, and using
opacity in the stylesheet doesn't work yet for `QPushButton`s.
 2014-04-10 12:19:27 -07:00
Stephen Birarda
c208af2246 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-09 15:10:48 -07:00
stojce
c9605be193 Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-04-09 21:57:56 +02:00
Stephen Birarda
f969e050cd add apache license to shader headers 2014-04-09 09:59:05 -07:00
stojce
ce85e67a42 Modify icons in Interface "mirror" 2014-04-09 18:54:59 +02:00
stojce
8dc6ca75a4 Merge branch 'master' of https://github.com/worklist/hifi into 19508 
Conflicts:
	interface/interface_en.ts
	interface/resources/resources.qrc
	interface/src/Menu.cpp
 2014-04-04 21:16:29 +02:00
Atlante45
5acc8313ba Manual merge 2014-04-02 18:07:55 -07:00
Andrzej Kapolka
563725e781 Use the "correct" shadow strategy: include only ambient term when in shadow. 2014-03-27 13:44:34 -07:00
Andrzej Kapolka
7cc7230745 Adjust the shadow shader to prevent seeing shadows on the opposite sides of 
objects.  Closes #2544.
 2014-03-27 13:18:45 -07:00
stojce
547f33f4d6 Merge branch 'master' of https://github.com/worklist/hifi into 19508 
Conflicts:
	interface/interface_en.ts
 2014-03-25 22:15:52 +01:00
Andrzej Kapolka
62884f1f4f Don't use textures/fancy shaders when rendering shadow map. Closes #2270. 2014-03-24 13:15:03 -07:00
stojce
aaa5e15035 Merge branch 'master' of https://github.com/worklist/hifi into 19508 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	assignment-client/src/audio/AudioMixerClientData.cpp
	interface/interface_en.ts
	interface/src/Menu.cpp
	libraries/audio/src/AudioRingBuffer.cpp
 2014-03-21 22:35:57 +01:00
stojce
9077a05f9d - Layout fix 
- Model browsers
- merge
 2014-03-21 22:34:10 +01:00
Andrzej Kapolka
5b3340ce49 Add Ryan's updated smoothing factors. 2014-03-21 10:38:29 -07:00
stojce
b417851dde Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-03-20 12:10:53 +01:00
Andrzej Kapolka
f2cc227331 Ryan's requested change for rotation smoothing. 2014-03-18 10:17:32 -07:00
stojce
913783c0f1 resizing 
- fixed layout
 2014-03-16 22:47:03 +01:00
stojce
ebd7dff4b9 QSpinBox, QDoubleSpinBox styling 2014-03-15 22:07:29 +01:00
stojce
4e2d3c9549 styling QSlider 2014-03-14 23:24:32 +01:00
stojce
939c17d0be Merge branch 'master' of https://github.com/worklist/hifi into 19508 
Conflicts:
	interface/src/Menu.h
 2014-03-13 18:41:58 +01:00
Dimitar Dobrev
727903b216 Changed the chat window to a popup with a custom closing button. 2014-03-13 04:07:33 +02:00
Andrzej Kapolka
853bba27ca Applied Ryan's tweaks to Visage mapping and config file. 2014-03-10 15:13:24 -07:00
stojce
8decf55e3f Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-03-08 13:19:45 +01:00
Stephen Birarda
b705ec560f cleanup resources directory references by copying beside the executable 2014-03-06 11:46:49 -08:00
Stephen Birarda
c737283935 qrc references should only use a single slash 2014-03-06 10:45:47 -08:00
Stephen Birarda
403f91c988 update resource references to use Qt resource system 2014-03-06 10:41:11 -08:00
Stephen Birarda
cc554c53f1 use Qt Resource System to compile in resources 2014-03-06 10:25:15 -08:00
stojce
6383457e4e styling 
bad merge fix
 2014-02-26 22:15:12 +01:00
stojce
3ced4c9bef Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-02-25 20:58:07 +01:00
stojce
1e2cd0c1a2 UI changes 2014-02-25 20:36:14 +01:00
stojce
2c0e285323 Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-02-23 13:54:34 +01:00
stojce
ec73edb8d8 restyled preferences dialog 
- Frameless dialog super class
 2014-02-23 13:54:22 +01:00
Stephen Birarda
340248ac43 resolve conflicts on merge with upstream master 2014-02-21 15:16:15 -08:00
Atlante45
9238ef13e6 Changed Import button size 2014-02-20 10:37:31 -08:00
Stephen Birarda
6f84230d9d resolve conflicts on merge with upstream/master 2014-02-20 10:14:36 -08:00
Atlante45
af3e19e640 Added style and pngs for the buttons 2014-02-19 16:01:14 -08:00
Stephen Birarda
5f130872af repair usage of INI file for QSettings 2014-02-19 14:09:18 -08:00
Atlante45
a732cbf300 Modified QSS for new UI (QProgressBar) 2014-02-19 12:37:08 -08:00
Atlante45
64031701e1 Added icons for import dialog buttons 2014-02-19 12:33:05 -08:00
Philip Rosedale
37e1c00828 Merge pull request #2002 from ZappoMan/lowerLODnoFPSdrop 
Automatically Adjust LOD
 2014-02-16 18:14:24 -08:00
ZappoMan
d6b71f19a8 fix voxel texture to work better with larger TREE_SCALE 2014-02-12 18:00:09 -08:00
Andrzej Kapolka
b6d77ec637 Switched from loading FBX and FST simultaneously to loading FST first, then 
using its filename and texdir properties (as Faceshift does) to locate the
corresponding model.  Also fixed a bug with the fallback models (they were
invisible after second failure).
 2014-02-11 14:20:52 -08:00
Andrzej Kapolka
2071da2c8a Provide a means to specify a fallback for when we fail to load a model. Also 
added missing associated resources for default model.  Closes #1960.
 2014-02-10 18:50:36 -08:00
Stephen Birarda
230caf5b27 add the default body and head to the resources directory 2014-02-10 10:26:28 -08:00
Andrzej Kapolka
4f4c4c68d9 Streaming cleanup, streaming script strings as repeated values. 2014-02-04 18:31:18 -08:00
Andrzej Kapolka
4deb9936ba Don't add the specular alpha in the model fragment shaders. 2014-01-27 17:44:13 -08:00
stojce
40ea552981 filename format changes 
- new wav file
- changed filename format
 2014-01-27 20:35:06 +01:00
stojce
74801da07f #19491 - Implement in-app snapshots 2014-01-27 18:07:03 +01:00
stojce
0c2e55a53b Merging with master 
- resolve conflicts on GeometryCache
 2014-01-24 07:31:22 +01:00
Andrzej Kapolka
ff4795d9a5 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-22 15:59:02 -08:00
stojce
becbd4cb1c Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-23 00:54:05 +01:00
Stephen Birarda
d2e02c15d8 repair the UpdateDialog so it is a QDialog with no child QWidget 2014-01-22 14:17:56 -08:00
Andrzej Kapolka
aabff3f141 Adjust the fog density; getting different results on Linux vs. OS X. 2014-01-22 14:17:02 -08:00
Andrzej Kapolka
0a3d6ae5e0 More work on metavoxel editing (grid, etc.) 2014-01-21 19:31:56 -08:00
stojce
19c4b2b2ec Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-21 22:51:32 +01:00
Andrzej Kapolka
5e908134ea Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-21 11:05:00 -08:00
Andrzej Kapolka
bf9fc65de4 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-20 17:40:16 -08:00
Leonardo Murillo
82ecc9cc36 Merge branch 'master' of github.com:/worklist/hifi 2014-01-17 13:06:59 -06:00
stojce
36d21e812d Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-17 19:46:02 +01:00
Andrzej Kapolka
e7a3beed78 Removed a couple more resources. 2014-01-16 15:17:38 -08:00
Andrzej Kapolka
1b891cb326 Removed unused resources. 2014-01-16 15:16:19 -08:00
stojce
50ad5a4ec8 alternate css background settings for selected items in QTreeView 2014-01-15 23:38:34 +01:00
stojce
8e2879e5ff Layout fixes 2014-01-15 23:14:45 +01:00
Leonardo Murillo
40492a1713 Removing text from .ui 2014-01-14 22:16:06 -06:00
Leonardo Murillo
b20334de1d Dont need qss 2014-01-14 22:13:49 -06:00
Leonardo Murillo
f9bb98680d Using Qt Designer .ui file instead of manually coding dialog 2014-01-14 21:57:28 -06:00
Andrzej Kapolka
c163b513d2 Working on allowing visitors to modify, as well as read, data. 2014-01-13 18:09:28 -08:00
stojce
06ecf03180 Layout fix (notes from Grayson) 2014-01-13 23:04:19 +01:00
stojce
577ff766ee fix size of grid items 2014-01-12 00:53:49 +01:00
stojce
048359e3a4 more layout fixes 2014-01-12 00:44:50 +01:00
stojce
3afacfce4f Info label layout 2014-01-12 00:40:29 +01:00
stojce
0c4bee8d12 save and restore dialog settings 2014-01-12 00:33:46 +01:00
stojce
623def0964 File filter 
Display extensions
 2014-01-11 21:03:49 +01:00
stojce
227326e3b7 Import button opacity 2014-01-11 14:40:22 +01:00
stojce
80561b6861 removed size hint from sag icons 2014-01-10 23:47:18 +01:00
stojce
d5e07a5c75 Add import configuration 
remove unused icons
remove redundant QLabels
 2014-01-10 23:26:58 +01:00
Leonardo Murillo
ede32cfadc Checkpoint 2014-01-10 14:08:10 -06:00
Leonardo Murillo
eb52ded4ad Styling + others 2014-01-09 20:34:02 -06:00
stojce
5b678cb24d Layout fix 2014-01-09 18:15:39 +01:00
Leonardo Murillo
efb173e1d4 Preliminary update dialog work 2014-01-08 21:20:43 -06:00
stojce
cc543f4313 Added custom icons (QFileIconProvider) 2014-01-07 00:41:11 +01:00
Leonardo Murillo
ba79b1b329 Using BUILD_VERSION to setApplicationVersion 2014-01-06 09:18:10 -06:00
stojce
8855a32526 removed unused widgets 2014-01-06 11:15:15 +01:00
Stojce Slavkovski
2b92194d35 sytle changes on log dialog 2013-12-29 23:45:24 +01:00
Stojce Slavkovski
ee1eb25dfa replace LogDisplay with File logger 
- added abstract logger interface
 2013-12-22 18:56:53 +01:00
Stojce Slavkovski
3d44ab9939 Dialog layout 2013-12-22 15:06:40 +01:00
Stojce Slavkovski
4c1226ffd9 Merge branch 'master' of https://github.com/worklist/hifi into 19461 2013-12-18 08:00:55 +01:00
Andrzej Kapolka
ff2b77d311 Back to a more modest depth. 2013-12-17 17:16:09 -08:00
Andrzej Kapolka
e6a41b2003 Proof of concept sphere thing for metavoxels. 2013-12-17 16:56:52 -08:00
Stojce Slavkovski
57b4148867 Dialog position / toggle 2013-12-17 22:12:24 +01:00
Stojce Slavkovski
18295809ce log dialog style changes 2013-12-17 21:44:44 +01:00
Stojce Slavkovski
e788d746d4 added dialog for log data 
- importing Inconsolata.otf on application level
- style sheet for dialog
- changed menu behaviour for log data
 2013-12-16 22:43:17 +01:00
Andrzej Kapolka
c003a55c37 Diffuse lighting. 2013-12-12 16:19:05 -08:00
Andrzej Kapolka
c1aec11b32 More work on rendering voxels. 2013-12-12 15:14:19 -08:00
Andrzej Kapolka
f6b3a6ceca The other part of the Oculus ambient occlusion fix. 2013-11-26 17:53:31 -08:00
Andrzej Kapolka
e406988ed3 Partial fix for ambient occlusion with Oculus. 2013-11-26 17:18:03 -08:00
Andrzej Kapolka
c5406c47a6 Moved Oculus code out of Application, started on using StereoConfig to get 
actual values to replace the magic numbers.
 2013-11-26 11:59:06 -08:00
Andrzej Kapolka
f0e5872b89 Lighten the shadows, remove some debug code. 2013-11-21 12:29:22 -08:00
ZappoMan
c4a2b3c49b fix thinning in voxels as points by using correct points to calculate width of voxel based on camera position relative to voxel 2013-11-03 11:10:00 -08:00
ZappoMan
508b8f4678 change in comment to kick off build 2013-11-01 16:29:49 -07:00
ZappoMan
b103f9dacf clean up 2013-11-01 15:32:17 -07:00
ZappoMan
e62322b805 clean up comment 2013-11-01 15:28:54 -07:00
ZappoMan
61b6d6a4a4 added comment about fixing point selection 2013-11-01 15:27:57 -07:00
ZappoMan
cab87c3a97 added comment about fixing point selection 2013-11-01 15:27:25 -07:00
ZappoMan
b3aac56d29 first cut a variable point size point rendering 2013-11-01 14:33:06 -07:00
Andrzej Kapolka
12374c2cc4 Allow more clusters per mesh. 2013-10-31 17:01:00 -07:00
ZappoMan
e9d366fb80 Merge pull request #1147 from ey6es/ick 
Support for normap maps on loaded models.
 2013-10-30 12:26:56 -07:00
Andrzej Kapolka
06e050f1c1 Normal map support almost there. 2013-10-29 22:13:00 -07:00
stojce
a14242632a Rear view zoom level 
new zoom icons
save and restore state from settings
display zoomed out rear view when selected
 2013-10-29 20:51:14 +01:00
stojce
4fe9964e5a reset view 
- reset icon
- resetView signal
 2013-10-28 18:19:31 +01:00
Andrzej Kapolka
62b2388592 Temporary fix for Mavericks: the skin shader isn't getting the color, so just 
use white.  We're not using vertex colors on anything skinned yet, anyway.
 2013-10-25 14:40:00 -07:00
Andrzej Kapolka
bae4a17605 Voxel attachments. 2013-10-24 13:59:04 -07:00
Andrzej Kapolka
cf78e21ea4 Merge branch 'master' of https://github.com/worklist/hifi into ossome 
Conflicts:
	interface/src/Application.cpp
 2013-10-23 10:06:56 -07:00
stojce
2fcb246923 close button on rear mirror view 2013-10-22 20:42:31 +02:00
Andrzej Kapolka
7ddac20c62 Allow more bones. The model I'm testing with has about 60. 2013-10-18 19:18:48 -07:00
Andrzej Kapolka
7e174093e4 Factoring the FBX model code out to a shared base class. 2013-10-18 17:26:03 -07:00
Andrzej Kapolka
a79c0a9244 Removed unused shader. 2013-10-15 17:14:20 -07:00
Andrzej Kapolka
d06acdd169 Per-pixel shading, material tweaks. 2013-10-15 11:50:29 -07:00
Andrzej Kapolka
e97cfb8cf8 Per-pixel specular for blend faces. 2013-10-14 19:59:13 -07:00
Andrzej Kapolka
124966d2e4 More progress on skinning. 2013-10-14 18:39:19 -07:00
stojce
7ce483b658 remove unused resource 2013-10-05 13:21:34 +02:00
stojce
61b213804a #19426 - Add a mute control to the interface 
- OpenGL overlay icon
- mute control
- icons
 2013-10-05 13:18:35 +02:00
Andrzej Kapolka
c98dec8a65 Dilate our network-downloaded textures. 2013-10-02 11:59:14 -07:00
ZappoMan
dbfc0956c1 added normals to voxel shader 2013-09-27 13:26:58 -07:00
Philip Rosedale
0fbabe9891 Merge pull request #984 from ZappoMan/voxel_geo_shader 
Voxel Geometry Shader Experiment
 2013-09-26 17:22:55 -07:00
ZappoMan
3ab92a592a fix comments in shaders 2013-09-26 17:05:04 -07:00
ZappoMan
07515d1c5f fix projection between shaders 2013-09-26 17:03:50 -07:00
ZappoMan
c0bfdfbc4f fix comment 2013-09-26 16:54:20 -07:00
ZappoMan
57b30c13d8 style cleanup 2013-09-26 16:45:09 -07:00
ZappoMan
864c00c6e0 removed some dead code 2013-09-26 16:38:29 -07:00
ZappoMan
552d9fadd8 rearranged menus, some hacking on voxel shader 2013-09-26 14:51:57 -07:00
Andrzej Kapolka
736dae0c81 Use shaders for eyes (like the ones for the iris). 2013-09-25 15:26:29 -07:00
Andrzej Kapolka
9a16d44a47 Render the eye textures. 2013-09-25 13:47:03 -07:00
ZappoMan
3d4341cee4 hacking on voxel geometry shader 2013-09-23 15:18:45 -07:00
stojce
114cc065bd Merge branch 'master' of https://github.com/worklist/hifi into 19418 2013-09-10 21:05:44 +02:00
stojce
a081f081f8 popup layot 
- center position
- resizable
 2013-09-09 23:27:03 +02:00
Andrzej Kapolka
ddf92b39c7 Fix for off-axis ambient occlusion. 2013-09-08 17:52:35 -07:00
stojce
8779e000fe #19418 Load a local HTML file in a web view within Interface 2013-09-08 21:29:35 +02:00
stojce
fef70098a3 #19418 Load a local HTML file in a web view within Interface 2013-09-08 21:28:30 +02:00
Andrzej Kapolka
d63bb3afaa Fixed glow/ambient occlusion with Oculus. 2013-08-21 15:44:57 -07:00
Andrzej Kapolka
f3a32a7934 Might as well convert the divide to a multiply. 2013-08-20 17:04:29 -07:00
Andrzej Kapolka
590672d035 Fewer texture lookups when diffusing. 2013-08-20 17:02:35 -07:00
Andrzej Kapolka
5b923bc6f2 More cleanup. 2013-08-20 13:46:13 -07:00
Andrzej Kapolka
22598ceb4f Optimizations for occlusion blur (the main one being that we only need to 
sample the texture four, not sixteen, times if we turn on linear filtering
and sample between the texels).
 2013-08-20 11:52:43 -07:00
Stephen Birarda
d0ab8317c4 Merge pull request #865 from ey6es/ssao 
Basic screen space ambient occlusion effect.  Defaults to off, because at the moment it slows things down substantially.
 2013-08-20 10:37:01 -07:00
Stephen Birarda
13f5b7f68d change application name to Interface 2013-08-20 10:02:06 -07:00
Andrzej Kapolka
b41fa1e03c Basic ambient occlusion effect up and running; needs tweaking and 
optimization.
 2013-08-16 17:26:47 -07:00
Andrzej Kapolka
3ddab484e0 Beginnings of ambient occlusion. Looks like an architectural drawing. 2013-08-15 17:52:31 -07:00
Andrzej Kapolka
cceeb1c6ff Merge branch 'master' of https://github.com/worklist/hifi into ssao 2013-08-15 13:11:12 -07:00
Andrzej Kapolka
3ad0b8b99d Merge branch 'master' of https://github.com/worklist/hifi into ssao 
Conflicts:
	interface/src/Application.h
 2013-08-15 10:06:22 -07:00
Andrzej Kapolka
a9ccca3f72 Diffuse/add glow mode. 2013-08-14 16:13:30 -07:00
Andrzej Kapolka
15f129f32d Added simple additive/blur-with-persist glow modes, means to cycle through 
modes.
 2013-08-14 14:14:47 -07:00
Andrzej Kapolka
d24e340c91 To keep the frame rate up, let's only sample eight points for the blur. 2013-08-13 14:52:35 -07:00
Andrzej Kapolka
01cd0d2a1f Have the glow effect add half of the original texture, too, and use it on the 
follow indicator.
 2013-08-13 14:22:29 -07:00
Andrzej Kapolka
b05b43f027 Render to texture first, rather than copying from the frame buffer. Copying 
from the frame buffer requires it to have an alpha channel, which actually
does something on OS X (meaning we have to set it to 1.0).  We're going to
want to render to texture anyway for SSAO (or other effects).
 2013-08-13 12:27:52 -07:00
Andrzej Kapolka
1828a105d4 Basic glow effect. 2013-08-08 16:55:45 -07:00
Andrzej Kapolka
bd3c235fe4 Switching between textured and untextured modes. 2013-08-06 16:23:58 -07:00
Andrzej Kapolka
720ae561df Working on support for a textured face mode that doesn't rely on the video 
stream.
 2013-08-06 13:27:54 -07:00
atlante45
f441295eb1 Merge branch 'pie_menu' of https://github.com/Atlante45/hifi into stalking_option 2013-08-02 14:15:07 -07:00
atlante45
fdd01a6551 merge 2013-08-01 15:48:57 -07:00
Andrzej Kapolka
ba9b5888d2 More work on full frame sending. 2013-08-01 13:00:01 -07:00
Andrzej Kapolka
ff0d63173c Pass the aspect ratio into the shader, since it no longer necessarily 
corresponds to the texture rectangle's aspect ratio.
 2013-07-18 21:25:11 -07:00
Andrzej Kapolka
b15724665b Removed unused variable, fixed shader comments. 2013-07-18 18:16:45 -07:00
Andrzej Kapolka
fdeb63c121 More work on face points. 2013-07-15 16:09:49 -07:00
Andrzej Kapolka
5c590638f3 Working on mesh rendering for faces. 2013-07-15 13:12:22 -07:00
Andrzej Kapolka
84bb2aa265 Started on C++ side of SSAO effect. 2013-07-14 18:21:18 -07:00
Andrzej Kapolka
5eac599243 Merge branch 'master' of https://github.com/worklist/hifi into ssao 2013-07-14 15:56:41 -07:00
Andrzej Kapolka
411cb92300 Working on face rendering as point cloud. 2013-07-14 15:54:29 -07:00
Andrzej Kapolka
b294b33ac7 Started on ambient occlusion shader. 2013-07-05 18:21:59 -07:00
atlante45
78aa3ac9f9 Added UI responsivness 2013-07-02 16:17:25 +02:00
atlante45
05a77bf373 Forgot to add .svg file 2013-07-02 09:29:11 +02:00
Stephen Birarda
0b243ec881 add fervor updater and run during launch if OS X release 2013-06-26 10:36:32 -07:00
Andrzej Kapolka
0dc0552f50 Basic Haar cascade/CamShift tracking. 2013-06-19 18:02:26 -07:00
Andrzej Kapolka
c11ab45474 It seems gl_ModelViewMatrixInverse is problematic on OS X; let's try passing 
in the camera's position as transformed into model space.
 2013-06-14 17:21:35 -07:00
Andrzej Kapolka
790cdfb0bd Added refraction to irises. 2013-06-14 16:46:34 -07:00
Andrzej Kapolka
7d1679dab7 Ryan's new iris texture. 2013-06-14 14:35:56 -07:00
Andrzej Kapolka
5241c41ddd Shed some light on what these shaders are doing, so to speak. 2013-06-14 11:29:32 -07:00
Andrzej Kapolka
4f9f2fa4ca Better iris texture. 2013-06-14 10:28:45 -07:00
Andrzej Kapolka
0f897340ee New iris texture from Ryan. 2013-06-13 16:42:31 -07:00
Andrzej Kapolka
e401663459 Added per-pixel specular highlight to irises. 2013-06-13 15:58:49 -07:00
Geenz
d512b414ee Correct after blending. 2013-06-09 22:48:14 -04:00
Andrzej Kapolka
d09700adde Merge branch 'master' of https://github.com/worklist/hifi into voxeltars 
Conflicts:
	interface/src/Avatar.cpp
	interface/src/Avatar.h
	interface/src/Skeleton.h
	interface/src/VoxelSystem.h
 2013-06-04 11:00:59 -07:00
Andrzej Kapolka
26b7976489 Merge branch 'master' of https://github.com/worklist/hifi into voxeltars 2013-06-03 09:49:50 -07:00
Jeffrey Ventrella
cf67f28b57 merge 2013-06-03 08:10:41 -07:00
Andrzej Kapolka
6c975f9c6f More work on avatar voxels. 2013-06-01 15:06:29 -07:00
Geenz
de76851207 Remove unnecessary normalize. 2013-05-31 20:35:26 -04:00
Geenz
d98b28d4ab So apparently, this was a scale problem the entire time. 2013-05-31 20:30:42 -04:00
Geenz
1eac57dd0c #19351 - Atmosphere shaders should be handled per-pixel instead of per-vertex. 2013-05-30 15:02:11 -04:00
Stephen Birarda
0fdbfe8ea8 move gen_stars to the tools folder 2013-05-22 12:39:27 -07:00
Stephen Birarda
b2518e0595 change the iris texture 2013-05-17 10:51:29 -07:00
Andrzej Kapolka
86ddcea87f Better names for the shaders. 2013-05-16 13:08:21 -07:00
Andrzej Kapolka
0a6b4702c6 Experimenting with simple Perlin noise shader for voxels. 2013-05-15 22:18:56 -07:00
Andrzej Kapolka
f0055bd419 Fixes for OS X: GLSL version must be first line in source, don't init glut 
(Qt apparently uses it?)
 2013-05-15 16:19:42 -07:00
Stephen Birarda
82ed4a4ae8 remove old style walking sounds 2013-05-10 17:21:58 -07:00
Philip Rosedale
527b65f6a4 Log cleanup. removed star field meridians. 2013-05-09 22:06:32 -07:00
tosh
395e4a7852 removes equator, achieves uniform distribution of stars implementing rejection sampling, adds UNIX script header 2013-05-09 12:08:19 +02:00
Andrzej Kapolka
5138f62aef Use the "proper" alpha value (i.e., the one from the original shader). This 
makes the sky somewhat darker, but that probably just means we need more
scattering or a brighter sun.
 2013-05-08 11:50:59 -07:00
Andrzej Kapolka
82f16e7f34 Include the "sky from space" shaders, too, and use them when the camera is 
outside the atmosphere's outer radius.
 2013-05-08 11:42:31 -07:00
Andrzej Kapolka
4567c31a26 Added licensing information from the GPU Gems site, fixed spacing. 2013-05-08 09:55:46 -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
7faa9e4318 More work on atmosphere rendering; rendering now working. 2013-05-07 12:40:15 -07:00
Stephen Birarda
d4ca60a668 remove image files that are no longer in use 2013-05-06 18:11:57 -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
tosh
06fc3ce00c adjusts the north-south meridian 2013-03-27 17:12:33 +01:00
tosh
56d802cd57 updates to a whole sphere of stars with meridians and equator 2013-03-27 17:06:36 +01:00
tosh
891194ed2e adds meridians with color gradient and an equator 2013-03-27 17:05:23 +01:00
tosh
eac8c99ee1 changes default to generate a full sphere 2013-03-27 15:46:54 +01:00
tosh
24d0f3a0a0 adds stars file in the right location so everything runs out of the box 2013-03-27 13:49:52 +01:00
tosh
8a1fd43437 implements a more uniform distribution of star positions and a progress bar 2013-03-27 03:28:48 +01:00
tosh
5de3ec035b leftover changes / minor corrections 2013-03-24 06:30:33 +01:00
tosh
4444bcf26e starfield and numerous utility components, initial checkin 2013-03-24 05:50:07 +01:00
Stephen Birarda
61f23a2d0f add a new walk sound 2013-03-22 14:06:20 -07:00
Stephen Birarda
4552140f61 add a sound when moving so we aren't ninjas 2013-03-21 16:11:17 -07:00
stojce
4d6bbba93d added eye texture 2013-03-06 07:20:11 +01:00
Stephen Birarda
1111e4837e intial restructuring for CMake setup 2013-02-06 18:07:36 -08:00