Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-21 01:20:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
48351 commits 25 branches 0 tags 1.1 GiB
Commit graph

2180 commits

Author SHA1 Message Date
Brad Hefta-Gaub
a5b28660ad Merge pull request #5113 from Atlante45/debug 
Fix text entities wrapping
 2015-06-12 11:23:31 -07:00
Atlante45
30ae78e3b6 Rename getRowHeight 2015-06-12 19:50:32 +02:00
Atlante45
26dd067982 Advance with _leading on y 2015-06-12 19:44:40 +02:00
Atlante45
f3d3bd7bec Remove _rowHeight 2015-06-12 19:44:15 +02:00
Clément Brisset
e4511e37f5 Merge pull request #5111 from ZappoMan/cullingBugs 
hack to fix culling bugs for some subMesh parts in the windmill scene
 2015-06-12 18:53:46 +02:00
ZappoMan
c17ae593f0 CR feedback 2015-06-12 09:04:16 -07:00
Atlante45
565bf8bcb2 Fix text entities wrapping 2015-06-12 15:41:37 +02:00
ZappoMan
2fc0233096 hack to fix culling bugs for some subMesh parts in the windmill scene 2015-06-11 20:50:31 -07:00
ZappoMan
feb3f68a00 hack to fix culling bugs for some subMesh parts in the windmill scene 2015-06-11 20:49:19 -07:00
Brad Davis
b7cd1ea72a Merge remote-tracking branch 'upstream/master' into render_cursor 2015-06-11 15:04:56 -07:00
Sam Gateau
7685fe2229 Clean up on the item interface and introduction of the Layered concept, fixing the highliting box of the edit tool 2015-06-11 06:40:21 -07:00
Brad Davis
fa27550df4 Merge remote-tracking branch 'upstream/master' into render_cursor 2015-06-11 02:21:02 -07:00
ZappoMan
e06422825a mostly getting attachments working again 2015-06-10 15:46:54 -07:00
Sam Gateau
1f62fb4b6f Adding standard vertex and pixel shaders for drawing texture in applicationOverlay 2015-06-10 15:24:29 -07:00
Brad Davis
7f6a49688a Merge branch 'master' into plugins 
Conflicts:
	interface/resources/qml/AddressBarDialog.qml
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Environment.cpp
	interface/src/Environment.h
	interface/src/devices/TV3DManager.cpp
	interface/src/ui/ApplicationOverlay.h
	interface/src/ui/overlays/LocalModelsOverlay.cpp
 2015-06-10 14:21:48 -07:00
ZappoMan
aa05d9f67c Merge branch 'master' of https://github.com/highfidelity/hifi into fix-attachments 2015-06-10 08:53:33 -07:00
Brad Davis
94c414e4e8 Add unit quad, commonly used in compositing the overlays 2015-06-10 08:12:58 -07:00
Sam Gateau
dd84bf010b Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-06-10 00:32:22 -07:00
Sam Gateau
470e24820d Back to clean state, just added the Material Key 2015-06-10 00:31:36 -07:00
ZappoMan
2c6ebcb06a remove a bunch of cruft from Model 2015-06-09 12:57:14 -07:00
ZappoMan
ba0cecb356 remove attachments from Model - only supported at avatar layer 2015-06-09 12:32:37 -07:00
Sam Gateau
7de4c2eff7 first take on the materialKey 2015-06-09 12:17:10 -07:00
Brad Hefta-Gaub
759a4a323b Merge pull request #5087 from Atlante45/debug 
Reduce debug on domain connection
 2015-06-09 07:54:21 -07:00
Atlante45
90c9a82aeb Remove unnecesary debug 2015-06-09 15:27:08 +02:00
Seth Alves
fb7a0e7219 back out previous change, fix error where translucent is used instead of translucentMesh 2015-06-08 22:41:59 -07:00
Seth Alves
983ae5b2f0 quiet compiler, fix some whitespace 2015-06-08 21:19:37 -07:00
Sam Gateau
87536b2f9d Fixing the skinning issue 2015-06-08 11:22:16 -07:00
samcake
d9b7a42f60 FIxing merge 2015-06-08 19:06:04 +02:00
samcake
5e351c0328 FIxing the transparent rendering on Mac 2015-06-08 18:36:12 +02:00
samcake
1bff9a17e1 Fixing compilation issues and shader issues on Mac, not fully fixing the transparency though 2015-06-08 17:05:28 +02:00
Sam Gateau
c47cee3f3b clean code for PR 2015-06-08 05:59:10 -07:00
Sam Gateau
054809d570 clean code for PR 2015-06-08 05:51:23 -07:00
Sam Gateau
3196c5ca77 better highlights blending 2015-06-08 05:41:36 -07:00
Sam Gateau
5e04b399d8 fixing the wrong matrix used 2015-06-08 03:07:17 -07:00
Sam Gateau
de61f4ea0b Gettting th ehighlight on transparent to work 2015-06-08 02:52:13 -07:00
Sam Gateau
8d3a3221b0 shuffling the rendering steps to get to render transparent and light it correctly 2015-06-06 09:50:56 -07:00
Ryan Huffman
b22ed34825 Merge pull request #5051 from ZappoMan/team-teaching-optimize-offset 
TEAM TEACHING - improvements to avatar part clipping
 2015-06-05 09:26:45 -07:00
ZappoMan
d60810e221 CR feedback 2015-06-05 09:10:38 -07:00
Clément Brisset
5f16b8752b Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 
Conflicts:
	libraries/entities-renderer/src/RenderableEntityItem.cpp
	libraries/render-utils/src/Model.cpp
 2015-06-05 13:28:42 +01:00
Sam Gateau
aa5e6fa1b0 merging 2015-06-05 00:41:29 -07:00
Sam Gateau
3a93409080 Merging the day after the flight back to france, getting all the fixes 2015-06-04 23:02:05 -07:00
ZappoMan
5146e51d9f improvements to avatar part clipping 2015-06-04 16:44:46 -07:00
Ryan Huffman
cafc5b7a7c Merge pull request #5049 from ZappoMan/team-teaching-optimize-offset 
TEAM TEACHING - avatar changing model URLs
 2015-06-04 14:29:44 -07:00
Brad Hefta-Gaub
5e6771d91a Merge pull request #5048 from huffman/entity-visible 
Team Teaching - Update entity payload items to not render when entity.visible == false
 2015-06-04 14:12:49 -07:00
Ryan Huffman
5af52048ec Add render/Scene.h include to Model.h 2015-06-04 13:45:10 -07:00
ZappoMan
56ac987c9b handle url reloading at the model level, this addresses avatars changing their models 2015-06-04 13:40:43 -07:00
Ryan Huffman
a62b55fcb2 Update entity payload items to correctly hide when not visible 2015-06-04 13:25:40 -07:00
ZappoMan
3593afea3b optimize part offset calculation 2015-06-04 11:37:02 -07:00
Atlante45
94ba84a84c Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 2015-06-04 18:48:15 +02:00
Atlante45
93b44e6846 Collect stats on translucent/opaque mesh parts 2015-06-04 18:46:47 +02:00
ZappoMan
d2deef97cc Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-04 09:24:37 -07:00
Brad Hefta-Gaub
50f44c801a Merge pull request #5045 from Atlante45/fix_world_box 
Team Teaching - Temporary fix for models index offset
 2015-06-04 09:16:31 -07:00
Atlante45
8e21d9c14b Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 2015-06-04 18:11:17 +02:00
Atlante45
31d257db09 Temporary fix for models index offset 2015-06-04 17:58:44 +02:00
ZappoMan
c4756f4816 remove dead code 2015-06-04 08:49:26 -07:00
Atlante45
a4340b17e9 Remove deprecated render stats 2015-06-04 14:47:04 +02:00
Brad Davis
edfb1305af Merge remote-tracking branch 'upstream/master' into plugins 2015-06-04 00:29:39 -07:00
Sam Gateau
fabe8f1a7a Fixing the skinned mesh rendering issue 2015-06-03 23:18:24 -07:00
Sam Gateau
dfa8cb5c80 Fixing the skinned mesh rendering issue 2015-06-03 23:11:14 -07:00
ZappoMan
54c4cb829a fixed the shrunken avatar part bug 2015-06-03 21:49:48 -07:00
Brad Davis
a12fd5c3d0 Merge pull request #5023 from AndrewMeadows/bispinor 
fix crash in ~OffscreenGlCanvas on linux shutdown
 2015-06-03 17:21:39 -07:00
ZappoMan
c6fb22b915 make sure all entities are rendering in pipeline part 1 2015-06-03 17:16:45 -07:00
ZappoMan
7fde574a2a make model overlays acutally use sub mesh payload items 2015-06-03 16:33:58 -07:00
Atlante45
7654533888 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 2015-06-03 19:47:51 +02:00
ZappoMan
7c40b666e8 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-06-03 09:52:40 -07:00
Atlante45
9df1b05184 Introduce outsideEngineDetails 2015-06-03 18:08:43 +02:00
Atlante45
bbf1837796 Introduced RenderDetails/Stats don't pull details 
- Regrouped everything stat in a struct
	- Details are set into the stats
 2015-06-03 16:14:23 +02:00
Brad Davis
a663771853 Merge remote-tracking branch 'upstream/master' into plugins 2015-06-03 00:17:52 -07:00
ZappoMan
9e7f60e6a3 add more guards against out of bounds 2015-06-02 22:17:39 -07:00
ZappoMan
a7feca0727 more work on making avatar models (face included) use render payloads 2015-06-02 22:10:00 -07:00
ZappoMan
647d132d57 store part boxes in model space and translate to world space on request 2015-06-02 21:50:33 -07:00
ZappoMan
c9c434bc8c Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-06-02 21:04:33 -07:00
ZappoMan
adcb62eb18 more hacking and cleanup 2015-06-02 21:03:34 -07:00
Sam Gateau
8bf08b34d7 Trying to get Ubuntu to build... again 2015-06-02 19:37:54 -07:00
Sam Gateau
eea7ddf491 Trying to get Ubuntu to build 2015-06-02 19:27:32 -07:00
Sam Gateau
640071dd35 Avoiding any setVIewTransform in payloadREnder and introducing monitoring values 2015-06-02 18:23:53 -07:00
ZappoMan
4ce27f1483 first cut at rendering avatars as individual model items 2015-06-02 16:54:47 -07:00
Sam Gateau
903837ab4f exposing some controls on the engine to js for debugging 2015-06-02 15:57:37 -07:00
Sam Gateau
3c7eb4de6d merging with upstream 2015-06-02 14:48:53 -07:00
Andrew Meadows
9e0c2a3c6c fix crash in ~OffscreenGlCanvas on linux shutdown 2015-06-02 14:36:34 -07:00
Sam Gateau
453fa87654 making sure the proj and view matrix are correctly assigned 2015-06-02 14:31:40 -07:00
Sam Gateau
901717fb2c trying to fix the issues of model disappearing 2015-06-02 11:52:22 -07:00
Sam Gateau
ef2d8a0dbe tuesday morning rendering poor performances networking issue 2015-06-02 10:58:56 -07:00
Atlante45
6d234a20ad Hack for unknown pipelines 2015-06-02 19:07:57 +02:00
Sam Gateau
cd7914ad9d Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-06-01 17:31:39 -07:00
Brad Davis
a483dd27ba Trying to get widgets / windows working 2015-06-01 17:31:18 -07:00
Sam Gateau
bd7c22e715 Trying to transfer the rnedering from displaySide to RenderDeferredTask 2015-06-01 17:31:00 -07:00
ZappoMan
d4af454834 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-01 14:42:35 -07:00
Sam Gateau
1b22f1f147 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-06-01 13:56:13 -07:00
samcake
50f3d2d12b Merge pull request #5014 from ZappoMan/team-teaching-scene-api 
TEAM TEACHING - report correct part bounds
 2015-06-01 13:55:55 -07:00
