From 7607ba926ce5d31bb877e8f4ca6fdceac7f492a4 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Thu, 16 Jun 2016 15:31:46 +0200 Subject: DIRECTOR: Whitespace fixes --- engines/director/score.h | 483 ++++++++++++++++++++++++----------------------- 1 file changed, 247 insertions(+), 236 deletions(-) (limited to 'engines/director/score.h') diff --git a/engines/director/score.h b/engines/director/score.h index cd4985fc12..9636dfb496 100644 --- a/engines/director/score.h +++ b/engines/director/score.h @@ -20,8 +20,8 @@ * */ - #ifndef DIRECTOR_SCORE_H - #define DIRECTOR_SCORE_H +#ifndef DIRECTOR_SCORE_H +#define DIRECTOR_SCORE_H #include "common/rect.h" #include "common/stream.h" @@ -39,295 +39,306 @@ class Score; #define CHANNEL_COUNT 24 enum CastType { - kCastBitmap = 1, - kCastFilmLoop, - kCastText, - kCastPalette, - kCastPicture, - kCastSound, - kCastButton, - kCastShape, - kCastMovie, - kCastDigitalVideo, - kCastScript + kCastBitmap = 1, + kCastFilmLoop, + kCastText, + kCastPalette, + kCastPicture, + kCastSound, + kCastButton, + kCastShape, + kCastMovie, + kCastDigitalVideo, + kCastScript }; enum SpritePosition { - kSpritePositionUnk1 = 0, - kSpritePositionEnabled, - kSpritePositionUnk2, - kSpritePositionFlags = 4, - kSpritePositionCastId = 6, - kSpritePositionY = 8, - kSpritePositionX = 10, - kSpritePositionHeight = 12, - kSpritePositionWidth = 14 + kSpritePositionUnk1 = 0, + kSpritePositionEnabled, + kSpritePositionUnk2, + kSpritePositionFlags = 4, + kSpritePositionCastId = 6, + kSpritePositionY = 8, + kSpritePositionX = 10, + kSpritePositionHeight = 12, + kSpritePositionWidth = 14 }; enum MainChannelsPosition { - kScriptIdPosition = 0, - kSoundType1Position, - kTransFlagsPosition, - kTransChunkSizePosition, - kTempoPosition, - kTransTypePosition, - kSound1Position, - kSkipFrameFlagsPosition = 8, - kBlendPosition, - kSound2Position, - kSound2TypePosition = 11, - kPaletePosition = 15 + kScriptIdPosition = 0, + kSoundType1Position, + kTransFlagsPosition, + kTransChunkSizePosition, + kTempoPosition, + kTransTypePosition, + kSound1Position, + kSkipFrameFlagsPosition = 8, + kBlendPosition, + kSound2Position, + kSound2TypePosition = 11, + kPaletePosition = 15 }; enum InkType { - kInkTypeCopy, - kInkTypeTransparent, - kInkTypeReverse, - kInkTypeGhost, - kInkTypeNotCopy, - kInkTypeNotTrans, - kInkTypeNotReverse, - kInkTypeNotGhost, - kInkTypeMatte, - kInkTypeMask, - //10-31 Not used (Lingo in a Nutshell) - kInkTypeBlend = 32, - kInkTypeAddPin, - kInkTypeAdd, - kInkTypeSubPin, - kInkTypeBackgndTrans, - kInkTypeLight, - kInkTypeSub, - kInkTypeDark + kInkTypeCopy, + kInkTypeTransparent, + kInkTypeReverse, + kInkTypeGhost, + kInkTypeNotCopy, + kInkTypeNotTrans, + kInkTypeNotReverse, + kInkTypeNotGhost, + kInkTypeMatte, + kInkTypeMask, + //10-31 Not used (Lingo in a Nutshell) + kInkTypeBlend = 32, + kInkTypeAddPin, + kInkTypeAdd, + kInkTypeSubPin, + kInkTypeBackgndTrans, + kInkTypeLight, + kInkTypeSub, + kInkTypeDark }; enum ScriptType { - kMovieScript = 0, - kSpriteScript = 1, - kFrameScript = 2, + kMovieScript = 0, + kSpriteScript = 1, + kFrameScript = 2, kMaxScriptType = 2 }; enum TransitionType { - kTransWipeRight = 1, - kTransWipeLeft, - kTransWipeDown, - kTransWipeUp, - kTransCenterOutHorizontal, - kTransEdgesInHorizontal, - kTransCenterOutVertical, - kTransEdgesInVertical, - kTransCenterOutSquare, - kTransEdgesInSquare, - kTransPushLeft, - kTransPushRight, - kTransPushDown, - kTransPushUp, - kTransRevealUp, - kTransRevealUpRight, - kTransRevealRight, - kTransRevealDown, - kTransRevealDownRight, - kTransRevealDownLeft, - kTransRevealLeft, - kTransRevealUpLeft, - kTransDissolvePixelsFast, - kTransDissolveBoxyRects, - kTransDissolveBoxySquares, - kTransDissolvePatterns, - kTransRandomRows, - kTransRandomColumns, - kTransCoverDown, - kTransCoverDownLeft, - kTransCoverDownRight, - kTransCoverLeft, - kTransCoverRight, - kTransCoverUp, - kTransCoverUpLeft, - kTransCoverUpRight, - kTransTypeVenitianBlind, - kTransTypeCheckerboard, - kTransTypeStripsBottomBuildLeft, - kTransTypeStripsBottomBuildRight, - kTransTypeStripsLeftBuildDown, - kTransTypeStripsLeftBuildUp, - kTransTypeStripsRightBuildDown, - kTransTypeStripsRightBuildUp, - kTransTypeStripsTopBuildLeft, - kTransTypeStripsTopBuildRight, - kTransZoomOpen, - kTransZoomClose, - kTransVerticalBinds, - kTransDissolveBitsTrans, - kTransDissolvePixels, - kTransDissolveBits + kTransWipeRight = 1, + kTransWipeLeft, + kTransWipeDown, + kTransWipeUp, + kTransCenterOutHorizontal, + kTransEdgesInHorizontal, + kTransCenterOutVertical, + kTransEdgesInVertical, + kTransCenterOutSquare, + kTransEdgesInSquare, + kTransPushLeft, + kTransPushRight, + kTransPushDown, + kTransPushUp, + kTransRevealUp, + kTransRevealUpRight, + kTransRevealRight, + kTransRevealDown, + kTransRevealDownRight, + kTransRevealDownLeft, + kTransRevealLeft, + kTransRevealUpLeft, + kTransDissolvePixelsFast, + kTransDissolveBoxyRects, + kTransDissolveBoxySquares, + kTransDissolvePatterns, + kTransRandomRows, + kTransRandomColumns, + kTransCoverDown, + kTransCoverDownLeft, + kTransCoverDownRight, + kTransCoverLeft, + kTransCoverRight, + kTransCoverUp, + kTransCoverUpLeft, + kTransCoverUpRight, + kTransTypeVenitianBlind, + kTransTypeCheckerboard, + kTransTypeStripsBottomBuildLeft, + kTransTypeStripsBottomBuildRight, + kTransTypeStripsLeftBuildDown, + kTransTypeStripsLeftBuildUp, + kTransTypeStripsRightBuildDown, + kTransTypeStripsRightBuildUp, + kTransTypeStripsTopBuildLeft, + kTransTypeStripsTopBuildRight, + kTransZoomOpen, + kTransZoomClose, + kTransVerticalBinds, + kTransDissolveBitsTrans, + kTransDissolvePixels, + kTransDissolveBits }; struct Cast { - CastType type; - Common::Rect initialRect; + CastType type; + Common::Rect initialRect; }; struct BitmapCast : Cast { - BitmapCast(Common::SeekableReadStream &stream); - Common::Rect boundingRect; - uint16 regX; - uint16 regY; - uint8 flags; + BitmapCast(Common::SeekableReadStream &stream); + + Common::Rect boundingRect; + uint16 regX; + uint16 regY; + uint8 flags; }; struct ShapeCast : Cast { - ShapeCast(Common::SeekableReadStream &stream); - byte shapeType; - uint16 pattern; - byte fgCol; - byte bgCol; - byte fillType; - byte lineThickness; - byte lineDirection; + ShapeCast(Common::SeekableReadStream &stream); + + byte shapeType; + uint16 pattern; + byte fgCol; + byte bgCol; + byte fillType; + byte lineThickness; + byte lineDirection; }; struct TextCast : Cast { - TextCast(Common::SeekableReadStream &stream); - byte borderSize; - byte gutterSize; - byte boxShadow; - - byte textType; - byte textAlign; - byte textShadow; - byte textFlags; + TextCast(Common::SeekableReadStream &stream); + + byte borderSize; + byte gutterSize; + byte boxShadow; + + byte textType; + byte textAlign; + byte textShadow; + byte textFlags; }; struct ButtonCast : TextCast { - ButtonCast(Common::SeekableReadStream &stream) : TextCast(stream) { - buttonType = stream.readUint16BE(); - } - //TODO types? - uint16 buttonType; + ButtonCast(Common::SeekableReadStream &stream) : TextCast(stream) { + buttonType = stream.readUint16BE(); + } + + //TODO types? + uint16 buttonType; }; struct CastInfo { - Common::String script; - Common::String name; - Common::String directory; - Common::String fileName; - Common::String type; + Common::String script; + Common::String name; + Common::String directory; + Common::String fileName; + Common::String type; }; struct PaletteInfo { - uint8 firstColor; - uint8 lastColor; - uint8 flags; - uint8 speed; - uint16 frameCount; + uint8 firstColor; + uint8 lastColor; + uint8 flags; + uint8 speed; + uint16 frameCount; }; class Sprite { public: - Sprite(); - Sprite(const Sprite &sprite); - bool _enabled; - byte _castId; - InkType _ink; - uint16 _trails; - Cast *_cast; - uint16 _flags; - Common::Point _startPoint; - uint16 _width; - uint16 _height; + Sprite(); + Sprite(const Sprite &sprite); + + bool _enabled; + byte _castId; + InkType _ink; + uint16 _trails; + Cast *_cast; + uint16 _flags; + Common::Point _startPoint; + uint16 _width; + uint16 _height; }; class Frame { public: - Frame(); - ~Frame(); - Frame(const Frame &frame); - void readChannel(Common::SeekableReadStream &stream, uint16 offset, uint16 size); - void prepareFrame(Score *score); - uint16 getSpriteIDFromPos(Common::Point pos); + Frame(); + Frame(const Frame &frame); + ~Frame(); + + void readChannel(Common::SeekableReadStream &stream, uint16 offset, uint16 size); + void prepareFrame(Score *score); + uint16 getSpriteIDFromPos(Common::Point pos); + private: - void playTransition(Score *score); - void playSoundChannel(); - void renderSprites(Archive &_movie, Graphics::ManagedSurface &surface, Common::Rect movieRect, bool renderTrail); - void readPaletteInfo(Common::SeekableReadStream &stream); - void readSprite(Common::SeekableReadStream &stream, uint16 offset, uint16 size); - void readMainChannels(Common::SeekableReadStream &stream, uint16 offset, uint16 size); - void drawBackgndTransSprite(Graphics::ManagedSurface &target, const Graphics::Surface &sprite, Common::Rect &drawRect); - void drawMatteSprite(Graphics::ManagedSurface &target, const Graphics::Surface &sprite, Common::Rect &drawRect); + void playTransition(Score *score); + void playSoundChannel(); + void renderSprites(Archive &_movie, Graphics::ManagedSurface &surface, Common::Rect movieRect, bool renderTrail); + void readPaletteInfo(Common::SeekableReadStream &stream); + void readSprite(Common::SeekableReadStream &stream, uint16 offset, uint16 size); + void readMainChannels(Common::SeekableReadStream &stream, uint16 offset, uint16 size); + void drawBackgndTransSprite(Graphics::ManagedSurface &target, const Graphics::Surface &sprite, Common::Rect &drawRect); + void drawMatteSprite(Graphics::ManagedSurface &target, const Graphics::Surface &sprite, Common::Rect &drawRect); + public: - uint8 _actionId; - uint8 _transDuration; - uint8 _transArea; //1 - Whole Stage, 0 - Changing Area - uint8 _transChunkSize; - TransitionType _transType; - PaletteInfo *_palette; - uint8 _tempo; - - uint16 _sound1; - uint8 _soundType1; - uint16 _sound2; - uint8 _soundType2; - - uint8 _skipFrameFlag; - uint8 _blend; - Common::Array _sprites; - Common::Array _drawRects; + uint8 _actionId; + uint8 _transDuration; + uint8 _transArea; //1 - Whole Stage, 0 - Changing Area + uint8 _transChunkSize; + TransitionType _transType; + PaletteInfo *_palette; + uint8 _tempo; + + uint16 _sound1; + uint8 _soundType1; + uint16 _sound2; + uint8 _soundType2; + + uint8 _skipFrameFlag; + uint8 _blend; + Common::Array _sprites; + Common::Array _drawRects; }; class Score { public: - Score(Archive &movie, Lingo &lingo, DirectorSound &soundManager); - ~Score(); - static Common::Rect readRect(Common::SeekableReadStream &stream); - void startLoop(); - void processEvents(); + Score(Archive &movie, Lingo &lingo, DirectorSound &soundManager); + ~Score(); + + static Common::Rect readRect(Common::SeekableReadStream &stream); + void startLoop(); + void processEvents(); + private: + void update(); + void readVersion(uint32 rid); + void loadConfig(Common::SeekableReadStream &stream); + void loadCastData(Common::SeekableReadStream &stream); + void loadFrames(Common::SeekableReadStream &stream); + void loadLabels(Common::SeekableReadStream &stream); + void loadActions(Common::SeekableReadStream &stream); + void loadCastInfo(Common::SeekableReadStream &stream, uint16 id); + void loadScriptText(Common::SeekableReadStream &stream); + void loadFileInfo(Common::SeekableReadStream &stream); + void loadFontMap(Common::SeekableReadStream &stream); + void dumpScript(uint16 id, ScriptType type, Common::String script); + Common::String getString(Common::String str); + Common::Array loadStrings(Common::SeekableReadStream &stream, uint32 &entryType, bool hasHeader = true); - void update(); - void readVersion(uint32 rid); - void loadConfig(Common::SeekableReadStream &stream); - void loadCastData(Common::SeekableReadStream &stream); - void loadFrames(Common::SeekableReadStream &stream); - void loadLabels(Common::SeekableReadStream &stream); - void loadActions(Common::SeekableReadStream &stream); - void loadCastInfo(Common::SeekableReadStream &stream, uint16 id); - void loadScriptText(Common::SeekableReadStream &stream); - void loadFileInfo(Common::SeekableReadStream &stream); - void loadFontMap(Common::SeekableReadStream &stream); - void dumpScript(uint16 id, ScriptType type, Common::String script); - Common::String getString(Common::String str); - Common::Array loadStrings(Common::SeekableReadStream &stream, uint32 &entryType, bool hasHeader = true); public: - Common::Array _frames; - Common::HashMap _casts; - Common::HashMap _castsInfo; - Common::HashMap _labels; - Common::HashMap _actions; - Common::HashMap _fontMap; - Graphics::ManagedSurface *_surface; - Graphics::ManagedSurface *_trailSurface; - Archive *_movieArchive; - Common::Rect _movieRect; + Common::Array _frames; + Common::HashMap _casts; + Common::HashMap _castsInfo; + Common::HashMap _labels; + Common::HashMap _actions; + Common::HashMap _fontMap; + Graphics::ManagedSurface *_surface; + Graphics::ManagedSurface *_trailSurface; + Archive *_movieArchive; + Common::Rect _movieRect; + private: - uint16 _versionMinor; - uint16 _versionMajor; - Common::String _macName; - Common::String _createdBy; - Common::String _changedBy; - Common::String _script; - Common::String _directory; - byte _currentFrameRate; - uint16 _castArrayStart; - uint16 _currentFrame; - uint32 _nextFrameTime; - uint32 _flags; - bool _stopPlay; - uint16 _castArrayEnd; - uint16 _movieScriptCount; - uint16 _stageColor; - Lingo *_lingo; - DirectorSound *_soundManager; + uint16 _versionMinor; + uint16 _versionMajor; + Common::String _macName; + Common::String _createdBy; + Common::String _changedBy; + Common::String _script; + Common::String _directory; + byte _currentFrameRate; + uint16 _castArrayStart; + uint16 _currentFrame; + uint32 _nextFrameTime; + uint32 _flags; + bool _stopPlay; + uint16 _castArrayEnd; + uint16 _movieScriptCount; + uint16 _stageColor; + Lingo *_lingo; + DirectorSound *_soundManager; }; } //End of namespace Director -- cgit v1.2.3