Thijs Wenker
0f8cf80d45
Merge branch 'master' of https://github.com/worklist/hifi into 20660
2015-08-23 19:53:50 +02:00
Nex Pro
ad315cf68a
Merge branch '20660' of github.com:thoys/hifi into 20660
...
Conflicts:
interface/src/Util.cpp
2015-08-23 16:30:46 +01:00
Nex Pro
1f08444369
Modified the world box to render axes in negative space
...
Also Modified renderDashedLine to accept params for dash len and gap len so we can display negative axes as dashed lines with 500mm dashes and gaps.
2015-08-23 16:21:20 +01:00
Brad Hefta-Gaub
fe44442ffe
Merge pull request #5577 from vastcharade/horizAmbOcclPerf
...
Horiz amb occl performance updates
2015-08-22 12:39:51 -07:00
Anthony J. Thibault
04e7084743
Resource fix for textures in FBX files.
...
The baseTexturePath url for textures in FBXGeometry
should default to the same base url as the fbx file itself.
This error was introduced in my recent refactoring.
Textures embedded in FBXGeometries should be un-affected
by this change.
2015-08-21 21:44:15 -07:00
ZappoMan
75aff2f281
fix atmosphere rendering
2015-08-21 00:29:28 -07:00
Brad Davis
76f236adf6
New stereo rendering implementation
2015-08-21 00:29:24 -07:00
Brad Davis
c3991dbb8c
Merge pull request #5622 from hyperlogic/ajt/network-geometry-refactor
...
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
2015-08-20 23:57:16 -07:00
Anthony J. Thibault
1b3d7fabc8
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
...
* Removed validation logic from Resource class, Qt does this internally and is more
standards compliant. This should result in more accurate caching and faster resource
fetching when cache is stale and validation fails.
* Added loaded and failed slots to Resource class, so it does not have to be polled.
* NetworkGeometry now uses multiple Resource objects to download
the fst/mapping file and the fbx/obj models.
* NetworkGeometry is no longer a subclass of Resource
* NetworkGeometry now has signals for success and failure, you no longer
have to poll it to determine when loading is complete (except for textures *sigh*)
Some functionality was removed
* NetworkGeometry no longer has a fallback
* NetworkGeometry no longer loads LODs or has lod logic.
* The number of FBXGeometry copies is greatly reduced.
* Model::setURL no supports fallback URL, delayLoad or retainCurrent option.
This can result in a pop when switching avatars, and there's no longer a default
if avatar loading fails.
2015-08-20 18:59:51 -07:00
Seth Alves
c25082d86f
use -fsanitize=address in all code rather than just the top-level links
2015-08-20 10:14:16 -07:00
Howard Stearns
0a8c1846e9
This assert causes dev builds to fail when starting interface.
2015-08-19 10:24:31 -07:00
Andrew Meadows
9ee49c3e1e
Merge pull request #5551 from sethalves/quiet-compiler
...
Quiet compiler
2015-08-18 09:54:29 -07:00
Seth Alves
1c8030472a
back out the more controversial changes
2015-08-17 12:40:56 -07:00
Christopher Root
21dc58eb85
Improving readability in shader
2015-08-15 14:40:34 -07:00
Christopher Root
8ea6048ec7
Removing commented out code
2015-08-15 14:31:03 -07:00
Christopher Root
81ea8e8874
Updating some comments and removing unnecessary code
2015-08-15 14:27:08 -07:00
Christopher Root
708190bfd6
horiz amb occl performance upgrades
2015-08-15 14:10:25 -07:00
Brad Davis
82310bb499
Attempting to fix rendering issues on 2015 Macs
2015-08-14 23:57:10 -07:00
Brad Davis
208e41efd1
WebEntity keyboard input with mouse hover
2015-08-14 16:18:38 -07:00
Brad Davis
0fa3044231
QML framerate improvments
2015-08-12 16:24:34 -07:00
Seth Alves
d6322903a2
quiet compiler
2015-08-11 10:12:46 -07:00
Brad Davis
19d31938d3
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-10 21:25:35 -07:00
ericrius1
0f7c21ddd7
rearranged entity props and added check in setNormals to avoid uninitialized binormal values
2015-08-10 11:55:47 -07:00
Brad Davis
caf93d1aff
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Menu.h
2015-08-08 13:18:13 -07:00
Andrew Meadows
48c5a227a7
Merge pull request #5528 from ZappoMan/removeBrokenShadows
...
remove shadow menu items
2015-08-07 16:09:00 -07:00
Bradley Austin Davis
cd6667303e
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-07 15:32:33 -07:00
Brad Davis
64fcd2da96
Merge pull request #5530 from ZappoMan/RenderableModelEntityItemOptimization
...
optimizations to RenderableModelEntityItem::render()
2015-08-07 15:32:07 -07:00
Bradley Austin Davis
fb2c84484e
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-07 15:26:43 -07:00
Seth Alves
b1e69537f3
Merge pull request #5524 from howard-stearns/cleanup-jointstate
...
Clean Up JointState
2015-08-07 13:50:02 -07:00
ZappoMan
f4c3c30f6a
quick optimization to RenderableModelEntityItem::render()
2015-08-07 12:49:48 -07:00
Howard Stearns
145b730f80
Clean up instantiation.
2015-08-07 12:27:26 -07:00
ZappoMan
87f609b9af
remove shadow menu items, left in the dead code for now, until we have a plan for replacing shadows
2015-08-07 11:26:07 -07:00
Sam Gateau
fdb370e798
cleaning th ecode
2015-08-07 10:59:56 -07:00
Sam Gateau
30900cb802
SImple fix to the case of multiple material in a mesh with different opacity
2015-08-07 10:59:55 -07:00
samcake
6864c7bcb4
Ready for release
2015-08-07 10:59:51 -07:00
Sam Gateau
0e3e0d05f1
Introducing the Normal fitting algorithm for better normal in the deferred buffer
2015-08-07 10:59:51 -07:00
ericrius1
3910cb0d69
Merge branch 'master' into polyLineInProgress
2015-08-07 10:12:02 -07:00
Sam Gateau
e4ce1002ea
cleaning th ecode
2015-08-06 18:54:58 -07:00
Sam Gateau
f0f141a2b4
SImple fix to the case of multiple material in a mesh with different opacity
2015-08-06 18:51:44 -07:00
Brad Hefta-Gaub
0947bf2cd0
Merge pull request #5517 from samcake/punk
...
Improving the quality of the normal encoding in the Deferred Buffer
2015-08-06 15:13:08 -07:00
Bradley Austin Davis
7e60aee1bf
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/Head.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/MyAvatar.h
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
interface/src/devices/3DConnexionClient.cpp
interface/src/ui/overlays/Overlays.cpp
2015-08-06 11:03:37 -07:00
samcake
07a9dd3404
Ready for release
2015-08-05 17:41:23 -07:00
Sam Gateau
95682e6270
Introducing the Normal fitting algorithm for better normal in the deferred buffer
2015-08-05 17:17:00 -07:00
Atlante45
3dc8bd47ae
Fix warning and remove unused headers
2015-08-05 16:46:44 -07:00
Sam Gondelman
513c652ab3
merge from master and attempt to fix connexion conflicts
2015-08-05 12:42:39 -07:00
samcake
6783ec300a
Merge pull request #5499 from jherico/homer
...
CORE PROFILE: Fix star point smoothing... sort of
2015-08-04 20:15:09 -07:00
Bradley Austin Davis
fc5ec22810
Fix diagonal slashes in text
2015-08-04 17:28:42 -07:00
Sam Gateau
730ad2da2f
removing dead code
2015-08-04 16:37:01 -07:00
Sam Gateau
d2360d1406
Merge branch 'core' of https://github.com/highfidelity/hifi into punk
2015-08-04 16:31:33 -07:00
Sam Gateau
fc0ee28b84
FIx the mirror rendering bugs by replacing the prvious technique by a simple true mirror during the final blit for both rear view mirror and full screen mirror, not working for HMD
2015-08-04 16:31:20 -07:00