ZappoMan
1e2d2a2a99 calculate the actual bounding box for the mesh parts 2015-06-01 13:31:42 -07:00
ZappoMan
750d9c0616 poor mans version of mesh part bounds 2015-06-01 12:53:09 -07:00
Sam Gateau
c8e30ef39e On to a full rendered pipeline 2015-06-01 12:35:54 -07:00
samcake
98c0cd7d23 Merge pull request #5009 from ZappoMan/team-teaching-scene-api 
TEAM TEACHING - hacking on rendering mesh parts
 2015-06-01 12:24:27 -07:00
Sam Gateau
4bcc71192d Merge branch 'team-teaching-scene-api' of https://github.com/ZappoMan/hifi into punk 2015-06-01 12:07:16 -07:00
ZappoMan
ea31fdcc26 hacking on transparency 2015-06-01 11:53:40 -07:00
Eric Levin
5cce4edec8 fix merge conflicts attemp 1 2015-06-01 11:18:33 -07:00
ZappoMan
4b46fc3ad9 cleanup Model::renderPart() 2015-06-01 11:11:27 -07:00
ZappoMan
1b8572640b more hacking sams tweaks 2015-06-01 09:07:32 -07:00
Sam Gateau
c10384f91b Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-05-31 23:20:49 -07:00
Sam Gateau
4c817547b7 Merging with Brad's branch and trying to get the rendering working 2015-05-31 14:02:20 -07:00
Brad Davis
23d6725a6a Consolidating GL display plugins 2015-05-31 00:24:19 -07:00
ZappoMan
34fd1bd470 added debugging 2015-05-30 08:45:02 -07:00
ZappoMan
0124f98340 more hacking on rendering model parts 2015-05-29 21:56:24 -07:00
Sam Gateau
f04f3bda72 Introducing the RenderDeferredTask class which moves the current rendering pipeline into the render::ENgine scheme 2015-05-29 15:44:14 -07:00
Brad Davis
8686ffb781 Merge branch 'plugins_pt3' into plugins 2015-05-29 13:01:05 -07:00
Brad Davis
f98305dd55 CR comments 2015-05-29 12:45:03 -07:00
ZappoMan
dc62052a3c more hacking on models 2015-05-29 11:07:25 -07:00
ZappoMan
78c701a89d Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-29 08:40:46 -07:00
Atlante45
212007aa6f Cleanup simple fragmen shaders 2015-05-29 16:53:53 +02:00
Atlante45
51570aac68 Add simple textured pipeline 2015-05-29 16:49:31 +02:00
ZappoMan
eb19b93433 render models in scene checkpoint 2015-05-28 17:19:30 -07:00
Eric Levin
533148f26d line being sent as array 2015-05-28 15:48:31 -07:00
Eric Levin
72af4e4e67 latest pointer 2015-05-28 10:44:44 -07:00
Atlante45
bca80addef Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into text-renderer 2015-05-28 16:13:24 +02:00
Atlante45
b0cbf5c51a Adjust wraping with offset 2015-05-28 16:06:18 +02:00
Atlante45
ca529e4bb8 Remove debug/tweak sampler 2015-05-28 15:58:40 +02:00
Atlante45
12d75481e5 Introducing TextRenderer3D 2015-05-28 15:43:16 +02:00
Atlante45
c4ab18736d Restore TextRenderer and sdf_text 2015-05-28 15:20:40 +02:00
Atlante45
10c2f3f561 More TextRenderer work 2015-05-28 14:51:57 +02:00
ZappoMan
8c9cf480f3 more hacking 2015-05-27 13:23:59 -07:00
Brad Davis
09085f1cd9 Working towards display plugins 2015-05-26 18:42:38 -07:00
Brad Davis
b5e6b737c4 Working on display plugins 2015-05-26 17:32:41 -07:00
Atlante45
c9022212e8 More work on the text renderer 2015-05-26 20:34:23 +02:00
Atlante45
76fc59675b Merge branch 'team-teaching' into text-renderer 2015-05-26 20:01:26 +02:00
Atlante45
62bb1a49e4 Fix inverted glyphs load check 2015-05-26 18:18:50 +02:00
Atlante45
bcee01b3a3 First pass at moving TextureRender to use a batch 2015-05-26 18:13:23 +02:00
Atlante45
88d42f931e Remove unused Headers 2015-05-26 18:12:20 +02:00
Atlante45
c0725813b6 typo 2015-05-25 12:11:24 +02:00
Atlante45
a52c79c378 typo 2015-05-23 03:25:57 +02:00
Atlante45
a44054f9db Make TextureCache::getImageTexture static 2015-05-23 03:24:26 +02:00
Brad Davis
e69362dadc Working on stereo rendering 2015-05-22 17:51:59 -07:00
Ryan Huffman
822ae800c5 Update Model::endScene to require RenderArgs 2015-05-22 16:17:01 -07:00
Ryan Huffman
8380eec03b Update Model::renderCore to use RenderArgs 2015-05-22 16:10:43 -07:00
Ryan Huffman
d1a5662ca7 Merge branch 'team-teaching' of github.com:highfidelity/hifi into ctx 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
 2015-05-22 15:33:40 -07:00
Ryan Huffman
3f22b5f8b3 Add RenderArgs to more render methods 2015-05-22 15:25:53 -07:00
Ryan Huffman
491861c1db Remove constness from GlowEffect RenderArgs params 2015-05-22 10:02:06 -07:00
Ryan Huffman
4a4c9c75fc Add gpu::context to RenderArgs and start using RenderArgs in place of the flags 2015-05-22 09:50:51 -07:00
Clément Brisset
e980859059 Simple Program uses gpu API 2015-05-22 16:14:32 +01:00
Atlante45
5d2187cedf Remove non batch call to bind/releaseSimpleProgram 2015-05-22 16:37:02 +02:00
Brad Davis
ac93d2c721 Working on display plugins 2015-05-21 18:50:11 -07:00
Atlante45
6b9f9a32bb Merge branch 'yellow' of http://github.com/samcake/hifi into simple_program 2015-05-21 20:58:42 +02:00
Brad Davis
c0d84cfc54 Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
 2015-05-21 11:04:06 -07:00
ZappoMan
946878006d Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching 2015-05-20 18:46:32 -07:00
ZappoMan
5b27bac72d Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching 2015-05-20 18:31:50 -07:00
Sam Gateau
1f1fd1362a INcluding the texture for normal best fit 2015-05-20 16:16:22 -07:00
Sam Gateau
3ad7bdc79e maybe ready for master 2015-05-20 14:34:02 -07:00
Atlante45
9c9aee667a Header cleanup 2015-05-20 17:17:03 +02:00
Atlante45
ee264368c0 Add renderQuad to DeferredLighting 2015-05-20 16:45:21 +02:00
Sam Gateau
a649d9edb0 more fooling around 2015-05-19 18:02:20 -07:00
Atlante45
229f88617d Header cleanup 2015-05-19 15:19:02 +02:00
Sam Gateau
3ec6ada29d Introduce an official syncCache on the GLBackend to catch up with the glCOntext ttrue state 2015-05-19 00:32:36 -07:00
Sam Gateau
1e3a55d9d2 Stable status regarding normal and specular shading 2015-05-18 15:58:08 -07:00
Sam Gateau
ce09f73b5c Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-05-18 14:36:29 -07:00
Howard Stearns
bb4df26690 Fix indentation. 2015-05-18 14:25:35 -07:00
Howard Stearns
95be605233 Typo: unlock=>lock in rednerDebugMeshBoxes. 2015-05-18 14:05:13 -07:00
Howard Stearns
7e1b6a48c5 Merge branch 'master' of https://github.com/highfidelity/hifi into grab-picking-crash 2015-05-18 13:35:28 -07:00
Howard Stearns
f2a66f3106 Simplest fix for the grab crash that occurs with animated complex models. 
(e.g., clicking on air hockey props in front of a spinning windmill).
 2015-05-18 13:08:11 -07:00
Sam Cake
0d3f56e5f2 playing with the shader 2015-05-18 12:30:56 -07:00
ZappoMan
1bb682180c workaround for segregateMeshGroups() crash 2015-05-18 12:24:18 -07:00
Brad Hefta-Gaub
1923eab93f Merge pull request #4903 from highfidelity/master 
Update team-teaching branch
 2015-05-18 08:25:27 -07:00
Atlante45
a7ee10001a Remove used deprecated methods 
Also added a warning on the single one in use right now,
so that it gets deleted once it is moved to the rendering pipeline
 2015-05-18 16:37:28 +02:00
Atlante45
ede94e4248 Merge branch 'master' of https://github.com/highfidelity/hifi into remove_gl_transform 2015-05-18 11:39:17 +02:00
Sam Cake
ad99a0f053 Improving the quality of the normals with a better packing algorithm in th edeferred 2015-05-17 16:57:32 -07:00
Atlante45
4bbc5de39d Remove "raw" gl calls 
Removed calls to batch._gl*
Added init/killInput in glBackend ctor/dtor
	This will disable client states and set buffers to 0
 2015-05-17 11:58:39 +02:00
Brad Davis
7f2552c690 Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
 2015-05-16 22:38:15 -07:00
Atlante45
6e642ed040 Missing & 2015-05-16 04:32:20 +02:00
Atlante45
b8fffdb2ef bind/releaseSimpleProgram takes Batch 2015-05-16 04:26:57 +02:00
Atlante45
4bb1b1a02f TextureCache::setPrimaryDrawBuffers can take a Batch 2015-05-16 04:25:51 +02:00
Atlante45
b11525debf Add missing batch args 2015-05-16 04:03:46 +02:00
Atlante45
c220435364 Restore gl* calls but record them with batch 2015-05-16 04:01:08 +02:00
Sam Cake
07fe43e175 moving forward with the void* hack for gpu::Texture 2015-05-15 15:26:40 -07:00
Ryan Huffman
776955b040 Move GeometryCache gl* calls to non-batch methods 2015-05-15 15:21:02 -07:00
Ryan Huffman
5abd4bb08e Update GeometryCache to accept gpu::Batch 2015-05-15 15:20:50 -07:00
Sam Cake
765145b898 Moving the load of the texture and the generation of the cube map irradiance in the same thread 2015-05-15 11:28:59 -07:00
Sam Cake
ad9834283d Fixing the magic numbers! 2015-05-14 15:54:40 -07:00
Sam Cake
40ee78195e remove magic numbers 2015-05-14 15:21:57 -07:00
Brad Hefta-Gaub
d1f52231be Merge pull request #4863 from samcake/orange 
Using the skymap for ambient lighting
 2015-05-14 09:12:46 -07:00
