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

1649 commits

Author SHA1 Message Date
Anthony J. Thibault
c2dd00375d Merge branch 'master' into tony/soft-attachments 2015-12-29 13:21:37 -08:00
samcake
50b3610bce Working on the ao 2015-12-24 14:48:01 -08:00
samcake
54e1c7c3a7 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2015-12-24 11:47:32 -08:00
samcake
cf14f9a249 Implementing the SAO effect in progress 2015-12-24 11:47:04 -08:00
Zach Pomerantz
dfa2b8d453 Remove redundant clearColorBuffer from Blit 2015-12-24 10:39:29 -08:00
Zach Pomerantz
687eef37da Move final blit into RenderDeferredTask 
- Also changes color buffer clearing, such that
anything run through Blit will now clear BUFFER_COLOR0  to 0,0,1,0.
- Blit will always be added to RenderDeferredTask, but
will only run if renderArgs._blitFramebuffer is set.
 2015-12-23 18:21:08 -08:00
samcake
dbc4506cee Working on AO 2015-12-23 17:27:20 -08:00
samcake
0668fbc9e4 starting on ao 2015-12-22 18:39:44 -08:00
samcake
f9070ee989 Cleanup cruft in the shaders, glowIntensity and alphaThreshold not needed anymore 2015-12-22 12:41:31 -08:00
Seth Alves
5e4a165b4d Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-22 11:23:09 -08:00
Zach Pomerantz
4df8fa4ac3 Create Render/Scene unique_ptr without C++14 make_unique 2015-12-21 15:39:49 -08:00
Zach Pomerantz
d8022aa5b0 Add back deferred debugging and combine context init 2015-12-21 14:32:06 -08:00
Zach Pomerantz
c6a2f5b20d Nest JS props in RenderScriptingInterface 2015-12-21 14:32:06 -08:00
Seth Alves
76df582a6c Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-21 14:29:32 -08:00
samcake
4f54b85c92 Remove warnings 2015-12-21 12:05:19 -08:00
samcake
ae124ebede Tuning the proedural shader support to work with the current default: gamma corrected emissive 2015-12-21 12:00:30 -08:00
Seth Alves
154bf5978b Merge pull request #6697 from samcake/hdr 
Graphics: Adding gamma correction to color vertex attribute
 2015-12-18 14:11:14 -08:00
Seth Alves
b9a7ed8560 Merge branch 'hdr' of github.com:samcake/hifi into near-grab-via-parenting 2015-12-18 14:02:51 -08:00
samcake
19769ddd8f Merge pull request #6691 from zzmp/refactor/scene-render 
Split JS global Scene into Scene and Render
 2015-12-18 13:57:25 -08:00
samcake
0492bb1c6d Final cleans and tests using R11G11B10 for lighting buffer 2015-12-18 13:50:28 -08:00
Seth Alves
1a534ff645 Merge branch 'hdr' of github.com:samcake/hifi into near-grab-via-parenting 2015-12-18 13:43:33 -08:00
samcake
0482a2a7f7 Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr 2015-12-18 13:20:46 -08:00
samcake
d22811a771 Merge pull request #6698 from zzmp/fix/check-locations-pipeline 
Stop modelMesh render if pipeline is not found
 2015-12-18 13:20:12 -08:00
Zach Pomerantz
2c2b794683 Stop modelMesh render if pipeline is not found 2015-12-18 13:16:05 -08:00
samcake
3014b3bd5b Adding Gamma correction to all the Color coming for the attribute stream if used as color 2015-12-18 12:50:21 -08:00
Zach Pomerantz
674bfa4f37 Replace RenderContext substructs with subclasses 2015-12-18 12:04:21 -08:00
Zach Pomerantz
d057239023 Rename RenderContext::ItemsMeta to ItemsConfig 2015-12-18 11:48:40 -08:00
Zach Pomerantz
cdcb2d565d Use new RenderContext accessors for rendering 2015-12-18 10:34:39 -08:00
Zach Pomerantz
919a4b6728 Split global JS Scene into Render 2015-12-18 10:33:41 -08:00
samcake
157597e783 Merge pull request #6690 from samcake/hdr 
Graphics: Fix the shading equation to respect the fresnel term for the diffuse
 2015-12-18 10:30:36 -08:00
