Commit Graph

105 Commits (master)

Author SHA1 Message Date
Andrei Kortunov 3032b177a1 Remove redundant includes 6 years ago
AnyOldName3 244bd289cb Change default colour mode (as apparently it actually gets used sometimes) 6 years ago
AnyOldName3 a41ce42208 Move setting of colorMode to ShaderRequirements in case they're reused 6 years ago
AnyOldName3 474770eca8 Switch shadow map rendering to a specialised, simplified shader. 6 years ago
AnyOldName3 ce15369bbd Convert colorMode shader define to a uniform 6 years ago
AnyOldName3 0124be5713 Merge upstream/master 6 years ago
Andrei Kortunov e06f0b797a Replace all NULLs to nullptr 6 years ago
AnyOldName3 3ce96997d1 Remove sneaky tabs. 6 years ago
AnyOldName3 80082308f0 Merge upstream (shadermanager log system revamp) 6 years ago
Andrei Kortunov 1452684d9e Use new logging system for components 6 years ago
AnyOldName3 b08938485f Make suspending viewer threads the responsibility of the caller, not the shader manager. 7 years ago
AnyOldName3 229cc9696f Make updating global shader defines update shaders. 7 years ago
AnyOldName3 974e4d5299 Add check for null shaders when releasing OpenGL objects 7 years ago
AnyOldName3 98cd9fc144 Add preliminary support for global shader defines. 7 years ago
AnyOldName3 7a9df977c7 Add some prerequisits for making shadows disableable 7 years ago
AnyOldName3 166ba22072 Prevent line count changes within conditional blocks (because of conditional includes or @foreach expansion) ruining line numbering. 7 years ago
AnyOldName3 3d18ddc8e4 Take into account previous #line directives when expanding @foreach shader macros 7 years ago
AnyOldName3 590531595b Create @foreach shader preprocessor macro in preparation for moving shadow setup out of shadermanager.cpp 7 years ago
AnyOldName3 e201e359a9 Move Shadow to Components 7 years ago
AnyOldName3 1a30a917af Merge upstream/master 7 years ago
AnyOldName3 aa31cbba4f Attempt (and fail) to make the local map show without unwanted shadow 7 years ago
scrawl 244cc5b861 Reduce error spam 7 years ago
AnyOldName3 715f29165b Dynamically adjust shaders to have the required number of shadow maps. 7 years ago
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.
7 years ago
scrawl f1ebb129c1 Fix ShaderVisitor to deal with the fact RigGeometry no longer derives from Geometry 7 years ago
scrawl b9931fb71c Set the shader on the node containing the StateSet 7 years ago
scrawl 4fba157d3b Implement releaseGLObjects for cached resources 7 years ago
Bret Curtis d48b829b45 replace and purge boost::lexical_cast 8 years ago
scrawl d8505e4f48 Fix a multithreading crash caused by modification of live Geometry 8 years ago
scrawl 058681ad73 ShaderVisitor: avoid reset of rig geometry when not required 8 years ago
scrawl 67e4a7e37b Change some osg::clone's to direct copy constructor to avoid dynamic_cast overhead 8 years ago
scrawl 792f505b2a Fix potential crash in ShaderVisitor for textures with no image assigned 8 years ago
scrawl 45ae8d5ffa Add support for GL_AMBIENT colorMode to shaders as required by particle systems 8 years ago
scrawl a5da3a269e Fix shadowing warnings 8 years ago
scrawl d1f6169889 Add special handling of RigGeometry tangents in ShaderVisitor 9 years ago
scrawl 6f31b3d79f Add parallax mapping for objects 9 years ago
scrawl df6fd5f206 Recognize normalHeightMap in the ShaderVisitor 9 years ago
scrawl 6e7c6fdd7e Implement NiTexturingProperty::DecalTexture 9 years ago
scrawl 062410bd8c Don't incorrectly remove TexEnv state 9 years ago
scrawl 90a99991d1 Use empty() instead of !size() 9 years ago
scrawl e25e0a0600 ShaderVisitor: assume the first texture unit is the diffuseMap 9 years ago
scrawl e7682e04ae Cleanup 9 years ago
scrawl 4ca6e91292 Fix in-code default settings so that we don't attempt to use shaders in OpenCS 9 years ago
scrawl 8f81df2bd3 Cleanup 9 years ago
scrawl 171e293641 ShaderManager: insert #line directives when including files 9 years ago
scrawl f01e8a6950 Add specular mapping for objects 9 years ago
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'
9 years ago
scrawl 5e12a1b4ef Add enchanted item glow to the shader 9 years ago
scrawl 268594dcf1 Recreate shader in NpcAnimation::setAlpha 9 years ago
scrawl a73512afb7 Add shader settings to settings.cfg 9 years ago
scrawl 21c4dffed2 Add #include support in shaders 9 years ago
scrawl 22cc5c0965 Cache the Program 9 years ago
scrawl 456816f707 Use diffuse.a / vertex.a, use material emission 9 years ago
scrawl 9376811213 Vertex lighting shader 9 years ago
scrawl a9ad1b09e2 Introduce ShaderManager & ShaderVisitor
Actual shaders still to be written.
9 years ago