Brad Davis
a77816617d Make web entities interactive (via the mouse) if they're not locked. 2015-05-14 01:15:20 -07:00
Brad Hefta-Gaub
77019eafa7 Merge pull request #4831 from jherico/plugins_pt2 
Display plugins part 2
 2015-05-13 20:40:33 -07:00
Sam Cake
238d3751c5 cleaning up the SH generation 2015-05-13 16:00:05 -07:00
Brad Davis
3b7e8a69b5 Attempting to fix threading issues with web entities 2015-05-13 14:00:41 -07:00
Bradley Austin Davis
a0097bcff8 Fixing offscreen rendering on retina display, even without a proxy window 2015-05-13 12:26:46 -07:00
Sam Cake
65e83df214 Generating the SH from the cube map! 2015-05-13 11:08:18 -07:00
Brad Davis
a8d343bbf1 Working on web entities 2015-05-13 00:27:57 -07:00
Brad Davis
e9b83e1c02 Working on web entities 2015-05-12 21:15:54 -07:00
Seth Alves
f647db3bf0 Merge branch 'master' of github.com:highfidelity/hifi into line-entity 2015-05-12 11:36:56 -07:00
Seth Alves
7a85bfa0d1 fix up grab.js to use line entity 2015-05-12 11:36:05 -07:00
Seth Alves
38caed00ca Attempt to draw line entity item 2015-05-12 10:25:50 -07:00
Brad Hefta-Gaub
cbaa503934 Merge pull request #4838 from Atlante45/quiet_compiler 
Quiet compiler
 2015-05-12 08:57:57 -07:00
Atlante45
00864afe53 Quiet compiler 2015-05-12 17:06:40 +02:00
Anthony Thibault
e1cbfcd901 Merge branch 'master' into ajt/particle-system-improvements 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-05-11 19:24:13 -07:00
samcake
67b9dd248d Fix glsl failed compilation on Mac 2015-05-11 14:25:05 -07:00
Sam Gateau
f2c4e04a5a clean up for pr 2015-05-11 14:06:10 -07:00
Sam Gateau
45e70c98f8 Fixed the cube map loading issue 2015-05-11 13:43:15 -07:00
Brad Davis
abab54aed8 Working on display plugins 2015-05-11 13:08:53 -07:00
Brad Davis
6a5c7b8b42 Merge remote-tracking branch 'upstream/master' into plugins_pt2 
Conflicts:
	libraries/script-engine/src/MenuItemProperties.cpp
 2015-05-11 12:40:17 -07:00
Sam Gateau
72c3270ec6 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2015-05-11 10:48:29 -07:00
Sam Gateau
f1fcce3ea0 refactoring th ecube texure loading to support 2 different layouts 2015-05-11 10:47:45 -07:00
Atlante45
e51040db53 CR 2015-05-11 14:31:22 +02:00
Atlante45
f941ca9601 Merge branch 'master' of https://github.com/highfidelity/hifi into fix_wireframe 2015-05-11 14:20:16 +02:00
Anthony J. Thibault
ede42285b1 Improvements to particle entity. 
* Changed particle geometry to billboarded quads
* Added texture support
* Added ajt-test.js particle test script.
* GeometryCache support for batched quads with texCoords.
* Bug fix for infinite loop if _lifetime was very large.
* Don't reset the simulation on animation loop.
* stop emitting particles on animation stop, but keep simulating until there are no more living particles.
* Removed some trailing whitespace
 2015-05-10 17:13:46 -07:00
Sam Gateau
d51904b7b3 fixing file 2015-05-09 11:43:21 -07:00
Sam Gateau
5a11143a5d Using the skybox cubemap for ambient lighting 2015-05-09 11:40:46 -07:00
Bradley Austin Davis
9f8a384c72 Merge branch 'plugins_pt2' into plugins 2015-05-08 16:05:51 -07:00
Brad Hefta-Gaub
bfb2b278ee Merge pull request #4791 from jherico/scale 
Fixing scale resolution issues
 2015-05-08 15:54:24 -07:00
Bradley Austin Davis
03bd17ed49 Rebasing onto scale changes 2015-05-08 15:09:46 -07:00
Bradley Austin Davis
0751443a01 Merge branch 'master' into scale 2015-05-08 15:03:24 -07:00
Bradley Austin Davis
5f12af75bd Tweaking to match master 2015-05-08 11:11:46 -07:00
Bradley Austin Davis
9974eb0357 Merge branch 'master' into plugins 2015-05-08 10:49:28 -07:00
Atlante45
52397bf87a Fix wireframe render for meshes with special properties 2015-05-08 15:59:39 +02:00
Bradley Austin Davis
5e821b4447 Updating plugins 2015-05-07 22:32:28 -07:00
Sam Gateau
ce5295a55f THese is not final but we have a basic working framework so let's try to share 2015-05-07 17:06:15 -07:00
Bradley Austin Davis
efa88ba122 Merge branch 'scale' into plugins 2015-05-07 12:52:13 -07:00
Bradley Austin Davis
c31d36be59 Fixing scale resolution issues 2015-05-07 12:01:56 -07:00
Sam Gateau
54c47fe3f9 merging 2015-05-07 11:35:58 -07:00
Sam Gateau
653d2e72b1 Skybox kind of working 2015-05-07 11:23:11 -07:00
Atlante45
591548dc38 Missing comma 2015-05-07 20:15:40 +02:00
Atlante45
00571dad00 Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-07 10:13:59 +02:00
Bradley Austin Davis
28c873ba59 Merge branch 'master' into plugins 2015-05-06 16:37:59 -07:00
Bradley Austin Davis
3b8108e887 Fix inverted icons 2015-05-06 16:09:17 -07:00
Brad Hefta-Gaub
5551997cdc Merge pull request #4780 from samcake/blue 
Add support for Skybox and rendering path of background according to Zones
 2015-05-06 14:41:06 -07:00
Bradley Austin Davis
b33842e34b Merge branch 'master' into plugins 2015-05-06 14:33:04 -07:00
Seth Alves
719747ee2d Merge pull request #4725 from howard-stearns/objReader 
Textures for .obj reader:
 2015-05-06 14:30:29 -07:00
Bradley Austin Davis
77a9f7fa2a Merge branch 'plugins_pt1' into plugins 2015-05-06 14:22:13 -07:00
Sam Gateau
1b5185abeb fix the conditional on the texture pointer which was wrong and bring back atmosphere sky dome 2015-05-06 12:19:19 -07:00
samcake
06e1330e42 Clean up the includes in gpu, make the skybox shader works 2015-05-06 12:12:54 -07:00
Bradley Austin Davis
fc73676b4d Merge branch 'master' into plugins_pt1 2015-05-06 11:43:25 -07:00
Howard Stearns
4090f892b2 Merge remote-tracking branch 'upstream/master' into objReader 2015-05-05 14:58:18 -07:00
Atlante45
8b2442ce6e clear list after loop 2015-05-05 22:56:37 +02:00
Atlante45
863280300e Fix pickMeshList incorrect arguments 2015-05-05 22:37:00 +02:00
Atlante45
73b7530ec6 Add wireframe pipelines 2015-05-05 21:50:06 +02:00
Atlante45
429c1e1231 Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-05 21:33:55 +02:00
Sam Gateau
13482575d2 merge 2015-05-05 12:03:45 -07:00
Atlante45
e0f3a8212f Add wireframe arg to render fct 2015-05-05 17:23:10 +02:00
Atlante45
bc04685dbf Add isWireframe to RenderKey 2015-05-05 15:15:18 +02:00
Atlante45
0e3061f052 Add isWireframe to model class 2015-05-05 15:14:29 +02:00
ZappoMan
77232e35f8 Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereInZones 2015-05-04 17:16:33 -07:00
Sam Gateau
73177cd81d Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2015-05-04 14:07:59 -07:00
ZappoMan
4561c59203 wire up zone to environment atmosphere rendering 2015-05-04 13:49:43 -07:00
Sam Gateau
ade404a74d getting rid of QSHaredPointer in favor of std::shared_ptr 2015-05-04 13:43:30 -07:00
Bradley Austin Davis
8119e3d629 Merging back from part 1 2015-05-04 11:35:28 -07:00
Stephen Birarda
6cff75f7c1 resolve conflicts on merge with upstream/master 2015-05-04 10:05:44 -07:00
Atlante45
fc1519c078 Quiet compiler 2015-05-04 16:49:33 +02:00
Brad Davis
e72756ab99 Merge remote-tracking branch 'upstream/master' into plugins_pt1 
Conflicts:
	libraries/render-utils/src/TextureCache.cpp
 2015-05-02 00:51:50 -07:00
Brad Davis
302aa9db47 Removing access to the gl widget and display managers 2015-05-02 00:49:52 -07:00
Howard Stearns
e1d47413cc Material library handling. 
This is now functionally complete, but it needs testing, and the some tidying up.
 2015-05-01 20:54:25 -07:00
Stephen Birarda
b9c9ff6a14 clean up various warnings 2015-05-01 16:49:13 -07:00
Sam Gateau
f9802a1072 IMprove the message 2015-05-01 16:39:25 -07:00
Stephen Birarda
edade7baba resolve conflicts on merge with upstream master 2015-05-01 16:24:16 -07:00
Sam Gateau
2382183075 FIxed the bug about the tga not loading by recognizing the file format type from the filename extension and passing the info to the QImage::fromData() 2015-05-01 16:09:41 -07:00
Brad Davis
e6c241b75b Merge branch 'master' into plugins 2015-05-01 15:16:06 -07:00
Sam Gateau
1b558e7390 investigating the semi transparent textured bug 2015-05-01 13:37:04 -07:00
Howard Stearns
e0a4909b22 Merge branch 'master' of https://github.com/highfidelity/hifi into objReader 2015-05-01 13:32:05 -07:00
Stephen Birarda
94739cf8d3 move number constants out of SharedUtil to NumericalConstants 2015-05-01 10:26:53 -07:00
samcake
2b631efb5d shader not compiling properly have been fixed 2015-05-01 00:21:58 -07:00
samcake
e560687371 fixing the shader not compiling 2015-05-01 00:14:23 -07:00
Brad Davis
ba4ae3762d Working on merging in master 2015-04-30 22:01:03 -07:00
Brad Davis
031b294ae5 Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Camera.cpp
	interface/src/Camera.h
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/ApplicationOverlay.h
	libraries/render-utils/src/GlowEffect.cpp
	libraries/render-utils/src/GlowEffect.h
	libraries/render-utils/src/TextureCache.cpp
 2015-04-30 12:14:07 -07:00
