samcake
|
93aec28c7b
|
Less warning
|
2016-08-30 14:54:58 -07:00 |
|
samcake
|
7dc99e86b9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-08-29 17:54:49 -07:00 |
|
samcake
|
3755a3fc32
|
Add batch timing information vs gpu
|
2016-08-29 17:54:17 -07:00 |
|
Brad Hefta-Gaub
|
f3d157c396
|
Merge pull request #8500 from jherico/gl_context
Custom OpenGL context creation
|
2016-08-29 16:22:21 -07:00 |
|
Brad Davis
|
617633b85c
|
Moving to custom context creation
|
2016-08-29 11:21:54 -07:00 |
|
Zach Pomerantz
|
5f699072d9
|
allow black skybox
|
2016-08-29 10:58:09 -07:00 |
|
samcake
|
165cb8bc39
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-08-29 09:42:33 -07:00 |
|
Brad Davis
|
92fa1d5776
|
Use stream draw for object position updates
|
2016-08-27 15:08:38 -07:00 |
|
Brad Davis
|
587d015c57
|
Give names to offscreen contexts for easier debugging
|
2016-08-26 19:09:26 -07:00 |
|
Brad Davis
|
e4334be0cf
|
Use synchronous logging (may impact performance when debugging is enabled)
|
2016-08-26 19:08:15 -07:00 |
|
Brad Davis
|
1652965ac2
|
Destroy contexts properly
|
2016-08-26 19:07:44 -07:00 |
|
Brad Davis
|
95b5a23c7a
|
Properly destroy GL programs
|
2016-08-26 19:04:46 -07:00 |
|
Brad Davis
|
7ffa212006
|
Don't use textures that are in the transfer pipeline
|
2016-08-26 19:04:24 -07:00 |
|
samcake
|
4bf93f66df
|
Cleaning up the lights and the light stage
|
2016-08-26 17:47:20 -07:00 |
|
Brad Hefta-Gaub
|
3d6691f3d1
|
Merge pull request #8527 from zzmp/fix/skybox-default-color
fix skybox default
|
2016-08-26 15:14:44 -07:00 |
|
Zach Pomerantz
|
996346980d
|
clear the skybox between scenes
|
2016-08-25 18:08:22 -07:00 |
|
Zach Pomerantz
|
5e82093e69
|
set skybox clear color to empty color
|
2016-08-25 18:08:03 -07:00 |
|
Brad Hefta-Gaub
|
9801ff075a
|
Merge pull request #8433 from samcake/hdr
Fix Screen Space ambient occlusion which was broken since a while
|
2016-08-25 16:57:24 -07:00 |
|
Brad Hefta-Gaub
|
10c465f591
|
Merge pull request #8525 from hyperlogic/bug-fix/web-entity-rendering
Improved web entity rendering
|
2016-08-25 16:49:00 -07:00 |
|
samcake
|
8cc65ea965
|
Adrressing review issues
|
2016-08-25 16:31:42 -07:00 |
|
samcake
|
09a70740a8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-08-25 15:21:41 -07:00 |
|
Brad Hefta-Gaub
|
ac291a398d
|
Merge pull request #8329 from AndrewMeadows/render-collision-geometry
Render collision geometry
|
2016-08-25 15:15:28 -07:00 |
|
Andrew Meadows
|
2c8ab9b2b8
|
Merge pull request #8497 from hyperlogic/feature/improve-ik-quality
Raised max iterations for IK to 16 from 4
|
2016-08-25 15:06:11 -07:00 |
|
Zach Pomerantz
|
24162f0f3d
|
set skybox default color to empty color
|
2016-08-25 12:37:23 -07:00 |
|
samcake
|
9669234f9c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-08-25 12:36:01 -07:00 |
|
Anthony J. Thibault
|
e82f6a90af
|
Improved web entity rendering
* fading now works properly
* web browsers are now fully opaque.
|
2016-08-25 11:04:23 -07:00 |
|
Andrew Meadows
|
c337cc92e5
|
remove crufty comment
|
2016-08-25 08:51:53 -07:00 |
|
Andrew Meadows
|
b95cb566cd
|
fix collision mesh for non-trivial registration
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
502146b171
|
distribute reg offset to compound children
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
19cd4648ad
|
scale collision render mesh correctly
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
acaa77b75a
|
remove cruft from debug efforts
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
e4317adcf1
|
remove cruft
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
2f16aca114
|
remove cruft and fix typo in rebase
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
d801b3521c
|
fix warnings on windows
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
e554712259
|
remove entities-renderer dependency on physics lib
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
48c73acae0
|
restore privacy of GeometryResourceWatcher methods
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
269b7ae7c1
|
remove commented out cruft
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
83426fd5a8
|
handle transitions to/from STATIC_MESH
when rendering collision geometry
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
68dd66daec
|
create collision render geometry only when needed
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
eb65be5478
|
remove cruft argument from allocateModel()
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
b0a0293e6e
|
move compoundResource out of Model class
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
ef597265d7
|
remove unimplemented declaration
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
fe4198530f
|
don't render raw compound collision geometry
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
191b7f0f39
|
variable namechange: Hull --> Mesh
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
329c5432ed
|
_showCollisionHull --> _showCollisionGeometry
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
1f84ef3053
|
compute normals for collision mesh geometry
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
481d6990a3
|
trigger collision shape render mesh creation
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
3b772d2fe6
|
fallback to SIMPLE_COMPOUND when can't do COMPOUND
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
26f5d3cfaa
|
fix render geometry for collision shapes
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
daff897fc4
|
const shapes, and use *MotionState::setShape()
|
2016-08-24 22:26:56 -07:00 |
|