Sam Gateau
4e944645fe
more cleaning for showing a cleaner pr
2015-08-28 16:58:36 -07:00
Sam Gateau
b845fcaff9
Cleanup
2015-08-28 16:38:07 -07:00
Sam Gateau
e2fce12713
Splitting the FBXREader.cpp file into sub files
2015-08-28 09:51:03 -07:00
Sam Gateau
8ea8eea08d
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-08-28 08:13:10 -07:00
Sam Gateau
85f230bf17
Getting rid of the NetworkMEshPart and simplifying the thinking around the MOdel regarding its RenderItems
2015-08-28 08:12:50 -07:00
Stephen Birarda
8ea20b5e5e
fix warning on string literal call to qFatal
2015-08-27 18:26:55 -07:00
Sam Gateau
4f7b857130
Merge
2015-08-27 10:01:39 -07:00
Sam Gateau
f6953f8e02
REfining th eTextureMap design but still with the issue of the lightmapped model
2015-08-27 09:52:07 -07:00
Seth Alves
695ffa29c7
call setup_memory_debugger from common macros rather than from every CMakeLists.txt file
2015-08-26 11:09:59 -07:00
Sam Gateau
84d0be134e
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-08-25 22:13:22 -07:00
Sam Gateau
1e9fce2a61
Drafting the materials for FBXReader
2015-08-25 22:12:51 -07:00
Brad Davis
d311e4f2ea
Fixing problems reported by static analysis tool
2015-08-25 19:18:55 -07:00
Brad Davis
380b0cb23c
Removing tabs from our javascript and C++
2015-08-24 15:26:46 -07:00
Sam Gateau
e06e50cb5c
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-08-24 14:01:29 -07:00
Sam Gateau
a6db88f257
converting material and mesh from srgb to linear in pipeline
2015-08-24 14:00:48 -07:00
Brad Davis
78a08ed7c7
Merge pull request #5641 from thoys/20660
...
CR for Job #20660 - Render the world Axis markers into negative space, add view option
2015-08-24 10:16:56 -07:00
Howard Stearns
bb91b17314
Merge pull request #5634 from hyperlogic/tony/animation-resource-fix
...
Fix for animation resources
2015-08-24 08:13:33 -07:00
Nex Pro
8d8a9535a0
Merge branch '20660' of github.com:thoys/hifi into 20660
2015-08-24 16:07:38 +01:00
Nex Pro
3f4323e084
Added overload for renderDashedLine
2015-08-24 16:07:07 +01:00
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
Sam Gateau
01f4807239
Merging and getting back original files
2015-08-21 16:51:57 -07:00
Sam Gateau
4fabc25b3e
Fixing conflicts in shaders
2015-08-21 16:49:01 -07:00
Sam Gateau
a388ba7b00
fix conflicts
2015-08-21 16:45:52 -07:00
Sam Gateau
5a8e20ec77
merging
2015-08-21 16:34:13 -07:00
Anthony J. Thibault
b7009b4631
Fix for animation resources
...
The problem was that the invokeMethod between the AnimationReader thread
and the main thread was failing, because FBXGeometry* wasn't a registered meta type.
So, I ended up normalizing the AnimationReader class to be more like GeometryReader,
in that it uses singles and slots to communicate success and failure, rather then
invokeMethod.
2015-08-21 16:09:06 -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