Anthony J. Thibault
6b5b272cd7 Added SoftAttachmentModel class. 
Is a subclass of Model, it overrides the updateClusterMatrices so it will pull
the actual joint matrices from a different rig override.

For the avatar soft attachment system, this override will be the Avatar::_skeletonModel rig.
This will give us the ability for an avatar to "wear" non-rigid attachments, such as clothing.
 2015-12-18 09:52:11 -08:00
samcake
c891bcb8cd FIxing the diffuse contribution bug maybe 2015-12-17 17:44:40 -08:00
samcake
32bb8f020c FIxing the diffuse contribution bug maybe 2015-12-17 17:40:35 -08:00
Atlante45
78b805a19a Fix file shader file lookup on windows 2015-12-17 16:06:55 -08:00
Atlante45
c0a675dd9e Fix msvc warning 2015-12-17 16:02:49 -08:00
Atlante45
f41ca9fc50 More custom debug work 2015-12-17 15:18:23 -08:00
Atlante45
d8a389ff92 First cut at custom pipelines 2015-12-17 15:18:23 -08:00
Atlante45
9d6618c341 Cleanup DebugDeferredBuffer code 2015-12-17 15:18:23 -08:00
samcake
d8a71db929 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-17 10:11:03 -08:00
samcake
1b1365fd40 Exposing the tone curve in the js api 2015-12-16 16:32:53 -08:00
Seth Alves
9e5116bf4f Merge branch 'dejitter-hold-action' of github.com:sethalves/hifi into near-grab-via-parenting 2015-12-16 15:56:31 -08:00
samcake
c0faf978f8 Introducing a setting for the tone curve 2015-12-16 15:21:09 -08:00
AlessandroSigna
08f7591787 Fix misspelling 2015-12-16 10:02:47 -08:00
samcake
7c8f12b9c4 Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr 2015-12-16 09:55:37 -08:00
samcake
b4b541178d Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-16 09:42:06 -08:00
Seth Alves
0003c607ea Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-15 18:46:21 -08:00
samcake
a60ef4fb5a Finalize the names 2015-12-15 18:32:30 -08:00
samcake
c2feec16de Cleaning the code 2015-12-15 18:24:16 -08:00
samcake
d2ebaef69e Adding a simple manual exposure control to configure the tonemapping and expose it to js. Add a convenient way to access the Job._concept._data with template 2015-12-15 18:18:42 -08:00
samcake
2bbd5d86b8 cleaning indentation 2015-12-15 09:46:18 -08:00
samcake
e70ab472af Merging with upstream master/graphics 2015-12-14 18:38:29 -08:00
samcake
84d1e3b123 Merged with upstream master 2015-12-14 18:30:24 -08:00
samcake
a50b14dfae Merging with upstream graphics 2015-12-14 18:18:39 -08:00
samcake
3554f54e17 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-14 17:38:56 -08:00
Anthony J. Thibault
3f0cdb3c02 Merge branch 'master' into tony/js-avatar-default-pose 2015-12-14 11:19:24 -08:00
Seth Alves
008065ba38 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-14 09:15:56 -08:00
Seth Alves
1492fd6090 merge from upstream 2015-12-12 12:37:57 -08:00
samcake
b3acde4462 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-11 17:49:00 -08:00
Atlante45
146581714a More warning fixes 2015-12-11 16:17:41 -08:00
Atlante45
f308ef7aa9 Move QOpenGL wrappers to the gl lib 2015-12-11 16:17:17 -08:00
Atlante45
d3224bfde3 More warning fixes 2015-12-11 16:03:44 -08:00
Atlante45
ce51350b65 Fix warnings on windows 64bit 2015-12-11 15:42:15 -08:00
Seth Alves
6c033d9603 call locationChanged when receiving changing avatar joints over the network. RenderableModelEntityItem uses locationChanged to relay updates to _model 2015-12-11 11:35:42 -08:00
samcake
94b6ca4450 FIxing the bad lambda capture for local variables 2015-12-11 10:48:58 -08:00
samcake
5d395ae54f Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-10 18:06:43 -08:00
samcake
c74bbda663 Nothing fancy 2015-12-10 18:02:02 -08:00
samcake
20f3d6abe1 REmoving comments 2015-12-10 16:52:03 -08:00
samcake
dffb83a488 Potentially working correctly 2015-12-10 16:31:00 -08:00
samcake
5805cc8f2b Adding the AABox transform features (from Extents) adn introducing a simple MeshPartPayload to render simple geometry 2015-12-10 14:59:04 -08:00
Anthony J. Thibault
652ce5501f Expose Avatar default pose to JavaScript 
New JavaScript API to get the avatar's default pose.

   MyAvatar.getDefaultJointRotation(index);
   MyAvatar.getDefaultJointTranslation(index);

