Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 04:56:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61951 commits 25 branches 0 tags 1.1 GiB
Commit graph

486 commits

Author SHA1 Message Date
samcake
e8835b34f4 fix issues while testing the ktxStorage 2017-02-22 19:05:20 -08:00
samcake
262d7c3b79 Merging with upstream smarter_textures and Austin's pr 2017-02-22 17:54:38 -08:00
samcake
ad40e2d7d9 Trying to address the ktx serialization problem with normal, still have a bug 2017-02-22 17:16:37 -08:00
Brad Davis
055db531b1 Update 'caching' of textures to KTX file backing 2017-02-22 15:59:05 -08:00
Brad Davis
61ba2dd11e Disable texture cache processing for now 2017-02-22 13:29:10 -08:00
samcake
5e307f247e Add support for the R8 textures 2017-02-21 10:46:49 -08:00
samcake
ba54b5ce11 Rebasing with current upstream 2017-02-21 10:07:42 -08:00
sam
e5c2f6f651 enabled the usage and cube map with KTX correctly 2017-02-21 01:28:13 -08:00
sam
b502b1e200 assigning the names of source to the texture 2017-02-20 19:40:39 -08:00
Brad Davis
27e8750b9b Adding new storage backing for gpu::Texture, moving mip format into Storage abstraction 2017-02-19 18:11:56 -08:00
samcake
94960a7a80 Small bug when accessing inexisting storage from the Pixels 2017-02-17 16:05:11 -08:00
samcake
e6c6cd2825 cleaner unserialization 2017-02-17 12:24:04 -08:00
samcake
2d7ba45667 FIx creationg issue , need a usageType at creation 2017-02-17 12:01:33 -08:00
sam
b4745657e0 progressing on io with ktx 2017-02-17 07:58:10 -08:00
sam
6771cc31e1 Adding the reading path 2017-02-17 07:55:18 -08:00
samcake
3f0ea1c889 Address review comments 2017-02-17 07:55:16 -08:00
sam
d56f982dec Maybe saving the first ktx textures, testing the save pipeline 2017-02-17 07:54:17 -08:00
Bradley Austin Davis
7fb7aa87eb Working on new texture management strategy 2017-02-17 07:53:16 -08:00
samcake
b9102204ea FIx the filtering problem on color and normals introduced since we generate mips with QImage 2017-02-10 11:40:39 -08:00
samcake
e11d10f5d4 Reparing broken normals and also fixing the ambient lighting bug 2017-02-08 16:56:59 -08:00
samcake
267d553c26 Cleaning comments and pixel format assignments 2017-02-08 11:42:23 -08:00
samcake
a137659a35 Cleaning up pr for simpler merge 2017-02-08 11:13:55 -08:00
samcake
7b49f548ed trying to remove the 24bits formats 2017-02-07 18:06:49 -08:00
samcake
feb36b8dbf Merge branch 'purple' of https://github.com/samcake/hifi into blue 2017-02-06 11:56:45 -08:00
samcake
9fd1d5114c Merge branch 'master' of https://github.com/highfidelity/hifi into purple 2017-02-06 10:16:41 -08:00
samcake
c864e57855 first pass on a working image class and the mip generation 2017-02-06 08:51:04 -08:00
samcake
e8cdee71ed avoid assertion on mac 2017-02-03 22:49:41 -08:00
samcake
27dab5c4ba COmbining more intrumentation, mip generation on cpu and an improved blit for the derez case 2017-02-03 12:03:59 -08:00
sam
c4ec0cc069 fixing a bad cDebug 2017-02-02 22:09:52 -08:00
samcake
b440ccad28 Improving the IMage class 2017-02-02 17:53:48 -08:00
samcake
446aaf3bce Turn off cpu mip map to add instrumentation to master 2017-02-02 11:58:02 -08:00
sam
569378bdeb REcompiling for windows... 2017-02-02 01:57:43 -08:00
sam
387621e586 Merge branch 'blue' of https://github.com/samcake/hifi into purple 2017-02-01 22:01:39 -08:00
sam
3aa239b004 More instrumentation during texture load 2017-02-01 22:00:03 -08:00
samcake
3108360094 Merge branch 'blue' of https://github.com/samcake/hifi into purple 2017-02-01 16:36:40 -08:00
samcake
6bdf50f2db moving mip map gen to cpu 2017-02-01 15:16:37 -08:00
samcake
edcba1b7c5 Merge branch 'master' of https://github.com/highfidelity/hifi into purple 2017-02-01 10:12:47 -08:00
samcake
586db3405a Merge branch 'master' of https://github.com/highfidelity/hifi into purple 2017-01-30 22:08:51 -08:00
Brad Hefta-Gaub
dbbed462b4 cleanup naked qDebug() calls 2016-12-19 22:24:25 -08:00
Brad Davis
30a9961362 tracing polish 2016-12-16 14:02:27 -08:00
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
samcake
982664dac5 Merging with upstream 2016-11-15 18:14:25 -08:00
samcake
1c61664ca0 Still refining th edesign of th eiMage classes 2016-11-13 23:20:39 -08:00
samcake
41109553eb Saving state before merge up 2016-11-04 22:56:18 -07:00
samcake
6926cd274c Merge with upstream 2016-11-02 18:15:08 -07:00
samcake
b38f69dc78 stage 0 of fooling around with image compression.... 2016-10-29 22:43:42 -07:00
samcake
9adbb42a6c Fixing the skybox, still issues with the lights 2016-10-28 18:12:39 -07:00
samcake
c65269e72d Merge branch 'master' of https://github.com/highfidelity/hifi into purple 2016-10-26 23:10:21 -07:00
samcake
ce68be2a59 a few step further 2016-10-26 23:09:41 -07:00
Brad Davis
ce627eeea1 Updated metrics 2016-10-25 17:49:51 -07:00
Brad Davis
a9bf2a5cd3 Limit max texture size, don't force cubemaps to sparse page size 2016-10-25 17:47:42 -07:00
Brad Davis
f26dc4dcb9 Don't rectify skybox textures 2016-10-25 17:47:40 -07:00
Brad Davis
4bb8d4e78e Force all loaded textures to sparse compatible sizes 2016-10-25 17:47:39 -07:00
samcake
07d1daaa9b Designing IMage 2016-10-24 18:35:15 -07:00
samcake
4ac0c29d9b Adding Image utility to GPU 2016-10-24 09:40:34 -07:00
samcake
5f9c713d44 Merging with upstream after resolving some conflicts 2016-10-12 09:22:12 -07:00
Gabriel Calero
834d9c0710 Adapt shader for GL ES support which requires operators of the same datatype 2016-10-11 12:15:49 -03:00
samcake
297907688c Fixing reveiw comments 2016-10-10 12:43:33 -07:00
samcake
8a44140e6b cleaning up the comments from review and trying something to adress the issue that showed up on i5 2016-10-07 16:04:19 -07:00
sam
bda835361a Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-03 02:54:11 -07:00
sam
6f2452815c pass the visibility of the enitity to the LightPaylkoad correctly, clean up the ambient shader 2016-10-03 00:08:30 -07:00
samcake
89717720f7 CLeaning up code for Linux and Mac 2016-10-01 16:12:45 -07:00
Brad Hefta-Gaub
7fe16442fa make calculateTextureInfo thread safe 2016-10-01 15:47:17 -07:00
samcake
5b4829e7b6 Brining back support for the ambinet lighting 2016-09-30 16:24:57 -07:00
sam
e143c05ef8 Keep on investigating the shading cost per light 2016-09-30 02:41:21 -07:00
samcake
2a0e67ee2a REvisiting the full lighting code to optimize the perf 2016-09-29 19:06:26 -07:00
samcake
bb5493106f smaller struct descriptions 2016-09-28 18:33:34 -07:00
samcake
b09151f2a2 Rearrange the light struc description in the shader side, needs the c++ to match now 2016-09-28 18:32:35 -07:00
samcake
9b94a025fc Refining the voxelization of the sphere in the view frustum grid 2016-09-26 18:41:53 -07:00
Brad Davis
6711b9c417 Restore proper mip handling to skybox 2016-09-23 12:05:04 -07:00
Brad Davis
fa23fa7b2d Working on cubemap mip bug 2016-09-23 12:04:55 -07:00
Brad Davis
1ff91219a8 Fix strange artifacts in skybox 2016-09-23 12:04:52 -07:00
samcake
821072bb76 REarrange the light stage construction and light frame usage to produce the light clusters 2016-09-12 11:07:55 -07:00
samcake
3bcea4310d Fixing the vizualisation shader for world to cluster space 2016-09-10 10:41:18 -07:00
Brad Davis
bc6b43b7be Add debug option to lower texture resolution 2016-09-08 22:19:17 -07:00
sam
b81dfefbeb pack all the lights in a single buffer and shade the opaque with a single full screen path 2016-09-03 12:08:53 -07:00
samcake
d2a15ca82c Trying to migrate to a light array instead of each individual lights 2016-09-02 17:51:35 -07:00
samcake
7b68f1439f Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-02 09:28:35 -07:00
Brad Hefta-Gaub
e3bad8e8f4 Merge pull request #8556 from ZappoMan/renderStats 
add support for renderInfo properties to model entities
 2016-09-02 09:04:56 -07:00
