Commit graph

61 commits

Author SHA1 Message Date
Stephen Birarda
2158acecf4 tell cmake we are fine ignoring generated for CMP0071 2018-03-08 12:39:40 -08:00
SamGondelman
4c6169ec78 merge and a little cleanup 2018-02-20 15:45:34 -08:00
SamGondelman
4f0f6709c1 fix build errors 2018-02-20 13:56:06 -08:00
Andrew Meadows
8231a56b22 pull task out of render and into its own lib 2018-02-13 08:56:11 -08:00
humbletim
06afaa7470 BufferView <-> QVariant/QScriptValue conversion
update MeshProxy/SimpleMeshProxy and ScriptableModel

ModelScriptingInterface / scriptable::ModelProvider

integration

update to RC-63

initial graphics-scripting refactoring

graphics-scripting baseline commit

wip commit

Geometry -> MeshPart

remove SimpleMeshProxy

collapse graphics-utils -> graphics-scripting

scriptable::Model => scriptable::ScriptableModel
2018-02-01 16:30:29 -05:00
Brad Davis
0781d8eaf0 Remove some unneeded Qt dependencies 2018-01-28 22:18:24 -08:00
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
Brad Davis
a69cf31f4b PR feedback and cmake fixes 2017-06-16 16:59:58 -07:00
samcake
bc41be7ec1 Introucing the BackgroundStage to manage the background / skybox in one place 2017-05-09 17:10:05 -07:00
Atlante45
33f58f99d1 CR 2017-04-25 16:09:31 -07:00
sam
d56f982dec Maybe saving the first ktx textures, testing the save pipeline 2017-02-17 07:54:17 -08:00
Brad Davis
488d191428 Remove all oglplus usage and references 2016-10-02 11:44:34 -07:00
Stephen Birarda
65c1edfb1c add missing link from render-utils to entities 2016-08-31 16:57:52 -07:00
Stephen Birarda
7c2fea4598 remove glew/oglplus requirement for android interface 2016-08-31 11:03:53 -07:00
SamGondelman
676f4bdfcf misc fixes from particles branch 2016-07-29 15:36:32 -07:00
SamGondelman
8a682450a9 still trying to fix cmake errors 2016-06-10 17:01:22 -07:00
Brad Davis
b8109af196 Ignite the atmosphere 2016-01-21 15:15:15 -08:00
Brad Davis
6f5f6450df Cleanup CMake files 2015-10-11 00:01:03 -07:00
Brad Hefta-Gaub
255689e24f add GLEW_STATIC to fix link warnings 2015-10-02 15:08:04 -07:00
samcake
d3b1bcb86d Redistributing the files to create the model-networking lib and separate that from the redner-utils 2015-09-21 13:21:35 -07:00
Brad Davis
5f1affaff9 Procedural skybox work 2015-09-08 14:31:16 -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
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
0fa3044231 QML framerate improvments 2015-08-12 16:24:34 -07:00
Bradley Austin Davis
53ccbfc4fa Merge branch 'core' into plugins 2015-08-03 22:25:50 -07:00
Bradley Austin Davis
f19653f3e2 Integrate glew 2015-08-01 20:08:19 -07:00
Brad Davis
5744200f64 Merge remote-tracking branch 'upstream/master' into plugins
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/MyAvatar.h
2015-07-20 19:21:02 -07:00
Stephen Birarda
97936c82f2 add a missing library link 2015-07-15 15:58:05 -07:00
Bradley Austin Davis
0034a14fc1 Working on mac functionality 2015-07-02 18:14:12 -07:00
ZappoMan
383a2c3d63 another attempt 2015-06-18 09:43:39 -07:00
Sam Gateau
2ed7aae8d5 merging and updating 2015-05-20 16:50:43 -07:00
Brad Davis
7a33474245 Merge remote-tracking branch 'upstream/master' into offscreen
Conflicts:
	interface/src/Menu.cpp
2015-04-21 13:02:38 -07:00
Sam Gateau
f06556ba12 migrate the various list to sort the rendering from explicit names to a more generic key based map 2015-04-16 14:37:39 -07:00
Brad Davis
d14d5f3d29 Working on new-UI implementations of address bar and login 2015-04-15 00:36:04 -07:00
Sam Gateau
66894a8fda Adding the render library that will provide the base rendering engine and scene description 2015-03-03 14:55:26 -08:00
Sam Gateau
d8ebb0c5b9 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-26 14:19:23 -08:00
Virendra Singh
b3fdb19cad Merge branch 'master' of https://github.com/highfidelity/hifi into 20305
Conflicts:
	BUILD.md
	BUILD_WIN.md
2015-02-26 22:16:35 +05:30
Stephen Birarda
5e264f8241 add GLEW as dependency external project 2015-02-20 13:47:38 -08:00
Sam Gateau
6070bf8a37 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-18 16:02:18 -08:00
Stephen Birarda
b2e587dbbd remove use of include_dependency_includes and use cmake 2015-02-18 14:12:05 -08:00
Stephen Birarda
e99012efbb updates to build guides to remove soxr 2015-02-17 10:33:12 -08:00
Stephen Birarda
8c998a65ee use the glm find_package and check externals 2015-02-13 12:50:32 -08:00
Stephen Birarda
fa6f6a6b71 use external project glm in render-utils 2015-02-13 10:34:19 -08:00
Sam Gateau
e2e61c64b1 Support include path to shaders from the hifi libraries to cmake 2015-02-13 01:30:04 -08:00
Stephen Birarda
c8fb891158 move fonts to sdff files, load with qrc 2015-02-06 11:48:55 -08:00
David Rowe
75758c1a3e Use static GLEW in render-utils for Windows 2015-01-08 15:40:54 -08:00
Sam Gateau
c5eb04336f first version of SCribe used for shaders in render-utils 2014-12-23 16:27:02 -08:00
Stephen Birarda
715b3a245e remove GLUT from Cmake files 2014-12-19 10:53:36 -08:00
Stephen Birarda
114e3bb2ff rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00