Howard Stearns
2da8e1ab30 Pick up an upstream/master change that didn't get picked up in a merge of my fork/branch. 2015-04-30 08:53:19 -07:00
Howard Stearns
1255d46140 coding standard: type formatting and variable names 2015-04-29 15:19:40 -07:00
Howard Stearns
59ed63027b coding standard: magic numbers 2015-04-29 14:22:31 -07:00
Howard Stearns
bd5272d677 Textures for .obj reader: 
Refactor so that uv coordinates can be associated with vertices that might otherwise be on different materials.
 Defer the assignment vertex/normal/uv assignment until later so that it could potentially be moved directly to model geometry instead of fbx geometry.
 Handle the actual uv coordinates.

This version does not handle explicit .mtl files, but it does handle those .obj files that follow the convention that there is a .jpg with the same name as the .obj file.
 2015-04-29 13:35:21 -07:00
Brad Hefta-Gaub
50eecb15b3 Merge pull request #4712 from Atlante45/compound_zones_fix 
Compound zones fix
 2015-04-28 09:48:05 -07:00
Atlante45
ab9d81b5e2 Correct comments 2015-04-28 18:09:09 +02:00
Atlante45
b7263eeacf Added a more efficient convexHullContains to Model 
New version computes each submesh's bounding box once and checks against it
before checking against triangles.
 2015-04-28 17:05:38 +02:00
Atlante45
4911aa58bc Fix Model setURL with delayload 
Without this condition the model stays in a state where the geometry
  is downloaded but not referenced
That way, another call to setURL with update the geometry reference
instead of returning.
 2015-04-28 17:02:32 +02:00
Andrew Meadows
72deb2e49b merge upstream/master into andrew/thermonuclear 
Conflicts:
	libraries/entities/src/EntityItem.h
	libraries/physics/src/EntityMotionState.cpp
 2015-04-27 12:54:21 -07:00
Seth Alves
bdc6bb3c2d Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic 2015-04-27 12:20:58 -07:00
Brad Davis
a12bfd95f4 Merge remote-tracking branch 'upstream/master' into ui-refactor 
Conflicts:
	libraries/render-utils/src/MatrixStack.h
 2015-04-27 10:59:57 -07:00
Seth Alves
2cdbe8bf7b merge from upstream 2015-04-27 09:57:36 -07:00
Seth Alves
e007617112 hook up menu-items to control debug rendering of collision hulls and owned simulations 2015-04-27 09:56:24 -07:00
Brad Davis
3071be162a Coding standards 2015-04-26 20:11:27 -07:00
Brad Davis
7c16fd05c1 Merge branch 'master' into ui-refactor 2015-04-25 16:35:43 -07:00
Seth Alves
2eebfb9cf1 merge from upstream 2015-04-25 12:50:16 -07:00
Seth Alves
d1d4b0f0ee merge from upstream 2015-04-25 12:50:00 -07:00
Seth Alves
b69cba1aba respond to code-review 2015-04-25 10:50:18 -07:00
Seth Alves
0fb1a83e3b quiet compiler, remove some trailing control-Ms 2015-04-25 09:20:00 -07:00
Atlante45
ba507cef98 Fix a few warnings 2015-04-25 11:01:02 +02:00
Andrew Meadows
79cb55eabc rename setJointStates() --> initJointStates() 2015-04-24 13:26:26 -07:00
Brad Davis
0a9398808f CR comments 2015-04-24 13:25:30 -07:00
Brad Davis
99a6e1f86c Breaking up offscreen UI work 2015-04-24 13:21:21 -07:00
Brad Davis
ae804357d8 Attempting to fix backspace issue in new UI 2015-04-23 14:10:54 -07:00
Brad Davis
d0af5580c8 Fix mouse wheel and clickthrough bugs in offscreen UI 2015-04-23 10:28:03 -07:00
Brad Davis
de179256d3 Kill all the whitespace 2015-04-22 20:19:19 -07:00
Brad Davis
eab4ad9ea9 More coding standard stuff 2015-04-22 20:16:41 -07:00
Brad Davis
44efcdf82a More coding standard 2015-04-22 20:08:49 -07:00
Brad Davis
c4d2bd2cda More coding standard fixes 2015-04-22 19:18:09 -07:00
Brad Davis
8d8c4babba Coding standard fixes 2015-04-22 19:06:22 -07:00
Brad Davis
7a33474245 Merge remote-tracking branch 'upstream/master' into offscreen 
Conflicts:
	interface/src/Menu.cpp
 2015-04-21 13:02:38 -07:00
Sam Gateau
58c1827f69 bring back the glPushPop in transform legacy mode 2015-04-20 15:56:44 -07:00
Brad Davis
16efa2a46f Improving toggle visibility and loading behavior 2015-04-17 16:59:04 -07:00
Sam Gateau
11879f6142 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-17 13:04:00 -07:00
Sam Gateau
edb388ed83 Fixing the function with no implementation 2015-04-17 11:32:05 -07:00
Bradley Austin Davis
4b73481604 Respond to changes in the device pixel ratio in the test window 2015-04-17 10:19:31 -07:00
Brad Davis
fd0c130dc2 Working on simplifying new dialog creation 2015-04-16 22:20:49 -07:00
Bradley Austin Davis
759acfa175 Working on getting the offscreen UI working on retina 2015-04-16 19:30:31 -07:00
Sam Gateau
b5b146b81b Training Team: improving the sun lighting interface to javascript to enable / disable the earthSkyModel, assign explicitely the SUnDirection and getter, and expose a AmbientINtensity to control the amount of the ambient lighting contribution 
Expose these to javascript
 2015-04-16 17:35:37 -07:00
Sam Gateau
3872c01340 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-04-16 14:38:18 -07:00
Sam Gateau
f06556ba12 migrate the various list to sort the rendering from explicit names to a more generic key based map 2015-04-16 14:37:39 -07:00
Brad Davis
ce6b7e7aec Merge branch 'master' into offscreen 
Conflicts:
	interface/src/Menu.cpp
 2015-04-16 14:02:40 -07:00
Brad Davis
d72bb71030 Merge pull request #4636 from samcake/orange 
Introduce the gpu::Framebuffer and its sidekick the gpu::Swapchain
 2015-04-16 13:39:04 -07:00
Andrew Meadows
83d54eb46b merge upstream/master into andrew/bispinor 2015-04-16 12:07:22 -07:00
Bradley Austin Davis
36ca9132cc More build failure fixes 2015-04-16 01:02:13 -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
Sam Gateau
cd1bbb2855 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-15 10:16:28 -07:00
Brad Davis
d14d5f3d29 Working on new-UI implementations of address bar and login 2015-04-15 00:36:04 -07:00
Sam Gateau
fec52f6b10 Removing almost all the QFramebufferObject (instead in overlay layer) in favor of gpu::Framebuffer, eveyrthing seems to work properly 2015-04-14 18:27:24 -07:00
David Rowe
85e5216fc1 Condense logic 2015-04-14 16:54:29 -07:00
David Rowe
2c5201f116 Fix animation not automatically starting at start-up 2015-04-14 16:54:14 -07:00
Sam Gateau
87030236cb working version with the gpu::SAmpler and the gpu::Framebuffer 2015-04-14 15:53:24 -07:00
Andrew Meadows
9388ae4212 fix warning about unused variable 2015-04-14 14:52:21 -07:00
Sam Gateau
c34c5f6075 adding the Fremabuffer to be used for shadows and main rendering 2015-04-14 08:47:52 -07:00
Brad Davis
9f0d410387 Working on decoupling rendering 2015-04-13 23:15:51 -07:00
Clément Brisset
36631dd3a3 Merge pull request #4608 from ctrlaltdavid/fix-animation-not-starting 
CR for Animation fixes
 2015-04-09 11:39:13 +02:00
Sam Gateau
ad9129b552 Fixing all the shaders for entities to work correctly with the now supported color attribute field 2015-04-07 14:26:45 -07:00
David Rowe
43a130dabe Fix Stop button not working at the end of a non-looped animation 2015-04-07 14:02:42 -07:00
Sam Gateau
f0efade06d Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-07 12:56:21 -07:00
Andrew Meadows
a47170b02c Merge pull request #4601 from samcake/temp1 
Introducing gpu::State and using it in the Model rendering path and more...
 2015-04-07 12:48:42 -07:00
Sam Gateau
9d6839e6a1 Merge branch 'temp1' of https://github.com/samcake/hifi into orange 2015-04-07 11:45:57 -07:00
Sam Gateau
25643479c9 Fixed the memory leak, due to the location pointer in the Model::RenderPipelineLib which was not smart pointed correctly 2015-04-07 11:20:55 -07:00
Sam Gateau
88afb3cedc solution to the color attribute case 2015-04-07 10:04:51 -07:00
Seth Alves
ef5dffecf6 fix filenames in comments 2015-04-07 10:03:14 -07:00
Sam Gateau
dee651069c adding support for color attribute in FBX, and displaying it correctly 2015-04-06 23:33:13 -07:00
Seth Alves
cd5245d0d6 logging group for render-utils 2015-04-06 18:16:01 -07:00
Sam Gateau
7f46736bb4 playing with the shadwos 2015-04-06 17:17:25 -07:00
Sam Gateau
07e7f6ea1d FIx review comments 2015-04-06 15:40:29 -07:00
Sam Gateau
4aa695d5f3 fixed an issue with skinned normaled map models not doing the correct transformation 2015-04-06 12:24:01 -07:00
Sam Gateau
7de54917b8 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-04-06 10:20:23 -07:00
Sam Gateau
ecdffadcb7 trying to debug the indirect sh lighting going wrong, the noraml on avatar is not correct 2015-04-06 10:17:31 -07:00
Sam Gateau
a85daaee41 COmmented the review questions in code 2015-04-06 10:03:47 -07:00
Sam Gateau
00817ab64f MErging with origin/orange, brinign the fix for shadows 2015-04-05 18:36:39 -07:00
Sam Gateau
17743c6013 FIxed the broken shadows 2015-04-03 17:58:21 -07:00
Sam Gateau
38d1e29a1d getting ready for pr for a few syntax issues 2015-04-03 17:16:18 -07:00
Sam Gateau
2dcabb97b4 getting ready for pr for a few syntax issues 2015-04-03 17:10:51 -07:00
Sam Gateau
b8db0ff2d7 getting ready for pr for a few syntax issues 2015-04-03 17:05:08 -07:00
Sam Gateau
423434af10 FInd one of the issue with shadows for avatars 2015-04-03 12:34:30 -07:00
Sam Gateau
3f581d03d2 mirror means we render the Closkwise side 2015-04-03 10:45:30 -07:00
Sam Gateau
6f5c411a46 Fixing a few issues and syntax, trying to understand why the shadows are not rendering correctly 2015-04-03 10:32:20 -07:00
samcake
4b66b1e6ca Merge branch 'master' of https://github.com/highfidelity/hifi 2015-04-02 14:15:56 -07:00
Seth Alves
57a4f3abe3 clear _saveNonCollisionGeometry when it's not needed, remove some debug prints 2015-04-02 06:57:27 -07:00
Seth Alves
eb78fa0f85 if switching to the mode where collision hulls are drawn, updateGeometry and simulate 2015-04-01 18:24:25 -07:00
Seth Alves
78af7f900e don't need _collisionGeometryScale 2015-04-01 18:23:25 -07:00
Seth Alves
8940ba0c2a new member variables related to rendering collision hulls 2015-04-01 17:52:18 -07:00
Sam Gateau
0d721ec1e9 merging 2015-03-31 17:47:05 -07:00
Sam Gateau
9b63739a72 Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations 2015-03-31 17:35:34 -07:00
Stephen Birarda
86174d6a29 Merge pull request #4551 from ZappoMan/neverCullAvatarParts 
never cull mesh parts for avatars
 2015-03-31 16:29:01 -07:00