See `examples/tPose.js` for example usage
 2015-12-10 13:57:31 -08:00
samcake
f9269523a1 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-12-09 16:58:56 -08:00
samcake
9eb40bcd65 Trying to redner the collision geometry correctly but still an issue with the bounding box i get 2015-12-09 16:58:14 -08:00
samcake
1adf2cc8ba Repesenting the collision meshes of a Model correctly 2015-12-08 16:45:12 -08:00
Brad Hefta-Gaub
1356fb15aa Merge pull request #6591 from jherico/zaan 
Add sphere and cube triangle counts to displayed stats
 2015-12-08 13:27:37 -08:00
samcake
ede375a889 Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr 2015-12-08 12:28:16 -08:00
Bradley Austin Davis
011a43d5f2 Add sphere and cube triangle counts to displayed stats 2015-12-08 11:08:22 -08:00
samcake
83279489f3 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-08 09:46:29 -08:00
Seth Alves
dffa37c0e7 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-08 09:44:50 -08:00
Sam Cake
9faec326da CHanging the lighting BUffer format and adding tone mapping 2015-12-08 08:34:42 -08:00
samcake
b24af06589 Fixing the display of the collision hull mesh 2015-12-07 18:26:55 -08:00
samcake
d12fdb9726 Merge pull request #6584 from birarda/pref-no-auto 
fix for avatar URL text editing, assert in Model.cpp
 2015-12-07 18:11:49 -08:00
Stephen Birarda
6dbff93bbd fix assert on model URL change from _renderItemsSet 2015-12-07 16:24:26 -08:00
Seth Alves
f99812a903 adjust method names to fit convention 2015-12-07 14:31:08 -08:00
samcake
9ddc3c27bf compilation errors fixed 2015-12-07 13:25:55 -08:00
samcake
5d207d0c9c INtroducing the tonemapping job in its separate file and clean DeferredLightingEffect 2015-12-07 13:19:43 -08:00
Atlante45
f8ee377f01 Fix QOpenGL warning 2015-12-07 08:37:07 -08:00
Sam Cake
3595d0d719 less commented stuff 2015-12-07 01:15:10 -08:00
Sam Cake
01d48b29aa cleaning code and removing cruft 2015-12-07 01:03:14 -08:00
Sam Cake
a018c51945 Drawing background first in the Lighting buffer then lighting passes with stencil test 2015-12-06 23:51:29 -08:00
Sam Cake
dc4b6909bc Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr 2015-12-06 18:58:11 -08:00
Seth Alves
a948ae5f19 children of avatar joints might be right, now 2015-12-06 10:48:00 -08:00
Atlante45
acb9e2774e Basic implementation of debug zone resizing 2015-12-04 21:01:53 -08:00
Atlante45
41af377878 More g-buffer debugging options 2015-12-04 21:01:53 -08:00
samcake
dfd26bebae Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr 2015-12-04 17:53:37 -08:00
samcake
b28e3d0045 Merging MAster and Graphics 2015-12-04 17:51:30 -08:00
Atlante45
b45b1cc513 More work on live g-buffer debug 2015-12-04 17:43:00 -08:00
samcake
119cc733b5 Merging with master 2015-12-04 17:17:33 -08:00
samcake
cfd7373585 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-04 16:52:50 -08:00
samcake
ef7ddce2b6 Trying to fix the problem of the background not showing correctly 2015-12-04 16:52:14 -08:00
samcake
a12188877a Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr 2015-12-04 11:50:26 -08:00
samcake
3c18664c57 Cleaning all the deferred buffers in the Prepare call 2015-12-04 11:47:57 -08:00
Brad Hefta-Gaub
15c4dbfb11 Merge pull request #6554 from Atlante45/warnings 
Last of the OpenGL warnings on OS X
 2015-12-04 11:24:28 -08:00