samcake
e72791233d overall clean up of th elocal light drawing to avoid the in/out pipeline case, still seeing big cost on gpu from the spot lights 2016-09-01 18:08:36 -07:00
samcake
96935504a1 Streamlining the lighting phase for better performances 2016-09-01 15:20:14 -07:00
Brad Hefta-Gaub
e1845e2c3f add support for renderInfo properties to model entities 2016-08-31 15:00:21 -07:00
Zach Pomerantz
1e7c00c0c8 fix Skybox::clear to set _empty 2016-08-29 13:40:56 -07:00
Zach Pomerantz
5f699072d9 allow black skybox 2016-08-29 10:58:09 -07:00
Brad Hefta-Gaub
3d6691f3d1 Merge pull request #8527 from zzmp/fix/skybox-default-color 
fix skybox default
 2016-08-26 15:14:44 -07:00
Zach Pomerantz
5e82093e69 set skybox clear color to empty color 2016-08-25 18:08:03 -07:00
Zach Pomerantz
24162f0f3d set skybox default color to empty color 2016-08-25 12:37:23 -07:00
Andrew Meadows
d59c997e64 remove stubbery, make physics lib depend on model 2016-08-24 22:25:45 -07:00
Zach Pomerantz
c740b263a8 detect unset skybox 2016-08-23 15:16:26 -07:00
Zach Pomerantz
8c559bc65d use lights from nontextured skyboxes 2016-08-16 13:27:22 -07:00
Brad Davis
f776b10b58 Enable flag driven CPU generation of mipmaps 2016-08-12 22:28:49 -07:00
Brad Hefta-Gaub
ea1e090053 Merge pull request #8383 from AndrewMeadows/faster-is-better 
faster image processing on load
 2016-08-11 13:10:44 -07:00