Brad Hefta-Gaub
b43761a6c1 Merge pull request #4545 from samcake/orange 
No more FLat global lighting, always use one of the SPherical harmonics presets
 2015-03-31 15:52:49 -07:00
Sam Gateau
74f04c0c84 remove useless comment 2015-03-31 14:57:51 -07:00
ZappoMan
a889191916 never cull mesh parts for avatars 2015-03-31 14:27:34 -07:00
Seth Alves
ea2c5ff622 formatting 2015-03-31 14:04:33 -07:00
Sam Gateau
edf0ca2b06 Forbifd the global ambient lighting to go the simple global value and instead fallback to the first Spherical harmonics preset 2015-03-31 10:29:03 -07:00
samcake
1a18719031 and make it compile on mac... remove the field map from state just because it's unecessary 2015-03-30 21:53:59 -07:00
Philip Rosedale
5325478940 Merge pull request #4528 from ZappoMan/avatarUI 
Support for Auto-detecting FST type, and adding type hint to FST files when packaged
 2015-03-30 21:31:22 -07:00
Bradley Austin Davis
87c4f8433c Fixing consecutive spaces issue with text renderer 2015-03-30 16:21:57 -07:00
Andrew Meadows
10af59296d Merge pull request #4499 from sethalves/multi-hull-collisions 
Multi hull collisions
 2015-03-30 12:11:56 -07:00
Sam Gateau
2a58a65a8f back to the office monday morning, State almost working in the full piupeline 2015-03-30 10:10:39 -07:00
Seth Alves
a47ae9212b quiet compiler 2015-03-28 17:13:31 -07:00
Sam Gateau
21b5d6f404 refining the state interface and the GLBackend for it with a true cache 2015-03-28 11:26:06 -07:00
ZappoMan
baa2f947e5 classifying FSTReader and moving ModelType into that class 2015-03-27 16:30:00 -07:00
Seth Alves
fd69a54f10 Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions 2015-03-27 15:55:20 -07:00
Sam Gateau
f1a0783347 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-27 10:34:17 -07:00
Sam Gateau
9c44100bb8 cleaning the State class code 2015-03-27 10:33:29 -07:00
Seth Alves
7da87d6e15 set up a way to request ResourceCache downloads from a non-networking thread. 2015-03-26 18:37:55 -07:00
Sam Gateau
c9e0360394 using gpu::Pipeline it s mostly working but still glUniforms to get rid of 2015-03-26 13:48:49 -07:00
Atlante45
716e9bfe4f Hint order for FST files 2015-03-26 15:40:48 +01:00
Sam Gateau
8938a6297f Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-25 10:16:43 -07:00
Sam Gateau
c9377d0811 the model renderer now uses the map of renderPIpeline and the pipeline object of gpu, yeah. fixed the state to do the basics glState stuff correctly 2015-03-25 10:16:18 -07:00
Sam Gateau
6284159892 Revisiting the rendering pipeline pick and trying to use our brand new gpu::Pipeline 2015-03-24 14:58:41 -07:00
ZappoMan
168e8e8b80 more fixes to avatar parts not rendering 2015-03-24 08:31:45 -07:00
Sam Gateau
d857a36557 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-23 22:37:38 -07:00
Sam Gateau
19a96c4815 Adding the State to gpu and wiring the pipeline in glBackend to potentially make it work soon :) 2015-03-23 22:33:25 -07:00
ZappoMan
3e8508f149 CR feedback 2015-03-23 11:13:35 -07:00
ZappoMan
b705d76336 total hack to ignore frustum culling in case of avatar mesh parts with no transform 2015-03-23 10:43:21 -07:00
Sam Gateau
69667fb5ca making the state work 2015-03-23 10:21:35 -07:00
ZappoMan
fe8ad9517f added debugging for model mesh boxes 2015-03-23 10:08:08 -07:00
ZappoMan
19c8e526e1 add guards to _jointStates array size 2015-03-23 08:47:06 -07:00
Sam Gateau
07bcd115c2 trying to remove useless glsl code for Legacy path 2015-03-20 13:28:42 -07:00
Sam Gateau
68de91c80a cleaning code for review 2015-03-20 13:17:32 -07:00
Sam Gateau
1babf53643 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-20 11:55:30 -07:00
Sam Gateau
65727dd613 clean up code 2015-03-19 15:23:50 -07:00
Sam Gateau
619a323196 Using Scribe preprocessor @func@ instead of regular glsl function to solve the intel bug with the transform stack 2015-03-19 14:46:50 -07:00
Sam Gateau
b33ba64e05 trying to tweek the transform equation to find the intel bug 2015-03-18 17:20:27 -07:00
samcake
0f22d64802 compilation on MacOSX 2015-03-18 16:28:42 -07:00
Sam Gateau
dc27bfb6ef Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-18 15:59:50 -07:00
Sam Gateau
0bd78be7f4 Transition model shaders to gpu:Shader 2015-03-18 15:57:01 -07:00
Seth Alves
36e0a5afc5 cleanups 2015-03-18 13:04:27 -07:00
Seth Alves
9161cc8b83 attempt to handle collision models in the same way as render models 2015-03-18 13:00:09 -07:00
Sam Gateau
5a40fcee17 set the defines for GPU profile correctly AGAIN 2015-03-17 16:51:59 -07:00
Sam Gateau
03da3aeab4 Clean up on the GPU Profile defines in order to control features 2015-03-17 16:15:10 -07:00
Seth Alves
069c358aa3 Work around a deadlock: 
thread 15 locks Octree
thread 1 blocks waiting for Octree lock
thread 15 tries to pass a message to thread 1 with QMetaObject::invokeMethod, and hangs

thread 15 is blocked on qt message passing to thread 1
  ResourceCache::getResource                       libraries/networking/src/ResourceCache.cpp:57
  GeometryCache::getGeometry                       libraries/render-utils/src/GeometryCache.cpp:1774
  ModelEntityItem::isReadyToComputeShape           libraries/entities/src/ModelEntityItem.cpp:431
  PhysicsEngine::addEntityInternal                 libraries/physics/src/PhysicsEngine.cpp:67
  EntitySimulation::addEntity                      libraries/entities/src/EntitySimulation.cpp:129
  EntityTree::postAddEntity                        libraries/entities/src/EntityTree.cpp:91
        ^ locks simulation
  EntityTreeElement::readElementDataFromBuffer     libraries/entities/src/EntityTreeElement.cpp:773
  Octree::readElementData                          libraries/octree/src/Octree.cpp:301
  Octree::readElementData                          libraries/octree/src/Octree.cpp:354
  ...
  Octree::readBitstreamToTree                      libraries/octree/src/Octree.cpp:439
  OctreeRenderer::processDatagram                  libraries/octree/src/OctreeRenderer.cpp:136
        ^ lockForWrite Octree::_lock
  OctreePacketProcessor::processPacket             interface/src/octree/OctreePacketProcessor.cpp:91
  ReceivedPacketProcessor::process                 libraries/networking/src/ReceivedPacketProcessor.cpp:51

thread 1 is blocked on lockForWrite of Octree::_lock
  Octree::lockForWrite                             libraries/octree/src/Octree.h:292
  EntityTree::update                               libraries/entities/src/EntityTree.cpp:668
        ^ lockForWrite on Octree:_lock
  EntityTreeRenderer::update                       libraries/entities-renderer/src/EntityTreeRenderer.cpp:258
  Application::update                              interface/src/Application.cpp:2189
        ^ calls _physicsEngine.stepSimulation() before this
  Application::idle                                interface/src/Application.cpp:1535
  timer
 2015-03-17 11:38:42 -07:00
Seth Alves
250567e315 formatting, diff minimization 2015-03-14 12:09:23 -07:00
Seth Alves
87cc710efc more merge madness, calculate 2nd PhysicsEngine hash with qChecksum if url is set 2015-03-13 18:43:24 -07:00
Seth Alves
bf1cb951a3 move PhysicsEntity so that ModelEntityItem can initiate a model download 2015-03-11 18:34:27 -07:00
Seth Alves
3a3e723f4e trying to figureo out where to download hull models 2015-03-11 14:26:30 -07:00
Seth Alves
20a22ff42c Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-11 07:17:19 -07:00
Seth Alves
1c73f50dbc started to hook up geometry downloader to ShapeInfo 2015-03-11 07:17:13 -07:00
Seth Alves
844085b514 started on hull collisions 2015-03-10 15:30:08 -07:00
Sam Gateau
7c3257009c Merge with upstream 2015-03-10 12:24:56 -07:00
Sam Gateau
da16baf0ca removing the atmosphere effect from the directional lighting 2015-03-10 10:24:16 -07:00
Sam Gateau
853cf75f60 adding the atmosphere in the directional lighting pass, debug 2015-03-10 09:37:13 -07:00
Sam Gateau
d9c071a2a9 trying to put the atmospheric effect in a shader header and use it on the directional lighting pass 2015-03-10 00:47:27 -07:00
Sam Gateau
cc85f468d6 splitting the code of GLBackend into separate .cpp, adding the PIpeline,adn the state to gpu 2015-03-09 11:14:42 -07:00
Seth Alves
a180eadc91 remove stray control-Ms 2015-03-08 18:07:07 -07:00
Sam Gateau
23a6326aa1 testing the shader features in Model and refining the shader making workflow 2015-03-08 10:53:29 -07:00
Seth Alves
4a7dd2b3e6 allow downloading of obj files 2015-03-07 07:53:25 -08:00
Seth Alves
858d15d0ba obj reader sort-of works 2015-03-06 13:15:53 -08:00
Sam Gateau
d5f6129082 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0bis 2015-03-06 10:44:15 -08:00
Sam Gateau
c097c6aad2 Adding the self introspection of shaders 2015-03-06 10:41:53 -08:00
Clément Brisset
da6db93508 Merge pull request #4375 from ctrlaltdavid/20370 
More parentheses to address Xcode compiler warnings
 2015-03-04 10:06:54 -08:00
