Bradley Austin Davis
|
a578e64416
|
Remove Qt dependency from scribe
|
2018-02-07 09:44:45 -08:00 |
|
Bradley Austin Davis
|
f291715f87
|
Merge remote-tracking branch 'zvork/scribe' into fix/shader_length
|
2018-02-06 10:36:15 -08:00 |
|
Bradley Austin Davis
|
f611990b10
|
Fix overlimit shader char strings
|
2018-02-05 15:27:19 -08:00 |
|
Olivier Prat
|
efa6a8c0b5
|
Merged with master
|
2018-01-17 15:49:46 +01:00 |
|
Olivier Prat
|
157a229a4f
|
Tried to add GLSL validation in scribe. Issues with determining the correct version...
|
2018-01-17 15:09:32 +01:00 |
|
Olivier Prat
|
54690219e3
|
Changed the way shader type is sent to Scribe
|
2018-01-17 11:12:37 +01:00 |
|
Olivier Prat
|
49549ced17
|
Fixed compilation with new shader system
|
2018-01-17 10:52:58 +01:00 |
|
Olivier Prat
|
3911ce59cc
|
Scribe now outputs .h and .cpp. Need to change how shader source is referenced in C++ code
|
2018-01-16 19:02:12 +01:00 |
|
Olivier Prat
|
98a47e56fc
|
Added a hack to force referencing of shader source on Android
|
2018-01-12 17:32:12 +01:00 |
|
Olivier Prat
|
420b58fd5b
|
Trying to fix Android build error
|
2018-01-12 15:13:55 +01:00 |
|
Olivier Prat
|
814de4ab81
|
Scribe now outputs shaders as cpp files.
|
2018-01-12 11:59:19 +01:00 |
|
samcake
|
307243da8b
|
cleaning compilation warnings and tuning the FBX material mapping pass
|
2016-07-13 11:04:53 -07:00 |
|
samcake
|
2fbdb22493
|
Cleaning up the lighting with the simpler approach where emissive and lightmap is displayed on forward
|
2016-07-08 18:14:05 -07:00 |
|
samcake
|
670826effc
|
appeasing linux gods ?
|
2016-05-12 14:50:41 -07:00 |
|
samcake
|
c6aeaf308b
|
appeasing linux gods ?
|
2016-05-12 14:36:45 -07:00 |
|
samcake
|
a436c54817
|
make scribe spit out bigger chunks of litteral strings
|
2016-05-12 14:14:05 -07:00 |
|
samcake
|
2d573963bb
|
Introducing the unlit material
|
2016-05-04 18:50:52 -07:00 |
|
samcake
|
9cb8bd0808
|
Adding one more feature for NULL_VAR in scribe function parameters and unifying the MAterialTexture shader code
|
2016-02-23 02:41:26 -08:00 |
|
Atlante45
|
d3224bfde3
|
More warning fixes
|
2015-12-11 16:03:44 -08:00 |
|
Atlante45
|
ce51350b65
|
Fix warnings on windows 64bit
|
2015-12-11 15:42:15 -08:00 |
|
Brad Davis
|
282cdadf63
|
Fixing line endings
|
2015-10-18 22:55:14 -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 |
|
Brad Davis
|
d311e4f2ea
|
Fixing problems reported by static analysis tool
|
2015-08-25 19:18:55 -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 |
|
Brad Davis
|
aea07fe671
|
Merge branch 'master' into gl4_1
Conflicts:
libraries/gpu/src/gpu/Config.slh
libraries/render-utils/src/deferred_light_limited.slv
libraries/render-utils/src/simple.slf
libraries/render-utils/src/simple_textured.slf
tests/render-utils/src/main.cpp
tools/scribe/src/main.cpp
|
2015-07-31 15:08:37 -07:00 |
|
Atlante45
|
256c786e28
|
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
|
2015-07-17 17:59:19 -07:00 |
|
Brad Davis
|
d8dde71c8f
|
Make scribe generated shaders more readable
|
2015-07-12 18:46:08 -07:00 |
|
Atlante45
|
7b5a5a339a
|
Use make_shared/create to make shared pointers
|
2015-07-01 19:46:06 -07:00 |
|
Brad Davis
|
f51c43f90d
|
Working on GL 4.1
|
2015-06-23 09:47:18 -07:00 |
|
Stephen Birarda
|
b9c9ff6a14
|
clean up various warnings
|
2015-05-01 16:49:13 -07:00 |
|
Sam Gateau
|
d9c071a2a9
|
trying to put the atmospheric effect in a shader header and use it on the directional lighting pass
|
2015-03-10 00:47:27 -07:00 |
|
Stephen Birarda
|
33b0fd24a6
|
don't call copy dll step for scribe
|
2015-02-25 11:02:05 -08:00 |
|
Stephen Birarda
|
fd8240669b
|
fix for windeployqt for executables
|
2015-02-25 10:39:44 -08:00 |
|
Stephen Birarda
|
b2e587dbbd
|
remove use of include_dependency_includes and use cmake
|
2015-02-18 14:12:05 -08:00 |
|
Stephen Birarda
|
7d25013659
|
add DLL copying for all project targets
|
2015-02-17 17:44:58 -08:00 |
|
David Rowe
|
07b30da2ac
|
Fix miscellaneous types and casts
|
2015-01-08 13:44:51 -08:00 |
|
Sam Gateau
|
ccc77ce7a6
|
fixing command for scribe
|
2014-12-30 14:30:18 -08:00 |
|
Sam Gateau
|
7ea9f92492
|
polishing the scribe -c++ case
|
2014-12-23 18:25:35 -08:00 |
|
dev
|
42157161e0
|
fix the c++ header generation for mac though the brand new raw string format of c++11
|
2014-12-23 18:19:25 -08:00 |
|
Sam Gateau
|
c5eb04336f
|
first version of SCribe used for shaders in render-utils
|
2014-12-23 16:27:02 -08:00 |
|
Sam Gateau
|
249e6d02f8
|
Fixing typo and syntax
|
2014-12-23 14:49:06 -08:00 |
|
Sam Gateau
|
4004831377
|
Fixing typo and syntax
|
2014-12-23 14:46:58 -08:00 |
|
Sam Gateau
|
522ca55ed8
|
Fixing typo and syntax
|
2014-12-23 14:41:49 -08:00 |
|
Sam Gateau
|
0578a54ea0
|
Fixing typo and syntax
|
2014-12-23 14:41:05 -08:00 |
|
Sam Gateau
|
4bdc0d718d
|
Fixing typo and syntax
|
2014-12-23 14:29:26 -08:00 |
|
Sam Gateau
|
59387be856
|
Fixing typo and syntax
|
2014-12-23 14:20:12 -08:00 |
|
Sam Gateau
|
e16da55b1b
|
cleaning scribe main and checking naming
|
2014-12-22 16:02:58 -08:00 |
|
Sam Gateau
|
6b88eaceb5
|
FIx typos
|
2014-12-22 15:44:46 -08:00 |
|
Sam Gateau
|
4ee005affa
|
adding scribe tool
|
2014-12-22 11:51:54 -08:00 |
|