Ryan Huffman
5b69ca03f0 Move default skybox out of global and make irradiance gen optional 2016-08-08 16:03:03 -07:00
Andrew Meadows
4e23ecfb2c count the _translucent_ pixels and fix break logic 2016-08-07 10:50:25 -07:00
Andrew Meadows
f759fd1033 early exit when determining if alpha mask possible 
also don't bother scanning for alpha for cube maps
 2016-08-07 08:54:20 -07:00
Andrew Meadows
4f2c00af46 faster TextureUsage::process2DImageColor() 2016-08-05 23:38:45 -07:00
samcake
5d4b55eeea Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-12 09:19:28 -07:00
samcake
8f2bf2b423 Integrating the scattering to the local lights 2016-07-06 17:13:16 -07:00
Triplelexx
fd4d9761ce merge master and resolve conflicts 
* remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping
 2016-06-24 03:34:39 +01:00
samcake
0c882832bf Bringing the Scattering type to the pixels and having a different shading during the lighting pass (for global right now) 2016-06-20 17:58:35 -07:00
samcake
25eb569433 Merge branch 'master' of https://github.com/highfidelity/hifi into color 2016-06-02 10:38:40 -07:00
Geenz
ff3fca3dc3 Remove no longer necessary light vector parameter. 2016-05-22 21:50:48 -04:00
Geenz
180f4ba4f5 Tweaked light attenuation formula some more. 
Keeping the ulightvec parameter for now - I want to revisit this later.
 2016-05-22 21:02:28 -04:00