David Rowe
4c959e8d82 More parentheses to address Xcode compiler warnings 2015-03-04 09:17:19 -08:00
samcake
6b1f42df83 Merge pull request #4366 from ZappoMan/removeMetavoxels 
remove metavoxels
 2015-03-03 15:50:53 -08:00
Brad Hefta-Gaub
b118912708 Merge pull request #4361 from samcake/temp0 
evolve the Transform stack away from the legacy GL to the brand new shader way
 2015-03-03 11:43:01 -08:00
Brad Hefta-Gaub
29340b6586 Merge pull request #4369 from ctrlaltdavid/20370 
CR for Job #20370 - Talk bubble fix - from a suggestion in https://worklist.net/20361
 2015-03-03 11:17:31 -08:00
Sam Gateau
598b791aee FIxing the compilation issue for linux 2015-03-03 11:01:47 -08:00
ZappoMan
5c3c94a618 remove metavoxels 2015-03-02 17:21:43 -08:00
Sam Gateau
5ab3cbb7ec Fixed the 2 remianing issues before PR, the shadow program needed to have the binding assigned and the Head of the avatar isn't getting it's BBox evaluated 2015-02-27 17:11:16 -08:00
Sam Gateau
ea88cbd75f Merge with upstream master 2015-02-27 13:19:50 -08:00
Brad Hefta-Gaub
08dc883b0e Merge pull request #4351 from huffman/update-light-properties 
Update light properties (primarily for editEntities.js)
 2015-02-27 10:54:19 -08:00
Sam Gateau
c7eeebe52c and fixing a bug with shadowing of lightmapped surface 2015-02-26 18:07:43 -08:00
Ryan Huffman
dc2b670fa8 Remove extraneous comments 2015-02-26 14:46:05 -08:00
David Rowe
21f12c1d6c Use cache ID when rendering talk bubble sphere 2015-02-26 13:50:43 -08:00
Ryan Huffman
e42b708b56 Update deferredLightingEffect::add*Light methods 2015-02-26 11:03:47 -08:00
Sam Gateau
65a3e3618a Trying to setup correctly the projection matrix for all the different cases... 2015-02-23 17:06:46 -08:00
Sam Gateau
04a39275ef Trying to setup correctly the projection matrix for all the different cases... 2015-02-23 16:47:43 -08:00
Sam Gateau
6594f963d1 Merge branch 'master' of https://github.com/samcake/hifi 2015-02-23 14:59:17 -08:00
Sam Gateau
687c76a6f8 trying to ge the shadow to render correctly 2015-02-23 13:12:29 -08:00
Sam Gateau
ffaea07130 trying to ge the shadow to render correctly 2015-02-23 07:04:14 -08:00
Sam Gateau
90bff36fd3 trying to ge the shadow to render correctly 2015-02-22 18:48:48 -08:00
Sam Gateau
4e2d2bc188 Fixing the remaining issue with the avatar rendering path 2015-02-20 12:05:06 -08:00
Sam Gateau
ded78816b5 Fixing the remaining issue with the avatar rendering path 2015-02-20 11:26:08 -08:00
Sam Gateau
d08142d37d replacing glTRansform by gpu/Transform features 2015-02-19 15:12:13 -08:00
Sam Gateau
7e04f8a491 Model almost working with Transform 2015-02-19 09:52:58 -08:00
Sam Gateau
6070bf8a37 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-18 16:02:18 -08:00
Sam Gateau
11060ed273 trying to tackle the unenderstood transform value not going through corectly? 2015-02-18 16:00:37 -08:00
Seth Alves
ef2d386c75 attempt to load Courier if the requested font-family fails to load 2015-02-17 15:12:24 -08:00
Seth Alves
9fcb7591e6 don't crash if font load fails 2015-02-17 14:52:20 -08:00
Sam Gateau
d8aa0e0138 replacing the glTransform pipeline for model rendering 2015-02-17 09:44:03 -08:00
Sam Gateau
23354da828 replacing the glTransform pipeline for model rendering 2015-02-16 22:08:21 -08:00
Sam Gateau
cc3cc4f96f replacing the glTransform pipeline for model rendering 2015-02-16 09:31:29 -08:00
Sam Gateau
ef20c3234f merging 2015-02-13 14:41:39 -08:00
Sam Gateau
1b5e8697fb modification on the managment of the light map shading 2015-02-13 11:41:58 -08:00
Brad Hefta-Gaub
1827d9f3cd Merge pull request #4256 from samcake/temp1 
Getting rid of glLIghts and replacing by the model::Light
 2015-02-13 10:49:53 -08:00
Sam Gateau
bc2faca9bc Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-13 01:33:21 -08:00
Sam Gateau
e2e61c64b1 Support include path to shaders from the hifi libraries to cmake 2015-02-13 01:30:04 -08:00
Andrew Meadows
7304585103 Merge pull request #4271 from huffman/fix-overlays-text-size 
Fix overlays text size
 2015-02-12 09:35:37 -08:00
Andrew Meadows
357dd963f3 Merge pull request #4273 from ZappoMan/bugfix 
fix the quad color being broken after rendering text
 2015-02-12 09:00:16 -08:00
ZappoMan
7a45b1bc96 fix the quad color being broken after rendering text 2015-02-11 15:50:04 -08:00
Ryan Huffman
341e31a074 Remove extraneous initialized check 2015-02-11 13:08:11 -08:00
Ryan Huffman
51ff897ee5 Update Font to not setup GL until first draw 2015-02-11 12:59:12 -08:00
Brad Hefta-Gaub
9a7ed8055f Merge pull request #4267 from samcake/master 
Fix performance bug for NetworkGeometry::isLoadedWithTextures() and glTransform removal
 2015-02-11 09:45:29 -08:00
