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 |
|