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
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
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
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
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