Geenz
75532cda08 Document evalLightAttenuation's parameters. 2016-05-19 20:52:28 -04:00
Geenz
a54e8206fa Switch back to using the light's radius + spacing 2016-05-19 20:10:49 -04:00
Geenz
6ecbdc6b9a Modify evalLightAttenuation to "fade" edges of lights. 
This provides a more attractive light falloff around the bounds of a
light - removing harsh edges.

This also adds a new parameter to evalLightAttenuation - the
unnormalized light vector.
 2016-05-19 20:03:05 -04:00
samcake
c1fa096e78 adding texcoord 1 on all the material/model and go fetch occlusion map with this uv instead of texcoor0. this allow for separate transforms just for occlusoin map 2016-05-16 15:42:48 -07:00
samcake
cdb9cb6519 Fixing the metallic simple material rendering black from obj 2016-05-13 16:33:14 -07:00
samcake
37f16e9c86 Merging with master 2016-05-09 12:01:58 -07:00
Brad Hefta-Gaub
39a4e38485 Merge pull request #7837 from samcake/hdr 
Fixing the bad color format for skymaps
 2016-05-09 11:47:02 -07:00
samcake
0bfad4a549 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-05-09 11:33:47 -07:00
samcake
1fec984ead fixing the linear COlor FOrmat flag 2016-05-06 19:07:07 -07:00
samcake
da75c27188 fixing bad color format assignment code and bad color format for the cubemaps 2016-05-06 18:57:19 -07:00
samcake
a8347cac6e Getting the unlit to work from the pipeline, and found the isLinear for texture bug! 2016-05-06 18:36:55 -07:00
Zach Pomerantz
6a6d6dd20f Defer mipmap gen to gpu 2016-05-05 16:34:02 -07:00
samcake
2d573963bb Introducing the unlit material 2016-05-04 18:50:52 -07:00
Brad Hefta-Gaub
bbf358f81d Merge pull request #7796 from samcake/blue 
Improve Translucent shapes global lighting with support for the ambient map reflection
 2016-05-03 11:14:06 -07:00
Geenz
85e0620261 Merge branch 'master' of https://github.com/highfidelity/hifi 2016-04-30 15:40:28 -04:00
samcake
257c8c94c3 clean up the lighting function and put the global specular lighting in a separate function 2016-04-29 10:58:55 -07:00
Andrew Meadows
93f4bc759d Merge pull request #7743 from samcake/color 
group several separate glUniform parameters into a single Uniform Buffer
 2016-04-27 10:02:56 -07:00
