Diffusion 0 A.D. Public Repository rP11453

Add support for specular materials.
rP11453
Actions

Tags

None

Subscribers

None

Description

Add support for specular materials.
Let materials specify shader uniform values.
Use interned strings for shader uniform/attribute names.
Remove confusing float* cast operator on CVector4D.
Simplify and clean up CVector4D.
Remove non-supported 'old' lighting model.

Details

Committed

Apr 8 2012, 5:55 PM

Parents

rP11452: Adds the GarrisonTower and GarrisonFortress classes to towers and fortresses.

Branches

Unknown

Tags

Unknown

Event Timeline

philip committed rP11453: Add support for specular materials..Apr 8 2012, 5:55 PM

vladislavbelov mentioned this in D2011: Removes unused LightingModel.Jun 25 2019, 10:40 PM

vladislavbelov mentioned this in rP22403: Removes unused and obsolete LightingModel..Jun 27 2019, 12:30 AM

vladislavbelov mentioned this in rP27288: Removes USE_SPECULAR from terrain_common shader unused by materials added in….Dec 20 2022, 6:13 PM

vladislavbelov mentioned this in rP27447: Removes unused BrokenColor constant forgotten to be removed in rP11453..Jan 15 2023, 2:02 PM

Changes (36)

Path

Size

ps/

trunk/

binaries/

data/

mods/

public/

art/

materials/

objectcolor_spec.xml

playercolor_spec.xml

shaders/

arb/

model_common.fp

model_common.vp

model_common.xml

glsl/

model_common.fs

model_common.vs

terrain_common.fs

terrain_common.vs

source/

graphics/

CinemaTrack.cpp

MaterialManager.cpp

MaterialManager.h

ObjectEntry.cpp

ShaderDefines.cpp

ShaderDefines.h

ShaderManager.cpp

ShaderProgram.cpp

ShaderProgram.h

ShaderProgramFFP.cpp

tests/

test_ShaderManager.h

maths/

ps/

renderer/

ModelRenderer.cpp

RenderModifiers.cpp

RenderModifiers.h

TerrainRenderer.cpp

tools/

atlas/

AtlasUI/

ScenarioEditor/

Sections/

Environment/

Environment.cpp

rP11453

ps/trunk/binaries/data/mods/public/art/materials/basic_spec.xml

Loading...

ps/trunk/binaries/data/mods/public/art/materials/blend_spec.xml

Loading...

ps/trunk/binaries/data/mods/public/art/materials/objectcolor_spec.xml

Loading...

ps/trunk/binaries/data/mods/public/art/materials/playercolor_spec.xml

Loading...

ps/trunk/binaries/data/mods/public/shaders/arb/model_common.fp

Loading...

ps/trunk/binaries/data/mods/public/shaders/arb/model_common.vp

Loading...

ps/trunk/binaries/data/mods/public/shaders/arb/model_common.xml

Loading...

ps/trunk/binaries/data/mods/public/shaders/glsl/model_common.fs

Loading...

ps/trunk/binaries/data/mods/public/shaders/glsl/model_common.vs

Loading...

ps/trunk/binaries/data/mods/public/shaders/glsl/terrain_common.fs

Loading...

ps/trunk/binaries/data/mods/public/shaders/glsl/terrain_common.vs

Loading...

ps/trunk/source/graphics/Camera.cpp

Loading...

ps/trunk/source/graphics/CinemaTrack.cpp

Loading...

ps/trunk/source/graphics/Material.cpp

Loading...

ps/trunk/source/graphics/Material.h

Loading...

ps/trunk/source/graphics/MaterialManager.cpp

Loading...

ps/trunk/source/graphics/MaterialManager.h

Loading...

ps/trunk/source/graphics/ObjectEntry.cpp

Loading...

ps/trunk/source/graphics/ShaderDefines.cpp

Loading...

ps/trunk/source/graphics/ShaderDefines.h

Loading...

ps/trunk/source/graphics/ShaderManager.cpp

Loading...

ps/trunk/source/graphics/ShaderProgram.cpp

Loading...

ps/trunk/source/graphics/ShaderProgram.h

Loading...

ps/trunk/source/graphics/ShaderProgramFFP.cpp

Loading...

ps/trunk/source/graphics/tests/test_ShaderManager.h

Loading...

ps/trunk/source/maths/Matrix3D.h

Loading...

ps/trunk/source/maths/Plane.h

Loading...

ps/trunk/source/maths/Vector4D.h

Loading...

ps/trunk/source/ps/CStrIntern.cpp

Loading...

ps/trunk/source/ps/CStrIntern.h

Loading...

ps/trunk/source/renderer/ModelRenderer.cpp

Loading...

ps/trunk/source/renderer/RenderModifiers.cpp

Loading...

ps/trunk/source/renderer/RenderModifiers.h

Loading...

ps/trunk/source/renderer/Renderer.cpp

Loading...

ps/trunk/source/renderer/TerrainRenderer.cpp

Loading...

ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp

Loading...