Brad Hefta-Gaub
d07629489c Merge pull request #6543 from Atlante45/pointer 
gpu::Shader::create* return shared_ptr
 2015-12-04 11:17:02 -08:00
Atlante45
ba2e7e1f29 Debug diffuse buffer 2015-12-04 11:15:06 -08:00
Atlante45
c27944ae28 Simple normal map debug 2015-12-04 10:44:23 -08:00
Atlante45
baf93e8a08 Add basic DebugDeferredBuffer job 2015-12-04 10:44:23 -08:00
Atlante45
528a17422d Last of the OpenGL warnings on OS X 2015-12-04 10:33:10 -08:00
Brad Hefta-Gaub
d9a1563396 Merge pull request #6152 from sethalves/parents 
Parents
 2015-12-04 10:26:57 -08:00
Atlante45
07387ab8c0 Fix most OpenGL warnings 2015-12-04 10:01:43 -08:00
samcake
d593b824e9 Introducing a true Primary Framebuffer and a different Deferred Framebuffer 2015-12-03 17:26:54 -08:00
samcake
72d393905b Introducing the Lighting Buffer where all the lighting is beeing accumulated, apply a manual gamma correction when copying back into the main color buffer 2015-12-03 16:03:32 -08:00
Atlante45
3da80f5861 gpu::Shader::create* return shared_ptr 2015-12-03 14:56:07 -08:00
Seth Alves
4e74c98ae7 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-03 11:00:13 -08:00
samcake
a5475ed14d Early try fixing the lighting 2015-12-03 10:41:32 -08:00
Anthony J. Thibault
9c0b4bc2a2 Fix for model entities with non-uniform scaled mesh 
Logic which extracted rotations from a non-uniformly scaled matrices was sometimes incorrect.

This should fix the roads in Qbit as well as the blocks in toybox.
 2015-12-02 14:09:47 -08:00
Seth Alves
b7ebe5b92b merge from upstream 2015-11-30 16:59:52 -08:00
Seth Alves
5c327edd5a keep AvatarHashMap::findAvatar from creating bogus avatar entries. remove some more stray consts 2015-11-30 14:08:07 -08:00
Seth Alves
cf39cac7fc attempt to make SpatiallyNestable data access thread-safe 2015-11-29 12:50:33 -08:00
Anthony J. Thibault
e2f031e77f AnimDebugDraw Removed unused drawing code. 2015-11-21 10:57:39 -08:00
Anthony J. Thibault
fe683edb66 Avatar Debug Draw Default Pose now works 2015-11-21 10:53:24 -08:00
Seth Alves
f013f95e9b merge from upstream 2015-11-21 08:43:00 -08:00
Anthony J. Thibault
2f37335d77 Warning fixes 2015-11-20 14:50:42 -08:00
Anthony J. Thibault
a77ea8da43 Removed JointStates! You won't be missed. 2015-11-20 14:15:37 -08:00
Anthony J. Thibault
982e2c06a9 Rig: Switched over to use AnimPoses instead of JointStates 
* fixed debug rendering
* improved jointState/animPose diff detection code.
 2015-11-19 12:14:04 -08:00