Sam Gateau
798817f34a Merge branch 'master' of https://github.com/samcake/hifi into temp0 2015-02-10 23:09:12 -08:00
Sam Gateau
a6f006a36d more cleaning 2015-02-10 18:41:36 -08:00
Sam Gateau
b9fd116dbf Introduce a cache bit in networkGemometry to capture the status of texture LOaded and avoid requiring everything once everything is loaded and get rid of the Transform stack calls on gl from gpu 2015-02-10 18:38:48 -08:00
ZappoMan
8016fb5e0d fix color issues with quads 2015-02-10 17:35:27 -08:00
Sam Gateau
11beb51ec1 Clean up comments 2015-02-09 18:02:34 -08:00
Sam Gateau
23a54b17ce Clean up comments 2015-02-09 15:33:55 -08:00
Sam Gateau
871f9a849a CLean up the shader code for the blinn and the new PBR shading equation 2015-02-09 15:30:17 -08:00
Sam Gateau
c2761ac887 CLean up the shader code for the blinn and the new PBR shading equation 2015-02-09 15:26:14 -08:00
Sam Gateau
559647b7af Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-09 12:26:29 -08:00
Sam Gateau
ace6dc4faf Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-08 23:23:06 -08:00
Sam Gateau
48fca4c11d introducing PBR shading 2015-02-08 23:22:14 -08:00
Brad Davis
b28920f4ed Fixing bug in text renderer causing glyphs to float at different depths 2015-02-08 15:37:55 -08:00
Sam Gateau
469ee29f0b Merge branch 'temp0' of https://github.com/samcake/hifi into temp1 2015-02-06 16:30:47 -08:00
Sam Gateau
bdf9164c7b debugging the new global light pass 2015-02-06 16:30:07 -08:00
Stephen Birarda
caf50764b4 correct resource name for Q_INIT_RESOURCE 2015-02-06 15:27:50 -08:00
Stephen Birarda
961b5b5346 call Q_INIT_RESOURCE statically from Font constructor 2015-02-06 15:17:53 -08:00
Stephen Birarda
9a98e07b2d call Q_INIT_RESOURCE from mains to handle static link 2015-02-06 12:39:14 -08:00
Stephen Birarda
7b5af1e3fd cleanup debug for font load 2015-02-06 12:06:20 -08:00
Stephen Birarda
27b91e7d43 use QIODevice for loadFont method 2015-02-06 12:04:57 -08:00
Stephen Birarda
c8fb891158 move fonts to sdff files, load with qrc 2015-02-06 11:48:55 -08:00
Stephen Birarda
58d5e0b9d3 fix some asterisk type squishes in TextRenderer 2015-02-06 10:48:10 -08:00
Brad Davis
39794a7a40 Getting rid of some warnings 2015-02-05 21:00:34 -08:00
Sam Gateau
1b22a3ef36 connecting the globalLight info to the DeferredLightingEffect 2015-02-05 17:30:57 -08:00
Sam Gateau
9b0036d010 adding Light and replace glLights also for the first deferred pass 2015-02-05 14:10:06 -08:00
Brad Davis
dc1cc84c1c Working on porting to mac compatible shaders 2015-02-05 12:58:09 -08:00
Sam Gateau
00a9f55bc3 lightings seems to work correctly now 2015-02-05 10:20:19 -08:00
Brad Davis
da05c26aad Moving shaders to standard format, adding bounding box support and using it in text node 2015-02-04 21:32:05 -08:00
Sam Gateau
8e1eebbbd4 FInally getting the angular attenuation 2015-02-04 17:24:23 -08:00
Brad Davis
02f2f1c1bf Fixing header order and code style 2015-02-04 14:36:03 -08:00
Sam Gateau
6c00f29f2b REvisiting the shaders for lighting on deferred pass 2015-02-04 14:01:16 -08:00
Sam Gateau
7d6161598b REvisiting the shaders for lighting on deferred pass 2015-02-04 13:31:39 -08:00
Brad Davis
1745ba9a7e More OSX work, refactoring functions to shared, removing erroneuous Qt 5.4 dependency, fixing PrioVR text api usage 2015-02-04 12:42:27 -08:00
Brad Davis
ba277e802a Working on OSX compilability 2015-02-04 11:29:31 -08:00
Brad Davis
0dcf5b001f Some more cleanup 2015-02-03 23:26:15 -08:00
Brad Davis
9a6175a3b9 Starting to work on replacement for clip planes 2015-02-03 22:10:44 -08:00
Brad Davis
d64e7c464a Merge branch 'develop' into text-renderer 2015-02-03 18:44:06 -08:00
Brad Davis
190669d168 Merge branch 'master' into develop 2015-02-03 18:43:51 -08:00
Brad Davis
cab31e7190 Working on text coordinates 2015-02-03 18:43:24 -08:00
Sam Gateau
1029af140e tiny bit different... 2015-02-03 18:15:20 -08:00
Sam Gateau
5719e277dd FIx the lightmap not displaying when using the texcoord0 2015-02-03 16:10:31 -08:00
Sam Gateau
d8d0a28d0f FInd a solution for lightmap without 2nd uvset 2015-02-03 14:34:11 -08:00
Brad Davis
6cfb51283e Working on the text renderer 2015-02-03 01:49:06 -08:00
Brad Davis
68448daa18 Moving closer to the original coordinate system 2015-02-02 23:29:46 -08:00
Brad Davis
8d81607e28 Tweaking the example text renderer 2015-02-02 23:27:57 -08:00
Sam Gateau
5c4a8a5cda Fixing the spotlight 2015-02-02 17:24:26 -08:00
Sam Gateau
16f12dd267 working on the point light shader edge representation 2015-02-02 16:31:36 -08:00
Sam Gateau
0da38c103f working on the spot light shader 2015-02-02 11:17:35 -08:00
Brad Davis
ab1624b0a8 Adding matrix stack (currently not used 2015-02-01 16:25:17 -08:00
Brad Davis
711506e055 Moving implementation details out of header 2015-02-01 14:15:34 -08:00
Brad Davis
60317b3526 Working on signed distance fields text rendering 2015-01-31 21:42:54 -08:00
Sam Gateau
56925cee00 Merge branch 'temp1' of https://github.com/samcake/hifi into temp1 2015-01-30 17:04:27 -08:00
Sam Gateau
c3e1311ed1 avoid recreating lights every frame, just have a pool of lights edited each frames 2015-01-30 17:03:28 -08:00
dev
6eca52e4f2 point light is working with Mac 2015-01-30 17:01:46 -08:00
Sam Gateau
38129c2988 Merging with latest build 2015-01-30 12:58:50 -08:00
Sam Gateau
228e629856 working on the spot light now 2015-01-30 11:40:44 -08:00
samcake
e3fa2e1995 Merge pull request #4191 from ZappoMan/moreImmediateModeRemoval 
Removal of glColorXXX()
 2015-01-30 10:21:18 -08:00
Sam Gateau
19047f000a Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-30 10:20:55 -08:00
samcake
331104d1c6 Merge pull request #4194 from thoys/texture-max-area-2M 
changing texture size limit from 1024*1024 to 2M  i.e. (1024 * 2048).
 2015-01-29 17:33:35 -08:00
ZappoMan
66567fd89d CR feedback 2015-01-29 17:24:56 -08:00
ZappoMan
c1bb03e9a8 CR feedback 2015-01-29 17:23:48 -08:00
Thijs Wenker
ff29b1c8cc style/conversion fixes 2015-01-30 02:18:51 +01:00
Sam Gateau
264435b695 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-29 17:14:11 -08:00
Sam Gateau
471da3935d working on the lighting 2015-01-29 17:11:50 -08:00
Thijs Wenker
a4c82072a2 changing texture size limit from 1024*1024 to 2M i.e. (1024 * 2048). It's dynamic and resizes the texture to the best fit within the 2M area. 2015-01-30 02:00:35 +01:00
Sam Gateau
b2f16be92a Fixing the non loading of some texture because the QImage bit size is not exactly what's expected 2015-01-29 15:17:55 -08:00
ZappoMan
534575fd10 fix a couple bugs in 3d textured version of renderQuad 2015-01-29 13:16:14 -08:00
ZappoMan
418b97a648 attempt to get color working for 3d textured quads 2015-01-29 12:04:34 -08:00
ZappoMan
87e91a5a94 Revert "attempt to get color working for 3d textured quads" 
This reverts commit 0f390a98b8.
 2015-01-29 11:44:36 -08:00
ZappoMan
0f390a98b8 attempt to get color working for 3d textured quads 2015-01-29 10:50:13 -08:00
ZappoMan
4abb2481d6 removed old comment 2015-01-29 10:10:53 -08:00
ZappoMan
5d2df7b03f implement color for dashed lines 2015-01-28 18:51:23 -08:00
ZappoMan
efb044ea5e change renderDashedLine() to take a color paramter 2015-01-28 15:08:59 -08:00
ZappoMan
7bd45ba0ca change removing more glColor calls 2015-01-28 14:52:33 -08:00
ZappoMan
2f4e98082b remove glColor calls related to text rendering 2015-01-28 13:54:48 -08:00
ZappoMan
7d9de6d0eb added some TODO comments and some cleanup 2015-01-28 11:03:05 -08:00
ZappoMan
6821f31f14 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	libraries/gpu/src/gpu/GLBackend.cpp
 2015-01-28 10:46:30 -08:00
ZappoMan
30f985a6fe some cleanup 2015-01-28 10:30:05 -08:00
Sam Gateau
b6836af071 improving on the poin light attenuatiion formula 2015-01-28 00:09:15 -08:00
ZappoMan
9631761f70 get sphere normals correct 2015-01-27 21:39:59 -08:00
ZappoMan
e7742351b7 get sizing for spheres to work properly 2015-01-27 20:30:58 -08:00
ZappoMan
4a6cc5c6f2 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/ui/overlays/ImageOverlay.cpp
 2015-01-27 16:44:11 -08:00
Sam Gateau
b9bbd7745f Merge branch 'temp0' of https://github.com/samcake/hifi into temp1 2015-01-27 15:48:34 -08:00
Sam Gateau
db427cdf5e adding Light class in model and the shader in render utils 2015-01-27 15:45:10 -08:00
Sam Gateau
ae3233b119 in the middle of something 2015-01-27 15:44:10 -08:00
Sam Gateau
f619acc3b5 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-27 15:43:27 -08:00
Sam Gateau
4592bdcb4f fixes after review by Brad 2015-01-27 15:42:56 -08:00
Ryan Huffman
7ececd793a Fix failing QMetaObject::invokeMethod call 2015-01-27 13:59:46 -08:00
Ryan Huffman
9fd352e1dc Break long lines in TextureCache.h/cpp 2015-01-27 10:27:05 -08:00
Ryan Huffman
1f6932bdcb Update TextureCache to store original image dimensions (pre-scale) 2015-01-27 08:09:20 -08:00
Atlante45
f84f6e9b66 Restore joints state on stopAnimation 2015-01-26 19:12:18 -08:00
Sam Gateau
c05d627cc1 Clean up 2015-01-23 17:13:26 -08:00
Sam Gateau
0d3f9c740d duplicate cleaning code at the end of Model renderCore 2015-01-23 11:14:17 -08:00
Sam Gateau
4151833549 cleaning up for pull request 2015-01-23 10:49:04 -08:00
Sam Gateau
49dde269a6 experimenting with linear space vs srgb space 2015-01-22 16:27:17 -08:00
Sam Gateau
aecc8b85bd Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-22 12:40:30 -08:00
ZappoMan
9152865116 first cut at supporting streamized spheres 2015-01-21 16:56:41 -08:00
Sam Gateau
1e84f260a9 Removing gl calls for texture from TextureCache 2015-01-21 16:53:35 -08:00
Ryan Huffman
53a70c43e1 Add width and height to NetworkTexture 2015-01-21 15:08:38 -08:00
Sam Gateau
d19bfa69f2 Even more gpu::Texture in the model rnedering 2015-01-21 10:07:10 -08:00
ZappoMan
4c9b7f46a2 cleanup 2015-01-21 10:03:25 -08:00
Sam Gateau
4302db109f First take at using the gpu::Texture in the Model rendering instead of the previous pass with raw glTexture 2015-01-20 16:02:26 -08:00
ZappoMan
44b48bab5e remove some dead code we don't use 2015-01-19 18:15:47 -08:00
ZappoMan
2b2bd3cb47 more work on renderGrid with color 2015-01-19 18:08:34 -08:00
ZappoMan
0ae695ecf3 first cut at renderGrid with color 2015-01-19 16:54:43 -08:00
ZappoMan
27268a6489 fix updateVertices to correctly copy all data 2015-01-19 15:43:20 -08:00
ZappoMan
ef82aac7a5 removed some debug, fixed a type mismatch for vec2 vs vec3 2015-01-19 14:48:19 -08:00
ZappoMan
41c039f283 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-19 13:34:28 -08:00
ZappoMan
bddb7856af more work 2015-01-19 13:34:09 -08:00
Sam Gateau
6b55b4ff82 No more Magic numbers and fixing the code path for linux 2015-01-16 10:26:51 -08:00
Sam Gateau
8634d86167 Adding ambient sphere in the lighting equation and menu to control te presets 2015-01-16 09:43:21 -08:00
Sam Gateau
0e38ea8854 Adding ambient sphere in the lighting equation and menu to control te presets 2015-01-16 09:41:43 -08:00
Sam Gateau
d1fb071208 Adding ambient sphere in the lighting equation and menu to control te presets 2015-01-16 09:38:53 -08:00
ZappoMan
439a1c0495 solid cube now streamizing 2015-01-15 18:46:44 -08:00
ZappoMan
daafa20ec6 first cut at moving wire cube to support gpu streams 2015-01-15 17:00:08 -08:00
Sam Gateau
7ae9635ce7 Refactoring the code from directional into DeferredLighting.slh 2015-01-15 15:27:18 -08:00
ZappoMan
149f365410 fix colors for renderBevelCornersRect() 2015-01-15 11:55:45 -08:00
Sam Gateau
d759f4c255 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-15 11:54:55 -08:00
Sam Gateau
067483fce2 Adding a prototype of ambient lighting with spherical harmonics 2015-01-15 11:54:01 -08:00
ZappoMan
72f2e6f3aa work on colored quads 2015-01-15 11:37:53 -08:00
ZappoMan
db94949649 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
 2015-01-14 17:55:03 -08:00
Sam Gateau
614e1aa6ae Cleaning the Model rendering path from any use of glMaterial 2015-01-14 16:44:44 -08:00
ZappoMan
2f549c776c Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-14 14:41:51 -08:00
Sam Gateau
7be1f41659 using the Material class 2015-01-14 10:22:27 -08:00
ZappoMan
e6388a65b9 rough pass at adding color to geometry cache 2015-01-13 20:53:05 -08:00
Atlante45
f77fab2fe0 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 20:38:52 -08:00
Atlante45
38729c5790 Made dependencies inherit from Dependency 2015-01-13 20:38:01 -08:00
Sam Gateau
1bbdb43d8c Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-13 18:24:59 -08:00
dev
d7ad5a35d6 fixes for glsl mac 2015-01-13 18:24:32 -08:00
Brad Hefta-Gaub
b3b43b4c14 Merge pull request #4093 from samcake/temp0 
Factorize the shader code for deferred lighting
 2015-01-13 17:11:17 -08:00
dev
d3edd14638 fixes for glsl mac 2015-01-13 16:53:22 -08:00
ZappoMan
1b0a5c881b Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-13 16:14:29 -08:00
Sam Gateau
9c083ce86e Using the model::Material for rendering and in shaders 2015-01-13 15:51:18 -08:00
Sam Gateau
d9efafac7e updating the model fragment shaders to use DeferredBUfferWrite 2015-01-13 14:11:38 -08:00
Atlante45
2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
 2015-01-13 11:03:14 -08:00
Sam Gateau
522e7698a5 first step factorizing the packDeferredFragment 2015-01-13 10:23:00 -08:00
Sam Gateau
6d217e1479 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-13 10:07:27 -08:00
Sam Gateau
fc698a8525 first step factorizing the packDeferredFragment 2015-01-12 18:51:26 -08:00
Atlante45
74d819fe25 Merge branch 'master' of https://github.com/highfidelity/hifi into body_not_rotating 2015-01-12 16:42:35 -08:00
Sam Gateau
1566157250 Use the DeferredBuffer.slh in point and spot lights 2015-01-12 15:52:31 -08:00
Atlante45
8415098fc2 Set different caches size depending on cache type 2015-01-12 15:36:36 -08:00
Sam Gateau
c45f618852 Factorising the shader code to unpack data from the deferred buffer 2015-01-12 15:00:35 -08:00
Atlante45
08317b51da Use removeUnusedResources 2015-01-12 11:12:50 -08:00
Sam Gateau
26a316db3a Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-11 11:35:19 -08:00
Sam Gateau
e639c5a549 playing with the ambient lighting 2015-01-11 11:33:21 -08:00
chris
8bb69d0a90 Update std::string instances to QString 2015-01-09 16:22:52 -08:00
ZappoMan
17e48554d8 implement support for proper cleanup in BatchItemDetails 2015-01-09 15:06:11 -08:00
ZappoMan
a03c2b79fa first cut at adding colors to GeometryCache and supporting batch internally 2015-01-08 15:52:33 -08:00
ZappoMan
1bc91e7d29 removed renderTriangleProxies 2015-01-06 16:01:06 -08:00
ZappoMan
1bfce7d876 more removal of immediate mode 2015-01-06 14:14:13 -08:00
ZappoMan
ac1f7c9a84 multi-mode renderVertices 2015-01-06 09:52:27 -08:00
ZappoMan
570607c044 renderLines 2015-01-06 08:58:41 -08:00
ZappoMan
0606861b66 dashed lines in GeometryCache 2015-01-05 21:45:17 -08:00
ZappoMan
a9b7367fa9 more work on eliminating immediate mode calls 2015-01-05 20:51:05 -08:00
ZappoMan
9545bd1907 add alternate renderGrid for audio scope 2015-01-05 19:34:37 -08:00
ZappoMan
bd1612f6a4 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-05 16:51:31 -08:00
ZappoMan
a20fa1242d first cut are removing immediate mode GL_LINES 2015-01-05 15:46:48 -08:00
ZappoMan
c2d45df541 add renderBevelCornersRect to GeometryCache 2015-01-05 14:39:14 -08:00
Sam Gateau
f03b253260 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2015-01-05 13:23:14 -08:00
Andrew Meadows
162854c5a5 Merge pull request #4025 from ZappoMan/voxelEctomy 
Voxel ectomy
 2015-01-05 13:20:30 -08:00
Sam Gateau
901ea16ba0 clean code 2015-01-05 13:17:12 -08:00
Sam Gateau
7529b3d1b0 clean code 2015-01-05 13:10:32 -08:00
dev
e3d474db3d FIx shaders for mac 2015-01-05 12:27:16 -08:00
Sam Gateau
b8e44a3e7a Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2015-01-05 11:27:53 -08:00
Sam Gateau
458ea6759e Adding the shadow.slh file containing the shader functions used for shadowing, itis used by both normal and cascaded shadow deferred lighting passes 2015-01-05 11:27:29 -08:00
Philip Rosedale
a01ab38f1b Merge pull request #4029 from Atlante45/new_glm_fix 
Fix compile error with new glm version
 2015-01-04 11:26:37 -08:00
ZappoMan
139f96c8b0 remove PerformanceTimer from recalculateMeshBoxes() because it's not thread safe 2015-01-02 14:41:09 -08:00
Sam Gateau
46ab4833be applying the shadowing improvment to the cascaceded path shader and cleaning the code 2015-01-02 12:12:41 -08:00
Sam Gateau
24d39f4453 refining the shadowing 2015-01-02 11:29:54 -08:00
Sam Gateau
ef7c002237 Improving the shadow effect with lightmaps 2015-01-02 10:31:34 -08:00
Atlante45
b1f0ec8dfb Fix compile error with new glm version 2014-12-31 15:49:56 -08:00
Sam Gateau
02949dbc5a Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-31 10:59:42 -08:00
ZappoMan
9630279459 Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 
Conflicts:
	examples/editVoxels.js
	examples/fallingSand.js
	examples/growTrees.js
	interface/src/Application.cpp
	interface/src/Application.h
	libraries/avatars/CMakeLists.txt
	libraries/entities/src/EntityItem.h
 2014-12-31 10:50:53 -08:00
ZappoMan
4ea9bbc309 first major pass at voxelEctomy 2014-12-30 18:08:58 -08:00
Sam Gateau
ae6ccf1a7d Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-12-30 17:56:08 -08:00
Sam Gateau
4fb9e9c775 cleaning the code 2014-12-30 17:55:49 -08:00
Sam Gateau
8d95639416 moving the deferrered shaders from the resource folder to built-in the executable 2014-12-30 17:43:52 -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
samcake
20d66d201e Merge pull request #4020 from ZappoMan/gpuStreamizing 
Improvements to GeometryCache::renderQuad()
 2014-12-30 16:49:16 -08:00
Clément Brisset
860098585c Merge pull request #4018 from samcake/temp0 
Moving the shaders used in Model.cpp from resources folder into the built-in executable
 2014-12-30 13:36:13 -08:00
ZappoMan
4e6ed4a449 fix comments 2014-12-30 13:26:13 -08:00
ZappoMan
28569836bb rename parameters and reuse previously registered quad if geometry didn't change 2014-12-30 13:24:31 -08:00
Sam Gateau
a022e94814 Adding the shader files 2014-12-30 12:38:36 -08:00
ZappoMan
be137534b5 first cut at registered quads to reduce copies of constantly changing quads 2014-12-30 12:38:16 -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
ZappoMan
53a7d83f35 CR feedback spacing 2014-12-30 10:33:22 -08:00
ZappoMan
cb951763fd CR feedback spacing 2014-12-30 10:29:18 -08:00
ZappoMan
a4520f6a07 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2014-12-30 10:27:06 -08:00
Sam Gateau
6628f7b811 replace the model.frag and model.vert files from resource by the sl version of the shaders 2014-12-25 19:57:27 -08:00
ZappoMan
0790bd77b7 almost completely eliminate immediate mode QUADS 2014-12-24 11:14:50 -08:00
dev
42157161e0 fix the c++ header generation for mac though the brand new raw string format of c++11 2014-12-23 18:19:25 -08:00
Sam Gateau
c5eb04336f first version of SCribe used for shaders in render-utils 2014-12-23 16:27:02 -08:00
ZappoMan
1f307e9667 more work on removing immediate mode GL_QUADS 2014-12-23 09:50:38 -08:00
ZappoMan
3d42d532e4 more work on removing immediate mode GL_QUADS 2014-12-22 17:43:02 -08:00
ZappoMan
14458ac8fd first pass at removing immediate mode GL_QUADS 2014-12-22 13:47:18 -08:00
Atlante45
327daacecd Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	libraries/networking/src/NodeList.cpp
 2014-12-22 13:34:18 -08:00
ZappoMan
8091564a73 remove all glut 2014-12-18 16:12:30 -08:00
Atlante45
296c0025de Switched to auto and changed macro 2014-12-18 15:42:38 -08:00
ZappoMan
26bcca95c9 remove glutWireCube() 2014-12-18 15:42:02 -08:00
Atlante45
990362b8ff Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11 2014-12-18 14:18:21 -08:00
ZappoMan
11b4400099 move all glut-ness to geometry cache 2014-12-18 11:20:17 -08:00
ZappoMan
ef42203481 add wire cube implementation to GeometryCache and DeferredLightingEffect 2014-12-17 15:58:52 -08:00
Atlante45
ce7f72d2cd Update macro 2014-12-17 15:26:47 -08:00
ZappoMan
1a9cf126e4 Merge branch 'master' of https://github.com/highfidelity/hifi into librarization 
Conflicts:
	interface/src/Application.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.h
 2014-12-17 13:16:11 -08:00
ZappoMan
2be3b73e8c move TextRender to libraries/render-utils 2014-12-17 12:32:52 -08:00
ZappoMan
5d636e21c6 more Application dependency cleanup 2014-12-17 11:10:45 -08:00
ZappoMan
d3bf28e879 more Application dependency cleanup 2014-12-17 11:10:24 -08:00
ZappoMan
3dfded89b8 remove menu dependency from EntityTreeRenderer, some Application cleanup 2014-12-16 16:28:09 -08:00
Atlante45
b2dac6f53f DM users update 2014-12-16 15:32:11 -08:00
Atlante45
11a2ecab56 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.cpp
	interface/src/entities/EntityTreeRenderer.h
	interface/src/ui/ApplicationOverlay.cpp
	libraries/render-utils/src/GlowEffect.cpp
	libraries/render-utils/src/Model.cpp
 2014-12-16 15:02:37 -08:00
ZappoMan
89101872bb move Model and AnimationHandle to libraries 2014-12-16 14:04:39 -08:00
ZappoMan
efa8a752f2 remove dependency on Menu from Model 2014-12-16 13:14:57 -08:00
ZappoMan
16c1e597f1 remove Application dependency from Model 2014-12-16 12:53:22 -08:00
ZappoMan
1ed2c62bbf try this 2014-12-16 12:15:57 -08:00
ZappoMan
ec5c33fecc try this 2014-12-16 11:57:06 -08:00
ZappoMan
a9b3fdd3eb try this 2014-12-16 11:44:15 -08:00
ZappoMan
fc1e1ecfc0 move DeferredLightingEffect and AmbientOcclusionEffect to libraries, make them DependencyManager enabled 2014-12-16 11:27:44 -08:00
ZappoMan
4d79a08533 remove Application dependencies from AmbientOcclusion and DeferredLightingEffect 2014-12-16 10:32:03 -08:00
ZappoMan
02737a4ec4 move JointState to libraries 2014-12-15 19:38:30 -08:00
ZappoMan
fac6ff572b see if this works 2014-12-15 19:29:53 -08:00
ZappoMan
41c135c4e5 move GlowEffect to libraries 2014-12-15 19:19:21 -08:00
ZappoMan
37abe8e89c move RenderUtils.cpp/h to libraries 2014-12-15 17:35:26 -08:00
ZappoMan
df7e115556 move ProgramObject to libraries 2014-12-15 14:21:22 -08:00
ZappoMan
49cacd85bd move GeometryCache to library 2014-12-15 14:00:41 -08:00
ZappoMan
7b973453b4 move TextureCache to library 2014-12-15 13:14:16 -08:00
ZappoMan
3de3540ebe move back into interface for now 2014-12-15 08:37:33 -08:00
ZappoMan
4ac673fe63 more render util cleanup 2014-12-15 08:16:42 -08:00
ZappoMan
2df4c017f1 move GeometryCache out of application and remove dependency on Model 2014-12-15 08:15:55 -08:00
ZappoMan
e253b8afa4 move TextureCache out of interface and Application 2014-12-15 08:14:53 -08:00