samcake
91bed86b32 ANd one more warning 2016-04-25 19:04:02 -07:00
samcake
8f2435daf0 No more warnings ? 2016-04-25 18:39:37 -07:00
samcake
e8691c2f20 Fixing comments, code style and constnats 2016-04-25 18:15:52 -07:00
samcake
0e13b1623b Adding support for Equirectangular skymaps 2016-04-25 15:55:12 -07:00
Geenz
ba5fa70b83 Convert sRGB values for materials. 2016-04-25 13:31:50 -04:00
samcake
f587398ca3 Adding support for plate carree 2016-04-22 18:00:22 -07:00
samcake
5a67411d75 Removing separate uniforms for the texcoord transforms and lightmap params, shader still failing 2016-04-21 18:35:37 -07:00
Brad Davis
3a969eed47 Manually generate image mip levels when loading textures 2016-04-17 10:22:24 -07:00
samcake
fc29397d91 Clening up from review comments 2016-04-15 10:10:04 -07:00
samcake
30d0bfcfd3 FIxing the bump map loading which got broken in the past PR, fixed a double call to the glTexSUbIMage function and fixed a texel.Format 2016-04-15 00:41:37 -07:00
samcake
a9fefcc802 Trying ti debug the bad normal maps 2016-04-14 18:16:14 -07:00
samcake
4374bd26ae Disabling COmpression 2016-04-08 01:37:27 -07:00
samcake
76dd740578 Cleaning up to test before merge, not solved the stuttering happening when using compressed textures. cleaned up a bit of the TextureMap doanload callbacks 2016-04-07 20:05:05 -07:00
samcake
a6bac7ad92 Experimenting with a hidden gltexture object while beeing transfered 2016-04-06 18:30:18 -07:00
samcake
16174df0f3 POlishing the size evaluation and trying to debug the compression scheme 2016-04-06 16:33:45 -07:00
samcake
f3e6c490a4 merging with master, moving the TexelFOrmat function to a cpp 2016-04-04 12:03:37 -07:00
Triplelexx
a4775983a2 Merge branch 'master' into 20769 
# Conflicts:
# interface/src/Application.cpp

conflicting line 2528 wheelEvent is now const
 2016-04-04 19:19:55 +01:00
Lexx
0b313afd74 Rename Skybox.slv to skybox.slv 2016-04-04 00:32:20 +01:00
Lexx
bc0ea31534 Rename Skybox.slf to skybox.slf 2016-04-04 00:32:05 +01:00
Triplelexx
11af0a421b Merge branch 'master' into 20769 2016-04-03 22:57:55 +01:00
samcake
be38de3239 Cleaning up the TextureMap loaders and cleaning for pr 2016-04-01 17:16:22 -07:00
Zach Pomerantz
0e9b783ca3 Release skybox texs when not rendering 2016-04-01 14:46:50 -07:00
samcake
1ca87fa069 Refactoring a bit the texture loaders to factorize work 2016-04-01 11:44:57 -07:00
samcake
9d1f91fa19 First pass at using compressed format when uploading textures 2016-03-31 19:27:35 -07:00
Anthony J. Thibault
940f3e636d Merge branch 'master' into tony/animated-culling 2016-03-28 19:58:38 -07:00
Anthony J. Thibault
e77cf54483 Geometry.cpp: rename method 2016-03-28 13:29:28 -07:00
Anthony J. Thibault
b4e70d9101 WIP: checkpoint 
* bug fix in AABox::operator+=
* added AABox::emiggen
* Avatar now has a default bound for it's skinned mesh.
* WIP: AABox tests;  NEED MORE
* Model: split collision and model mesh render items.
  Because ModelMeshRenderItems need special handling to update bounds for animated joints.
* Model: dynamically update the bound for rigidly bound animated meshes
* Rig: added access to geometryToRigTransform
* RenderableModelEntityItem: try to update bounds for skinned mesh to be the entity dimentions (this doesn't seem to be working)
* Geometry.cpp: removed unused bounds parameter in evalPartBounds
* ModelMeshPartPayload: bounds updating
   * non-animated: use existing _localBound
   * rigid bound mesh: use _localBound transformed by clusterMatrix joint transform
   * fully skinned mesh: use _skinnedMeshBound provided by the application.
 2016-03-25 21:29:20 -07:00
Zach Pomerantz
af55547766 Copy material schema buffers as new ref 2016-03-25 11:46:24 -07:00
Zach Pomerantz
fc8b34f8c7 Move tex alpha detection to cv method 2016-03-24 09:48:33 -07:00
samcake
1e46b0803c fixing repported issues during review 2016-03-23 15:59:57 -07:00