Anthony J. Thibault
721da29432 WIP checkpoint 
* No longer normalizing scale in AnimSkeleton and AnimClip
  This means graph is animating in 'geometry' coordinates
  before unit scale is even applied.  This is necessary to
  properly work with both Avatar based models and ModelEntity
  based models

Many things are broken.
  * debug rendering (translations are x100)
  * IK hand targets
  * follow cam
  * I did not even dare to try HMD mode
 2015-11-18 18:47:33 -08:00
Anthony J. Thibault
55adedcec8 Merge branch 'master' into tony/remove-joint-states 2015-11-16 11:22:44 -08:00
Seth Alves
89ed3751ae Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug 2015-11-14 14:00:20 -08:00
Stephen Birarda
429a4d51d5 Merge pull request #6375 from Atlante45/resize 
Fix models resizing
 2015-11-13 10:23:05 -08:00
Seth Alves
3519dd248b Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug 2015-11-12 09:53:11 -08:00
Brad Hefta-Gaub
eefe26d96a fix crash in Model::deleteGeometry when _rig is not initialized 2015-11-12 09:24:49 -08:00
Atlante45
954391ae3e Fix models resizing 
When models are MUCH bigger one one axis than the others
and we modify the scale only of one of those small axis,
it wouldn't propagate because the change was relatively
too small conpared to the size of the model
 2015-11-11 18:33:26 -08:00
Anthony J. Thibault
e698d3c1e8 Isolate JointStates within the Rig class 
Except for SkeletalModel::computeBounds() JointStates are now completly
encapsulated by the Rig.  Now we can start using AnimPoses instead and
in parallel with the JointState implementation. Then we can assert that
they are identical, before removing JointStates.

This check in has many comments with the AJT tag.
Each one of these cases will need to be revisitied and fixed.
In particular // AJT: LEGACY will be used to enclose all code
in the Rig which manipulates the _jointState QVector.
 2015-11-11 18:23:58 -08:00
Anthony J. Thibault
11440f92f4 Removed rig animations 
* Deleted AnimationHandle class
* Removed enableAnimGraph and anableRigAnimations from Menu.
* Removed *some* references to old IK system.
  But it is still used when computing collision bounding volumes
 2015-11-11 15:32:57 -08:00
Seth Alves
66387c4530 use icons to show network and physics status 2015-11-10 17:02:57 -08:00
Seth Alves
d043011a11 Merge branch 'render-debug-fixup' of github.com:sethalves/hifi into rework-visual-physics-debug 2015-11-10 10:16:02 -08:00
Seth Alves
8e466190e0 working toward display icons for debug/status display 2015-11-10 10:15:58 -08:00
Seth Alves
b9ca509f07 Merge branch 'master' of github.com:highfidelity/hifi into render-debug-fixup 2015-11-10 09:50:12 -08:00
Seth Alves
d535109caf attempt to fix render-collision hull feature 2015-11-10 09:49:31 -08:00
Brad Hefta-Gaub
021a6e689d added some asserts to test future mistakes that would cause render item leaks 2015-11-09 17:09:17 -08:00
Brad Hefta-Gaub
e47b049200 fix render item leak on Model::reset() 2015-11-09 16:41:40 -08:00
Seth Alves
f3d26e163d turn _drawItemStatus into a bitfield, split out bounding boxes and network/physics-sim-ownership. hook Display-Simulation-Ownership menu item to this system 2015-11-07 07:19:27 -08:00
Seth Alves
3ac0fef1ea merge from upstream 2015-11-01 15:22:57 -08:00
Howard Stearns
8c395209e8 Fix Developer->Avatar->Draw Mesh 
MyAvatar::setEnableMeshVisible -> Model::setVisibleInScene sets a flag that no one was looking at any more.
 2015-10-28 21:23:35 -07:00
