diff options
| author | Paul Gilbert | 2016-07-26 19:48:14 -0400 | 
|---|---|---|
| committer | Paul Gilbert | 2016-07-26 19:48:14 -0400 | 
| commit | 504cf6ecb688a3f1c65a857bffd527d8b0e6ba63 (patch) | |
| tree | 0c0d96d4061c11850c851f0fc981c75a58c20515 /graphics/VectorRenderer.cpp | |
| parent | d8c28d15ae553d047b7e571f98727fa79ee143f3 (diff) | |
| parent | e19922d181e775791f9105b8be7ff410770ede51 (diff) | |
| download | scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.gz scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.bz2 scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.zip | |
Merge branch 'master' into xeen
Diffstat (limited to 'graphics/VectorRenderer.cpp')
| -rw-r--r-- | graphics/VectorRenderer.cpp | 29 | 
1 files changed, 28 insertions, 1 deletions
| diff --git a/graphics/VectorRenderer.cpp b/graphics/VectorRenderer.cpp index f426dd8c41..73dc6309b2 100644 --- a/graphics/VectorRenderer.cpp +++ b/graphics/VectorRenderer.cpp @@ -55,7 +55,34 @@ void VectorRenderer::drawStep(const Common::Rect &area, const DrawStep &step, ui  	_dynamicData = extra; -	(this->*(step.drawingCall))(area, step); +	Common::Rect noClip = Common::Rect(0, 0, 0, 0); +	(this->*(step.drawingCall))(area, step, noClip); +} + +void VectorRenderer::drawStepClip(const Common::Rect &area, const Common::Rect &clip, const DrawStep &step, uint32 extra) { + +	if (step.bgColor.set) +		setBgColor(step.bgColor.r, step.bgColor.g, step.bgColor.b); + +	if (step.fgColor.set) +		setFgColor(step.fgColor.r, step.fgColor.g, step.fgColor.b); + +	if (step.bevelColor.set) +		setBevelColor(step.bevelColor.r, step.bevelColor.g, step.bevelColor.b); + +	if (step.gradColor1.set && step.gradColor2.set) +		setGradientColors(step.gradColor1.r, step.gradColor1.g, step.gradColor1.b, +			step.gradColor2.r, step.gradColor2.g, step.gradColor2.b); + +	setShadowOffset(_disableShadows ? 0 : step.shadow); +	setBevel(step.bevel); +	setGradientFactor(step.factor); +	setStrokeWidth(step.stroke); +	setFillMode((FillMode)step.fillMode); + +	_dynamicData = extra; + +	(this->*(step.drawingCall))(area, step, clip);  }  int VectorRenderer::stepGetRadius(const DrawStep &step, const Common::Rect &area) { | 
