Ryan Huffman
b22ed34825
Merge pull request #5051 from ZappoMan/team-teaching-optimize-offset
...
TEAM TEACHING - improvements to avatar part clipping
2015-06-05 09:26:45 -07:00
ZappoMan
d60810e221
CR feedback
2015-06-05 09:10:38 -07:00
Clément Brisset
5f16b8752b
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod
...
Conflicts:
libraries/entities-renderer/src/RenderableEntityItem.cpp
libraries/render-utils/src/Model.cpp
2015-06-05 13:28:42 +01:00
Sam Gateau
aa5e6fa1b0
merging
2015-06-05 00:41:29 -07:00
Sam Gateau
3a93409080
Merging the day after the flight back to france, getting all the fixes
2015-06-04 23:02:05 -07:00
ZappoMan
5146e51d9f
improvements to avatar part clipping
2015-06-04 16:44:46 -07:00
Ryan Huffman
cafc5b7a7c
Merge pull request #5049 from ZappoMan/team-teaching-optimize-offset
...
TEAM TEACHING - avatar changing model URLs
2015-06-04 14:29:44 -07:00
Brad Hefta-Gaub
5e6771d91a
Merge pull request #5048 from huffman/entity-visible
...
Team Teaching - Update entity payload items to not render when entity.visible == false
2015-06-04 14:12:49 -07:00
ZappoMan
56ac987c9b
handle url reloading at the model level, this addresses avatars changing their models
2015-06-04 13:40:43 -07:00
Ryan Huffman
a62b55fcb2
Update entity payload items to correctly hide when not visible
2015-06-04 13:25:40 -07:00
ZappoMan
3593afea3b
optimize part offset calculation
2015-06-04 11:37:02 -07:00
Atlante45
94ba84a84c
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod
2015-06-04 18:48:15 +02:00
Atlante45
93b44e6846
Collect stats on translucent/opaque mesh parts
2015-06-04 18:46:47 +02:00
Brad Hefta-Gaub
50f44c801a
Merge pull request #5045 from Atlante45/fix_world_box
...
Team Teaching - Temporary fix for models index offset
2015-06-04 09:16:31 -07:00
Atlante45
8e21d9c14b
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod
2015-06-04 18:11:17 +02:00
Atlante45
31d257db09
Temporary fix for models index offset
2015-06-04 17:58:44 +02:00
ZappoMan
c4756f4816
remove dead code
2015-06-04 08:49:26 -07:00
Atlante45
a4340b17e9
Remove deprecated render stats
2015-06-04 14:47:04 +02:00
Sam Gateau
fabe8f1a7a
Fixing the skinned mesh rendering issue
2015-06-03 23:18:24 -07:00
Sam Gateau
dfa8cb5c80
Fixing the skinned mesh rendering issue
2015-06-03 23:11:14 -07:00
ZappoMan
54c4cb829a
fixed the shrunken avatar part bug
2015-06-03 21:49:48 -07:00
ZappoMan
c6fb22b915
make sure all entities are rendering in pipeline part 1
2015-06-03 17:16:45 -07:00
ZappoMan
7fde574a2a
make model overlays acutally use sub mesh payload items
2015-06-03 16:33:58 -07:00
Atlante45
9df1b05184
Introduce outsideEngineDetails
2015-06-03 18:08:43 +02:00
Atlante45
bbf1837796
Introduced RenderDetails/Stats don't pull details
...
- Regrouped everything stat in a struct
- Details are set into the stats
2015-06-03 16:14:23 +02:00
ZappoMan
9e7f60e6a3
add more guards against out of bounds
2015-06-02 22:17:39 -07:00
ZappoMan
a7feca0727
more work on making avatar models (face included) use render payloads
2015-06-02 22:10:00 -07:00
ZappoMan
647d132d57
store part boxes in model space and translate to world space on request
2015-06-02 21:50:33 -07:00
ZappoMan
c9c434bc8c
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-06-02 21:04:33 -07:00
ZappoMan
adcb62eb18
more hacking and cleanup
2015-06-02 21:03:34 -07:00
Sam Gateau
640071dd35
Avoiding any setVIewTransform in payloadREnder and introducing monitoring values
2015-06-02 18:23:53 -07:00
ZappoMan
4ce27f1483
first cut at rendering avatars as individual model items
2015-06-02 16:54:47 -07:00
Sam Gateau
903837ab4f
exposing some controls on the engine to js for debugging
2015-06-02 15:57:37 -07:00
Sam Gateau
3c7eb4de6d
merging with upstream
2015-06-02 14:48:53 -07:00
Sam Gateau
453fa87654
making sure the proj and view matrix are correctly assigned
2015-06-02 14:31:40 -07:00
Sam Gateau
901717fb2c
trying to fix the issues of model disappearing
2015-06-02 11:52:22 -07:00
Sam Gateau
ef2d8a0dbe
tuesday morning rendering poor performances networking issue
2015-06-02 10:58:56 -07:00
Atlante45
6d234a20ad
Hack for unknown pipelines
2015-06-02 19:07:57 +02:00
Sam Gateau
bd7c22e715
Trying to transfer the rnedering from displaySide to RenderDeferredTask
2015-06-01 17:31:00 -07:00
ZappoMan
1e2d2a2a99
calculate the actual bounding box for the mesh parts
2015-06-01 13:31:42 -07:00
ZappoMan
750d9c0616
poor mans version of mesh part bounds
2015-06-01 12:53:09 -07:00
ZappoMan
ea31fdcc26
hacking on transparency
2015-06-01 11:53:40 -07:00
ZappoMan
4b46fc3ad9
cleanup Model::renderPart()
2015-06-01 11:11:27 -07:00
ZappoMan
1b8572640b
more hacking sams tweaks
2015-06-01 09:07:32 -07:00
ZappoMan
34fd1bd470
added debugging
2015-05-30 08:45:02 -07:00
ZappoMan
0124f98340
more hacking on rendering model parts
2015-05-29 21:56:24 -07:00
ZappoMan
dc62052a3c
more hacking on models
2015-05-29 11:07:25 -07:00
ZappoMan
eb19b93433
render models in scene checkpoint
2015-05-28 17:19:30 -07:00
Ryan Huffman
822ae800c5
Update Model::endScene to require RenderArgs
2015-05-22 16:17:01 -07:00
Ryan Huffman
8380eec03b
Update Model::renderCore to use RenderArgs
2015-05-22 16:10:43 -07:00
Ryan Huffman
d1a5662ca7
Merge branch 'team-teaching' of github.com:highfidelity/hifi into ctx
...
Conflicts:
libraries/entities-renderer/src/EntityTreeRenderer.cpp
2015-05-22 15:33:40 -07:00
Ryan Huffman
3f22b5f8b3
Add RenderArgs to more render methods
2015-05-22 15:25:53 -07:00
Atlante45
6b9f9a32bb
Merge branch 'yellow' of http://github.com/samcake/hifi into simple_program
2015-05-21 20:58:42 +02:00
Sam Gateau
3ec6ada29d
Introduce an official syncCache on the GLBackend to catch up with the glCOntext ttrue state
2015-05-19 00:32:36 -07:00
Sam Gateau
ce09f73b5c
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-05-18 14:36:29 -07:00
Howard Stearns
bb4df26690
Fix indentation.
2015-05-18 14:25:35 -07:00
Howard Stearns
95be605233
Typo: unlock=>lock in rednerDebugMeshBoxes.
2015-05-18 14:05:13 -07:00
Howard Stearns
7e1b6a48c5
Merge branch 'master' of https://github.com/highfidelity/hifi into grab-picking-crash
2015-05-18 13:35:28 -07:00
Howard Stearns
f2a66f3106
Simplest fix for the grab crash that occurs with animated complex models.
...
(e.g., clicking on air hockey props in front of a spinning windmill).
2015-05-18 13:08:11 -07:00
ZappoMan
1bb682180c
workaround for segregateMeshGroups() crash
2015-05-18 12:24:18 -07:00
Sam Cake
ad99a0f053
Improving the quality of the normals with a better packing algorithm in th edeferred
2015-05-17 16:57:32 -07:00
Atlante45
e51040db53
CR
2015-05-11 14:31:22 +02:00
Atlante45
52397bf87a
Fix wireframe render for meshes with special properties
2015-05-08 15:59:39 +02:00
Atlante45
00571dad00
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
2015-05-07 10:13:59 +02:00
samcake
06e1330e42
Clean up the includes in gpu, make the skybox shader works
2015-05-06 12:12:54 -07:00
Atlante45
8b2442ce6e
clear list after loop
2015-05-05 22:56:37 +02:00
Atlante45
863280300e
Fix pickMeshList incorrect arguments
2015-05-05 22:37:00 +02:00
Atlante45
73b7530ec6
Add wireframe pipelines
2015-05-05 21:50:06 +02:00
Atlante45
e0f3a8212f
Add wireframe arg to render fct
2015-05-05 17:23:10 +02:00
Atlante45
0e3061f052
Add isWireframe to model class
2015-05-05 15:14:29 +02:00
Brad Hefta-Gaub
50eecb15b3
Merge pull request #4712 from Atlante45/compound_zones_fix
...
Compound zones fix
2015-04-28 09:48:05 -07:00
Atlante45
ab9d81b5e2
Correct comments
2015-04-28 18:09:09 +02:00
Atlante45
b7263eeacf
Added a more efficient convexHullContains to Model
...
New version computes each submesh's bounding box once and checks against it
before checking against triangles.
2015-04-28 17:05:38 +02:00
Atlante45
4911aa58bc
Fix Model setURL with delayload
...
Without this condition the model stays in a state where the geometry
is downloaded but not referenced
That way, another call to setURL with update the geometry reference
instead of returning.
2015-04-28 17:02:32 +02:00
Andrew Meadows
72deb2e49b
merge upstream/master into andrew/thermonuclear
...
Conflicts:
libraries/entities/src/EntityItem.h
libraries/physics/src/EntityMotionState.cpp
2015-04-27 12:54:21 -07:00
Seth Alves
e007617112
hook up menu-items to control debug rendering of collision hulls and owned simulations
2015-04-27 09:56:24 -07:00
Atlante45
ba507cef98
Fix a few warnings
2015-04-25 11:01:02 +02:00
Andrew Meadows
79cb55eabc
rename setJointStates() --> initJointStates()
2015-04-24 13:26:26 -07:00
Sam Gateau
58c1827f69
bring back the glPushPop in transform legacy mode
2015-04-20 15:56:44 -07:00
Sam Gateau
3872c01340
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-04-16 14:38:18 -07:00
Sam Gateau
f06556ba12
migrate the various list to sort the rendering from explicit names to a more generic key based map
2015-04-16 14:37:39 -07:00
Brad Davis
d72bb71030
Merge pull request #4636 from samcake/orange
...
Introduce the gpu::Framebuffer and its sidekick the gpu::Swapchain
2015-04-16 13:39:04 -07:00
Sam Gateau
87030236cb
working version with the gpu::SAmpler and the gpu::Framebuffer
2015-04-14 15:53:24 -07:00
Andrew Meadows
9388ae4212
fix warning about unused variable
2015-04-14 14:52:21 -07:00
Sam Gateau
c34c5f6075
adding the Fremabuffer to be used for shadows and main rendering
2015-04-14 08:47:52 -07:00
Sam Gateau
f0efade06d
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-04-07 12:56:21 -07:00
Andrew Meadows
a47170b02c
Merge pull request #4601 from samcake/temp1
...
Introducing gpu::State and using it in the Model rendering path and more...
2015-04-07 12:48:42 -07:00
Sam Gateau
9d6839e6a1
Merge branch 'temp1' of https://github.com/samcake/hifi into orange
2015-04-07 11:45:57 -07:00
Sam Gateau
25643479c9
Fixed the memory leak, due to the location pointer in the Model::RenderPipelineLib which was not smart pointed correctly
2015-04-07 11:20:55 -07:00
Sam Gateau
88afb3cedc
solution to the color attribute case
2015-04-07 10:04:51 -07:00
Seth Alves
cd5245d0d6
logging group for render-utils
2015-04-06 18:16:01 -07:00
Sam Gateau
7f46736bb4
playing with the shadwos
2015-04-06 17:17:25 -07:00
Sam Gateau
7de54917b8
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2015-04-06 10:20:23 -07:00
Sam Gateau
ecdffadcb7
trying to debug the indirect sh lighting going wrong, the noraml on avatar is not correct
2015-04-06 10:17:31 -07:00
Sam Gateau
a85daaee41
COmmented the review questions in code
2015-04-06 10:03:47 -07:00
Sam Gateau
00817ab64f
MErging with origin/orange, brinign the fix for shadows
2015-04-05 18:36:39 -07:00
Sam Gateau
17743c6013
FIxed the broken shadows
2015-04-03 17:58:21 -07:00
Sam Gateau
38d1e29a1d
getting ready for pr for a few syntax issues
2015-04-03 17:16:18 -07:00
Sam Gateau
2dcabb97b4
getting ready for pr for a few syntax issues
2015-04-03 17:10:51 -07:00
Sam Gateau
b8db0ff2d7
getting ready for pr for a few syntax issues
2015-04-03 17:05:08 -07:00
Sam Gateau
423434af10
FInd one of the issue with shadows for avatars
2015-04-03 12:34:30 -07:00
Sam Gateau
3f581d03d2
mirror means we render the Closkwise side
2015-04-03 10:45:30 -07:00
Sam Gateau
6f5c411a46
Fixing a few issues and syntax, trying to understand why the shadows are not rendering correctly
2015-04-03 10:32:20 -07:00
Seth Alves
57a4f3abe3
clear _saveNonCollisionGeometry when it's not needed, remove some debug prints
2015-04-02 06:57:27 -07:00
Seth Alves
eb78fa0f85
if switching to the mode where collision hulls are drawn, updateGeometry and simulate
2015-04-01 18:24:25 -07:00
Sam Gateau
0d721ec1e9
merging
2015-03-31 17:47:05 -07:00
Sam Gateau
9b63739a72
Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations
2015-03-31 17:35:34 -07:00
ZappoMan
a889191916
never cull mesh parts for avatars
2015-03-31 14:27:34 -07:00
samcake
1a18719031
and make it compile on mac... remove the field map from state just because it's unecessary
2015-03-30 21:53:59 -07:00
Sam Gateau
2a58a65a8f
back to the office monday morning, State almost working in the full piupeline
2015-03-30 10:10:39 -07:00
Sam Gateau
21b5d6f404
refining the state interface and the GLBackend for it with a true cache
2015-03-28 11:26:06 -07:00
Sam Gateau
9c44100bb8
cleaning the State class code
2015-03-27 10:33:29 -07:00
Seth Alves
7da87d6e15
set up a way to request ResourceCache downloads from a non-networking thread.
2015-03-26 18:37:55 -07:00
Sam Gateau
c9e0360394
using gpu::Pipeline it s mostly working but still glUniforms to get rid of
2015-03-26 13:48:49 -07:00
Sam Gateau
8938a6297f
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2015-03-25 10:16:43 -07:00
Sam Gateau
c9377d0811
the model renderer now uses the map of renderPIpeline and the pipeline object of gpu, yeah. fixed the state to do the basics glState stuff correctly
2015-03-25 10:16:18 -07:00
Sam Gateau
6284159892
Revisiting the rendering pipeline pick and trying to use our brand new gpu::Pipeline
2015-03-24 14:58:41 -07:00
ZappoMan
168e8e8b80
more fixes to avatar parts not rendering
2015-03-24 08:31:45 -07:00
ZappoMan
3e8508f149
CR feedback
2015-03-23 11:13:35 -07:00
ZappoMan
b705d76336
total hack to ignore frustum culling in case of avatar mesh parts with no transform
2015-03-23 10:43:21 -07:00
ZappoMan
fe8ad9517f
added debugging for model mesh boxes
2015-03-23 10:08:08 -07:00
ZappoMan
19c8e526e1
add guards to _jointStates array size
2015-03-23 08:47:06 -07:00
Sam Gateau
68de91c80a
cleaning code for review
2015-03-20 13:17:32 -07:00
Sam Gateau
65727dd613
clean up code
2015-03-19 15:23:50 -07:00
samcake
0f22d64802
compilation on MacOSX
2015-03-18 16:28:42 -07:00
Sam Gateau
dc27bfb6ef
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2015-03-18 15:59:50 -07:00
Sam Gateau
0bd78be7f4
Transition model shaders to gpu:Shader
2015-03-18 15:57:01 -07:00
Sam Gateau
5a40fcee17
set the defines for GPU profile correctly AGAIN
2015-03-17 16:51:59 -07:00
Sam Gateau
03da3aeab4
Clean up on the GPU Profile defines in order to control features
2015-03-17 16:15:10 -07:00
Seth Alves
87cc710efc
more merge madness, calculate 2nd PhysicsEngine hash with qChecksum if url is set
2015-03-13 18:43:24 -07:00
Seth Alves
bf1cb951a3
move PhysicsEntity so that ModelEntityItem can initiate a model download
2015-03-11 18:34:27 -07:00
Seth Alves
20a22ff42c
Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide
2015-03-11 07:17:19 -07:00
Seth Alves
1c73f50dbc
started to hook up geometry downloader to ShapeInfo
2015-03-11 07:17:13 -07:00
Seth Alves
844085b514
started on hull collisions
2015-03-10 15:30:08 -07:00
Sam Gateau
853cf75f60
adding the atmosphere in the directional lighting pass, debug
2015-03-10 09:37:13 -07:00
Sam Gateau
cc85f468d6
splitting the code of GLBackend into separate .cpp, adding the PIpeline,adn the state to gpu
2015-03-09 11:14:42 -07:00
Seth Alves
a180eadc91
remove stray control-Ms
2015-03-08 18:07:07 -07:00
Sam Gateau
23a6326aa1
testing the shader features in Model and refining the shader making workflow
2015-03-08 10:53:29 -07:00
Sam Gateau
d5f6129082
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0bis
2015-03-06 10:44:15 -08:00
Sam Gateau
c097c6aad2
Adding the self introspection of shaders
2015-03-06 10:41:53 -08:00
Sam Gateau
598b791aee
FIxing the compilation issue for linux
2015-03-03 11:01:47 -08:00
Sam Gateau
5ab3cbb7ec
Fixed the 2 remianing issues before PR, the shadow program needed to have the binding assigned and the Head of the avatar isn't getting it's BBox evaluated
2015-02-27 17:11:16 -08:00
Sam Gateau
04a39275ef
Trying to setup correctly the projection matrix for all the different cases...
2015-02-23 16:47:43 -08:00
Sam Gateau
90bff36fd3
trying to ge the shadow to render correctly
2015-02-22 18:48:48 -08:00
Sam Gateau
4e2d2bc188
Fixing the remaining issue with the avatar rendering path
2015-02-20 12:05:06 -08:00
Sam Gateau
ded78816b5
Fixing the remaining issue with the avatar rendering path
2015-02-20 11:26:08 -08:00
Sam Gateau
11060ed273
trying to tackle the unenderstood transform value not going through corectly?
2015-02-18 16:00:37 -08:00
Sam Gateau
d8aa0e0138
replacing the glTransform pipeline for model rendering
2015-02-17 09:44:03 -08:00
Sam Gateau
23354da828
replacing the glTransform pipeline for model rendering
2015-02-16 22:08:21 -08:00
Sam Gateau
cc3cc4f96f
replacing the glTransform pipeline for model rendering
2015-02-16 09:31:29 -08:00
Sam Gateau
a6f006a36d
more cleaning
2015-02-10 18:41:36 -08:00
Sam Gateau
b9fd116dbf
Introduce a cache bit in networkGemometry to capture the status of texture LOaded and avoid requiring everything once everything is loaded and get rid of the Transform stack calls on gl from gpu
2015-02-10 18:38:48 -08:00
Sam Gateau
0d3f9c740d
duplicate cleaning code at the end of Model renderCore
2015-01-23 11:14:17 -08:00
Sam Gateau
4151833549
cleaning up for pull request
2015-01-23 10:49:04 -08:00
Sam Gateau
d19bfa69f2
Even more gpu::Texture in the model rnedering
2015-01-21 10:07:10 -08:00
Sam Gateau
4302db109f
First take at using the gpu::Texture in the Model rendering instead of the previous pass with raw glTexture
2015-01-20 16:02:26 -08:00
Sam Gateau
6b55b4ff82
No more Magic numbers and fixing the code path for linux
2015-01-16 10:26:51 -08:00
Sam Gateau
d759f4c255
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2015-01-15 11:54:55 -08:00
Sam Gateau
067483fce2
Adding a prototype of ambient lighting with spherical harmonics
2015-01-15 11:54:01 -08:00
Sam Gateau
9c083ce86e
Using the model::Material for rendering and in shaders
2015-01-13 15:51:18 -08:00
Sam Gateau
d9efafac7e
updating the model fragment shaders to use DeferredBUfferWrite
2015-01-13 14:11:38 -08:00
Atlante45
2a82ff9768
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
...
Conflicts:
assignment-client/src/voxels/VoxelServer.cpp
interface/src/Application.cpp
interface/src/Audio.cpp
interface/src/DatagramProcessor.cpp
interface/src/Menu.cpp
interface/src/Util.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/ui/ApplicationOverlay.cpp
interface/src/ui/PreferencesDialog.cpp
libraries/networking/src/NodeList.cpp
libraries/shared/src/DependencyManager.h
2015-01-13 11:03:14 -08:00
ZappoMan
1bc91e7d29
removed renderTriangleProxies
2015-01-06 16:01:06 -08:00
ZappoMan
139f96c8b0
remove PerformanceTimer from recalculateMeshBoxes() because it's not thread safe
2015-01-02 14:41:09 -08:00
Sam Gateau
e752edc44a
Moving the shaders used in Model.cpp from resources folder into the built-in executable
2014-12-30 12:35:00 -08:00
Sam Gateau
6628f7b811
replace the model.frag and model.vert files from resource by the sl version of the shaders
2014-12-25 19:57:27 -08:00
Sam Gateau
c5eb04336f
first version of SCribe used for shaders in render-utils
2014-12-23 16:27:02 -08:00
Atlante45
296c0025de
Switched to auto and changed macro
2014-12-18 15:42:38 -08:00
ZappoMan
1a9cf126e4
Merge branch 'master' of https://github.com/highfidelity/hifi into librarization
...
Conflicts:
interface/src/Application.cpp
libraries/entities-renderer/src/EntityTreeRenderer.h
2014-12-17 13:16:11 -08:00
ZappoMan
5d636e21c6
more Application dependency cleanup
2014-12-17 11:10:45 -08:00
Atlante45
11a2ecab56
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/Menu.cpp
interface/src/entities/EntityTreeRenderer.h
interface/src/ui/ApplicationOverlay.cpp
libraries/render-utils/src/GlowEffect.cpp
libraries/render-utils/src/Model.cpp
2014-12-16 15:02:37 -08:00
ZappoMan
89101872bb
move Model and AnimationHandle to libraries
2014-12-16 14:04:39 -08:00