Brad Davis
5cbb2562cd Move GL utilities out to their own library 2015-10-27 15:53:42 -07:00
Seth Alves
7f6ac0207d Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-10-22 19:35:27 -07:00
samcake
b2461a8e4e Merge branch 'master' of https://github.com/highfidelity/hifi into color 2015-10-22 12:06:20 -07:00
samcake
a44ac4cbfd Fiing the dark colors for surfaces without texture 2015-10-22 11:40:56 -07:00
Stephen Birarda
a8d591166e Merge branch 'master' of https://github.com/highfidelity/hifi into qt-5.5 2015-10-22 11:13:28 -07:00
Stephen Birarda
695f0a75b0 fixes for builds with qt 5.5 2015-10-22 11:12:51 -07:00
Seth Alves
6cb195b335 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-10-20 15:53:56 -07:00
Seth Alves
bc99ef778c change how render engine is told about model position changes 2015-10-20 12:04:29 -07:00
Andrew Meadows
7fa069cf30 fix line endings grumble gruble 2015-10-20 09:38:25 -07:00
Andrew Meadows
341bc3666f Merge pull request #6093 from sethalves/hold-action-changes 
Hold action changes
 2015-10-20 09:19:48 -07:00
Brad Hefta-Gaub
110adc5c22 fix model LOD behavior 2015-10-19 15:21:25 -07:00
Brad Davis
282cdadf63 Fixing line endings 2015-10-18 22:55:14 -07:00
Seth Alves
4903db45b1 give other avatars an anim-skeleton 2015-10-15 14:21:06 -07:00
Seth Alves
a70ba4cd5a add some accessors 2015-10-15 11:42:53 -07:00
samcake
3897716ff5 Simplifying the DrawOpaqueStencil Pixel shader 2015-10-08 17:49:55 -07:00
samcake
bad5ea7d53 grouping the depth and stencil buffer into a single buffer 2015-10-08 16:47:33 -07:00
samcake
c7049bad39 Backing up on any changes regarding shading, focus on the rearr view mirror and stencil bug 2015-10-08 09:32:05 -07:00
samcake
a2ca1c033d FIxing the rear view mirror issue with background and fooling around with Lighting equations 2015-10-07 19:04:03 -07:00
samcake
0a351a8a0c FIx the problem with cauterizedClusterMatrices in the case rear view mirror is used. Clean the way to define the depth stencil format for texture 2015-10-07 14:26:33 -07:00
Brad Hefta-Gaub
b06d17d45a Merge pull request #6000 from samcake/hobbes 
Migrate FBXReader to use model::Mesh and clean Model Part rendering
 2015-10-07 01:31:21 -07:00
