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
Brad Davis
6f5f6450df
Cleanup CMake files
2015-10-11 00:01:03 -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
Brad Hefta-Gaub
255689e24f
add GLEW_STATIC to fix link warnings
2015-10-02 15:08:04 -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
samcake
1bd07b58c3
Fixing the lighting view matrix for stereo again
2015-09-29 14:40:37 -07:00
Brad Hefta-Gaub
00c32fc7cd
Merge pull request #5924 from jherico/marge
...
Support for accessing IPD in scripts
2015-09-29 14:24:53 -07:00
Seth Alves
d0a1e206ca
Merge branch 'master' of github.com:highfidelity/hifi into transmit-joint-translation
2015-09-29 13:55:13 -07:00
samcake
840f92bd06
Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes
2015-09-29 10:54:09 -07:00
samcake
a9f6c93a2c
merging
2015-09-29 10:53:56 -07:00
samcake
202d2944ab
Merge branch 'master' of https://github.com/highfidelity/hifi into calvin
2015-09-28 17:24:59 -07:00
Brad Davis
7b1c04512a
Adding support for accessing IPD in scripts
2015-09-28 16:24:38 -07:00
samcake
95ea874d43
Minor fixes to the way the specular color is interpreted
2015-09-28 12:43:15 -07:00
Brad Hefta-Gaub
ce3da099f6
normalize the surface normal from the triangle, coding standard fix, update example
2015-09-28 08:30:49 -07:00
Brad Hefta-Gaub
430cbcca7e
first cut at adding surface normals to ray intersection
2015-09-27 21:57:50 -07:00
Seth Alves
50dd8eba45
Relay joint translations across network. Apply animation's root-joint translation to avatar.
2015-09-26 11:40:39 -07:00
Brad Hefta-Gaub
85b2322acc
more work on batch optimzation
2015-09-24 17:11:14 -07:00
Brad Hefta-Gaub
5e82b9c433
more warning fixes
2015-09-24 08:26:56 -07:00
samcake
46e9c463fc
Merge pull request #5885 from ZappoMan/batchOptimizations
...
Batch optimizations
2015-09-23 19:30:51 -07:00
Brad Hefta-Gaub
5a80c4d0e7
Merge pull request #5886 from samcake/calvin
...
Expose multi Draw Indirect in Batch (Hijack Austin's work...)
2015-09-23 19:13:28 -07:00
Brad Hefta-Gaub
9a0e5b9870
address Sam's concerns
2015-09-23 17:37:48 -07:00
samcake
8bdfc853d9
Merge branch 'orange' of https://github.com/samcake/hifi into hobbes
2015-09-23 17:31:04 -07:00
ZappoMan
65a079cb53
fix mac build
2015-09-23 16:48:34 -07:00
Brad Hefta-Gaub
ef25876c9a
implement vector caching for gpu::Batch
2015-09-23 14:46:47 -07:00
samcake
8735aa8003
Merging Austin pr that adds the multi draw indirect and also fix the seprate vertex format feature for windows and linux
2015-09-23 12:19:17 -07:00
Anthony J. Thibault
90a551214e
Fix for AnimDebugDraw crash on shutdown.
2015-09-23 11:09:43 -07:00
Anthony J. Thibault
a9848cd157
Merge branch 'master' into tony/lean-threshold
2015-09-23 10:54:12 -07:00
samcake
7f8450f77b
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-09-23 10:30:51 -07:00
samcake
d7d332acd4
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
...
t :wq
2015-09-23 09:51:31 -07:00
Brad Hefta-Gaub
387c4fbd92
fix bad oglplus pragma warnings
2015-09-22 21:52:16 -07:00
Brad Hefta-Gaub
17a3fd159a
apparently unix doesn't like the generic type version of sqrt()
2015-09-22 21:43:09 -07:00
Brad Hefta-Gaub
02e1de3ba3
more warnings fixes
2015-09-22 21:35:13 -07:00
Brad Hefta-Gaub
cd9aad4f41
more warnings fixes
2015-09-22 21:28:45 -07:00
Brad Hefta-Gaub
9436d2922f
more warnings fixes
2015-09-22 21:18:04 -07:00
Brad Hefta-Gaub
5b00783f18
more warnings fixes
2015-09-22 20:54:36 -07:00
Brad Hefta-Gaub
8d8035a418
Merge branch 'master' of https://github.com/highfidelity/hifi into fixWarning
...
Conflicts:
libraries/render-utils/src/Model.cpp
libraries/render-utils/src/Model.h
2015-09-22 20:54:25 -07:00
Brad Hefta-Gaub
52842cb287
more warnings fixes
2015-09-22 20:34:40 -07:00
Anthony J. Thibault
d04f4d4b2b
Added shared DebugDraw singleton.
2015-09-22 19:57:23 -07:00
samcake
518f5fe17c
Starting to clean the mesh part of the RenderItem....
2015-09-22 18:21:36 -07:00
Brad Hefta-Gaub
6f7e13b3c1
more warning fixes
2015-09-22 17:26:45 -07:00
Andrew Meadows
2edffaf91a
remove unused variables
2015-09-22 17:20:13 -07:00
Andrew Meadows
11fee94459
remove warning about signed/unsigned comparison
2015-09-22 17:19:47 -07:00
Brad Hefta-Gaub
efda121619
fix a bunch of warnings on windows
2015-09-22 16:40:17 -07:00
Brad Davis
deaa4a747b
Batch side implementation of multi-draw indirect
2015-09-22 15:56:58 -07:00
Brad Hefta-Gaub
5bcce50b98
Merge pull request #5846 from bob-long/master
...
Display the face blend coefficients and update the value in real time.
2015-09-22 14:56:56 -07:00
samcake
80e5581639
fixing review comments
2015-09-21 22:51:14 -07:00
samcake
4513b64b00
fixing review comments
2015-09-21 22:42:24 -07:00
BOB LONG
a23a90bf5f
Code simplification
...
Simplify the code a bit as suggested:
1) Use unsigned int instead of signed int, so we can avoid checking the
negative case
2) Merge two lines into a single line so we can inline the
implementation
Correct the js sample file header.
testing done:
- Build locally
- Pass -1 as index from js and the code still can correctly handle the
input.
2015-09-21 19:11:13 -07:00
samcake
91b9940fe9
Merging and a fix for the diffuse map floating around
2015-09-21 18:09:25 -07:00
samcake
910038cf82
Merging
2015-09-21 17:47:23 -07:00
samcake
21f53f1bbd
debugging the lighting issue on the craps table
2015-09-21 16:57:55 -07:00
Brad Hefta-Gaub
ea141aae92
Merge pull request #5865 from jherico/bart
...
Instancing work, second pass
2015-09-21 16:51:08 -07:00
Bradley Austin Davis
0401672c82
Fixing lighting again
2015-09-21 16:24:55 -07:00
Bradley Austin Davis
b3aeaba5f4
CR feedback
2015-09-21 15:44:47 -07:00
Bradley Austin Davis
0c0af812c2
CR comments
2015-09-21 14:16:56 -07:00
Bradley Austin Davis
e12e4ece34
Fixing lighting and atmosphere
2015-09-21 13:51:08 -07:00
Bradley Austin Davis
e024d23366
Instancing work, second pass
2015-09-21 13:27:02 -07:00
samcake
d3b1bcb86d
Redistributing the files to create the model-networking lib and separate that from the redner-utils
2015-09-21 13:21:35 -07:00
Brad Hefta-Gaub
dc9c774eb5
merge model part quads and triangles together to reduce the number of draw calls
2015-09-21 13:09:43 -07:00
samcake
6a714f405c
Integrate the PR from ALessandro through a different Texture Type and a different TextureLoader to transform a bump map into a normal map
2015-09-21 00:53:48 -07:00
samcake
3614812681
MOving the actual creation of the texture and the pixel manipulation required from TextureCache to TextureSOurce
2015-09-20 23:31:59 -07:00
samcake
c9cb768945
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-09-19 09:00:19 -07:00
samcake
9a8dc6ca5d
Fix compilation issues on mac
2015-09-19 08:59:47 -07:00
samcake
8941741508
Migrating the rendering code to the Material Maps and adding the simplae variables to the the TextutreMap
2015-09-18 18:47:18 -07:00
Brad Davis
8a703d0363
Instanced rendering, first pass
2015-09-18 16:29:29 -07:00
samcake
64cf8590eb
fix typos
2015-09-18 11:51:58 -07:00
samcake
5f5cc3dbaf
fix typos
2015-09-18 11:51:28 -07:00
samcake
767407af9c
Merging and cleaning shaders
2015-09-18 11:46:44 -07:00
samcake
d4fd2ea4c6
merging
2015-09-18 11:31:53 -07:00
Sam Gateau
d0f7ddd3a6
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-09-18 00:03:19 -07:00
Sam Gateau
b207d97f72
Fix the lighting when the rear view mirror is showing up
2015-09-17 12:28:17 -07:00
Sam Gateau
882ca5d6c0
Fix the lights not rendering roperly
2015-09-16 15:57:35 -07:00
Sam Gateau
d45547aa1a
Merge and update
2015-09-16 13:46:07 -07:00
BOB LONG
efc321bc10
Display face blend coefficients
...
Display the face blend coefficients and update the value in real time.
2015-09-16 00:40:26 -07:00
Brad Davis
f35ffd2ab7
Merge pull request #5814 from samcake/HMDLightingBug
...
Fixing HMD and stereo lighting bug
2015-09-15 18:10:26 -07:00
Sam Gateau
08546fcc08
Merge branch 'master' of https://github.com/highfidelity/hifi into HMDLightingBug
2015-09-15 18:07:26 -07:00
Sam Gateau
80d25a68b6
Bringing back the eyeView per side to the deferred transform stack
2015-09-15 18:05:15 -07:00
Sam Gateau
5410bc0945
FIx the review comment and trying to fix the simple stereo display plugin projection and eye view matrix
2015-09-15 17:48:55 -07:00
Sam Gateau
f00e3829f1
Cleaning for PR
2015-09-15 16:54:04 -07:00
Sam Gateau
7b8e11e01c
Debugging, looking good, no ready for final lighting
2015-09-15 15:22:45 -07:00
Sam Gateau
dc8756e465
Need to pull master, just updated all the deferred shaders to use scribe func declare blocks to avoid long shaders... didn;t validate the current clip to eye position evaluation
2015-09-15 14:40:23 -07:00
Sam Gateau
400f90aea4
Introducing a stereo loop that should do the right thing but doesn't yet
2015-09-15 08:34:46 -07:00
Brad Davis
f4818c17cf
Fix avatar and other model animations
2015-09-15 08:04:17 -07:00
Brad Davis
3f688f92d3
Don't do an O(N^2) operation on cluster matrices
2015-09-15 08:04:17 -07:00
Brad Hefta-Gaub
70fcdbf2fd
Revert "Fix over-calculation of cluster matrices"
2015-09-14 21:20:11 -07:00
Sam Gateau
45dc5be53d
DeferredTransform buffer working for the deferred rendering in mono
2015-09-14 17:48:15 -07:00
Brad Davis
35e4440c4f
Don't do an O(N^2) operation on cluster matrices
2015-09-14 16:09:13 -07:00
Sam Gateau
00688172dd
work in progress, gathering th eindvidual parameters of the deferred pass into a single UBO that is bound once for all the deferred lighting passes
2015-09-14 15:49:05 -07:00
Sam Gateau
3690d5a4c2
Merge branch 'master' of https://github.com/highfidelity/hifi into HMDLightingBug
2015-09-14 12:28:59 -07:00
Sam Gateau
6c63dc0444
work in progress
2015-09-14 12:28:33 -07:00
Brad Davis
1bb15e28d6
Fixing differing highlights between left and right eyes in stereo modes
2015-09-14 11:24:28 -07:00
Sam Gateau
0fcfacdd72
Merge branch 'master' of https://github.com/highfidelity/hifi into HMDLightingBug
2015-09-14 10:18:42 -07:00
Sam Gateau
3f2609e52a
merging
2015-09-14 09:59:04 -07:00
Sam Gateau
9074d0d6e1
very first version of the TextureStorage working
2015-09-14 09:29:46 -07:00
Seth Alves
49ee251238
quiet compiler
2015-09-12 09:59:25 -07:00
Sam Gateau
cf1f5b8771
Work in progress
2015-09-11 15:25:33 -07:00
Sam Gateau
5cc5609e87
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-09-11 12:05:02 -07:00
Anthony J. Thibault
7996a02bd8
Added head target to AnimGraph IK node.
...
* In HMD mode head orientation and position is set.
* When not in HMD only orientation is set, position should
default to the underlying pose position.
2015-09-11 09:48:48 -07:00
Sam Gateau
c37cdce750
Merging back with master
2015-09-10 17:53:50 -07:00
Howard Stearns
73a5714d66
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-09 10:37:11 -07:00
Seth Alves
e06461ea15
Merge pull request #5724 from hyperlogic/tony/anim-debug-draw-improvements
...
AnimDebugDraw Improvements
2015-09-08 17:07:51 -07:00
Howard Stearns
eb67254e54
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-08 16:54:14 -07:00
Howard Stearns
26f63a44fc
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-08 15:30:22 -07:00
