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
