58 commits

Author	SHA1	Message	Date
Andrei Kortunov	1cdd33b434	Implement additional stringops to avoid Boost functions	2020-01-09 19:40:22 +04:00
bzzt	ffe8bbd2dd	racingcrashfix #4766	2019-05-29 13:37:00 +00:00
Capostrophic	0cdc46dfd6	Move forcePPL and clamp to global shader defines (bug #4869)	2019-03-05 23:36:08 +03:00
Andrei Kortunov	3032b177a1	Remove redundant includes	2019-02-23 08:02:12 +04:00
AnyOldName3	244bd289cb	Change default colour mode (as apparently it actually gets used sometimes)	2018-12-03 18:56:37 +00:00
AnyOldName3	a41ce42208	Move setting of colorMode to ShaderRequirements in case they're reused	2018-10-18 16:00:51 +01:00
AnyOldName3	474770eca8	Switch shadow map rendering to a specialised, simplified shader.	2018-10-16 21:23:31 +01:00
AnyOldName3	ce15369bbd	Convert colorMode shader define to a uniform	2018-10-15 23:12:15 +01:00
AnyOldName3	0124be5713	Merge upstream/master	2018-10-10 21:23:19 +01:00
Andrei Kortunov	e06f0b797a	Replace all NULLs to nullptr	2018-10-09 10:21:12 +04:00
AnyOldName3	3ce96997d1	Remove sneaky tabs.	2018-08-18 00:09:40 +01:00
AnyOldName3	80082308f0	Merge upstream (shadermanager log system revamp)	2018-08-17 18:22:13 +01:00
Andrei Kortunov	1452684d9e	Use new logging system for components	2018-08-14 19:42:41 +04:00
AnyOldName3	b08938485f	Make suspending viewer threads the responsibility of the caller, not the shader manager.	2017-12-17 23:55:19 +00:00
AnyOldName3	229cc9696f	Make updating global shader defines update shaders.	2017-12-17 01:57:53 +00:00
AnyOldName3	974e4d5299	Add check for null shaders when releasing OpenGL objects	2017-11-24 22:43:40 +00:00
AnyOldName3	98cd9fc144	Add preliminary support for global shader defines.	2017-11-22 20:07:07 +00:00
AnyOldName3	7a9df977c7	Add some prerequisits for making shadows disableable	2017-11-21 17:20:57 +00:00
AnyOldName3	166ba22072	Prevent line count changes within conditional blocks (because of conditional includes or @foreach expansion) ruining line numbering.	2017-11-21 16:53:12 +00:00
AnyOldName3	3d18ddc8e4	Take into account previous #line directives when expanding @foreach shader macros	2017-11-17 17:18:33 +00:00
AnyOldName3	590531595b	Create @foreach shader preprocessor macro in preparation for moving shadow setup out of shadermanager.cpp	2017-11-10 02:02:27 +00:00
AnyOldName3	e201e359a9	Move Shadow to Components	2017-11-08 01:44:49 +00:00
AnyOldName3	1a30a917af	Merge upstream/master	2017-11-08 01:31:38 +00:00
AnyOldName3	aa31cbba4f	Attempt (and fail) to make the local map show without unwanted shadow	2017-11-08 01:20:52 +00:00
scrawl	244cc5b861	Reduce error spam	2017-11-08 00:24:03 +00:00
AnyOldName3	715f29165b	Dynamically adjust shaders to have the required number of shadow maps.	2017-11-07 20:22:45 +00:00
scrawl	5d524a6a10	Add custom version of MorphGeometry replacing osgAnimation ... Double buffering, custom bounding box and the update in the cull visitor (instead of update) are now all handled internally rather than needing hacks and/or callbacks.	2017-09-01 21:42:36 +00:00
scrawl	f1ebb129c1	Fix ShaderVisitor to deal with the fact RigGeometry no longer derives from Geometry	2017-09-01 21:42:35 +00:00
scrawl	b9931fb71c	Set the shader on the node containing the StateSet	2017-08-31 21:39:21 +00:00
scrawl	4fba157d3b	Implement releaseGLObjects for cached resources	2017-08-26 19:29:12 +00:00
Bret Curtis	d48b829b45	replace and purge boost::lexical_cast	2017-06-09 19:08:53 +02:00
scrawl	d8505e4f48	Fix a multithreading crash caused by modification of live Geometry	2017-03-01 03:36:04 +01:00
scrawl	058681ad73	ShaderVisitor: avoid reset of rig geometry when not required	2017-03-01 03:00:08 +01:00
scrawl	67e4a7e37b	Change some osg::clone's to direct copy constructor to avoid dynamic_cast overhead	2017-02-09 04:51:20 +01:00
scrawl	792f505b2a	Fix potential crash in ShaderVisitor for textures with no image assigned	2017-02-08 19:16:07 +01:00
scrawl	45ae8d5ffa	Add support for GL_AMBIENT colorMode to shaders as required by particle systems	2017-02-08 18:39:24 +01:00
scrawl	a5da3a269e	Fix shadowing warnings	2016-08-29 12:20:00 +02:00
scrawl	d1f6169889	Add special handling of RigGeometry tangents in ShaderVisitor	2016-03-23 16:48:41 +01:00
scrawl	6f31b3d79f	Add parallax mapping for objects	2016-03-22 21:46:15 +01:00
scrawl	df6fd5f206	Recognize normalHeightMap in the ShaderVisitor	2016-03-22 21:46:15 +01:00
scrawl	6e7c6fdd7e	Implement NiTexturingProperty::DecalTexture	2016-03-01 18:41:36 +01:00
scrawl	062410bd8c	Don't incorrectly remove TexEnv state	2016-02-23 10:56:18 +01:00
scrawl	90a99991d1	Use empty() instead of !size()	2016-02-22 19:06:12 +01:00
scrawl	e25e0a0600	ShaderVisitor: assume the first texture unit is the diffuseMap	2016-02-20 23:47:32 +01:00
scrawl	e7682e04ae	Cleanup	2016-02-20 22:09:41 +01:00
scrawl	4ca6e91292	Fix in-code default settings so that we don't attempt to use shaders in OpenCS	2016-02-20 20:36:29 +01:00
scrawl	8f81df2bd3	Cleanup	2016-02-20 20:34:56 +01:00
scrawl	171e293641	ShaderManager: insert #line directives when including files	2016-02-20 19:55:08 +01:00
scrawl	f01e8a6950	Add specular mapping for objects	2016-02-20 19:55:08 +01:00
scrawl	5cf2441b10	ShaderVisitor: support automatic recognition of normal maps based on file pattern ... Introduce new settings 'auto use object normal maps', 'auto use terrain normal maps', 'normal map pattern'	2016-02-20 18:00:43 +01:00