Brad Davis
eff5a4c395 Picking fixes in the HMD 2015-10-06 22:56:48 -07:00
samcake
83a0091e47 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-06 22:03:07 -07:00
samcake
c75c31ddc8 Fixing the index Offset issue with instanced shapes from Geometry cache 2015-10-06 18:04:08 -07:00
Atlante45
9c7a480fda Remove shadowMatrices/Distances 2015-10-06 13:56:23 -07:00
Atlante45
765608d0ff More unused 2015-10-06 13:56:21 -07:00
samcake
2b5742b277 Some code got overwritten when merging to my office mahcine this morning, that i know got back... 2015-10-06 11:13:35 -07:00
samcake
cf3828629e Fix build on mac and linux 2015-10-06 11:00:21 -07:00
samcake
c92a6d58ab Dispatch classes in their properly named files to appease the coding standard gods 2015-10-06 09:46:32 -07:00
samcake
59afbf1a04 Remove the renderPart call from model.cpp and put the code path in the MeshPartPayload::render() 2015-10-06 01:15:53 -07:00
samcake
fc7f0c77a5 Rename ModelRenderPayload files to ModelRenderItem 2015-10-06 00:20:51 -07:00
samcake
4270b83c0f Uniform buffer for skeleton joint bind pose 2015-10-05 23:33:58 -07:00
samcake
12fedb6ff0 Move skinning shader features in its own slh and get ready for moving cluster matrices to uniform buffer 2015-10-05 18:31:05 -07:00
samcake
9e393ced46 MOving rednering code of Model into ModelRenderPayload.h/cpp 2015-10-05 09:17:16 -07:00
samcake
fd232b7d32 ONe more file to deal with the Model rendering 2015-10-04 22:27:48 -07:00
samcake
1799322c67 Fix typos introduce in previous commit about the Quad to triangle indexing and remove dead code in model.cpp 2015-10-04 18:46:35 -07:00
samcake
55f5ab3732 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-04 18:31:56 -07:00
samcake
48416262a1 Migrated the FBXReader mesh code to use excusively the Model::mesh and use them directly for rendering in the ModelPartPayload, fixed a bug in the indexBUffer offset value used in drawIndexed and drawIndexedInstanced 2015-10-04 18:31:19 -07:00
samcake
edaa8f998a Migrating to the new mesh for rendering and having problems with multi part mesh 2015-10-02 18:12:16 -07:00
Howard Stearns
f6665a4ac6 Merge pull request #5839 from sethalves/transmit-joint-translation 
WARNING protocol change: Transmit joint translation
 2015-10-02 13:37:56 -07:00
samcake
a22ee03732 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-02 12:25:09 -07:00
samcake
edb485cb0f working on getting the Model payload to use model::Mesh 2015-10-02 12:24:41 -07:00
Anthony J. Thibault
fc7b6dee84 Merge branch 'master' into transmit-joint-translation 2015-10-02 11:40:33 -07:00
Brad Hefta-Gaub
4c556dd43a Merge pull request #5962 from samcake/calvin 
Rendering the background elements after opaque and only work on the far pixels
 2015-10-02 11:38:45 -07:00
Brad Hefta-Gaub
c6c430ca76 Merge pull request #5977 from jherico/marge 
Fixing 2D overlay mouse interaction
 2015-10-02 11:11:04 -07:00
Brad Davis
aa8979570c Working on 2D overlay mouse interaction 2015-10-02 00:35:37 -07:00
samcake
b8ea83099a Debuggging 2015-10-01 21:13:22 -07:00
samcake
4478ca79ca Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-01 19:55:14 -07:00
samcake
71ad6195f2 Merge branch 'master' of https://github.com/highfidelity/hifi into calvin 2015-10-01 19:25:25 -07:00
samcake
690620d74d Cleaning code 2015-10-01 19:23:32 -07:00
samcake
3490e08521 Little improvments on the performance side to get the Stencil pass and the masking of the background under reasonable performances 2015-10-01 18:42:09 -07:00
Anthony J. Thibault
fa864d29f9 Merge branch 'master' into transmit-joint-translation 2015-10-01 16:55:24 -07:00
Andrew Meadows
09ac01a5e7 remove cruft from old verlet avatar simulation 2015-10-01 13:44:50 -07:00
samcake
0398f9429e fix the coo/texel blender mode for the case when color is black and the stereo issue 2015-09-30 18:39:13 -07:00
samcake
75e858cd13 Putting together the stencil buffer for opaque vs background and using it for the backgroud render items 2015-09-30 15:54:03 -07:00
Sam Gateau
e78f1521ab getting the stencil buffer in place 2015-09-30 09:24:36 -07:00
samcake
dc3c9b48ea MOving forward on the background beeing drawn last 2015-09-29 18:28:20 -07:00
Brad Hefta-Gaub
04115052b3 Merge pull request #5938 from samcake/calvin 
Fixing the lighting view matrix for stereo again
 2015-09-29 15:08:41 -07:00