Navigation Menu

Skip to content

Commit

Permalink
ResourceSystem|CompositeTexture: Dispose of PatchNames once Composite…
Browse files Browse the repository at this point in the history 
…Textures are initialized, cleanup
  • Loading branch information
@danij-deng
danij-deng committed Jun 14, 2014
1 parent 0f6ec39 commit 1088c65
Show file tree
Hide file tree
Showing 4 changed files with 162 additions and 185 deletions.
40 changes: 15 additions & 25 deletions doomsday/client/include/resource/compositetexture.h
View file
@@ -1,8 +1,7 @@
/**
* @file compositetexture.h Composite Texture.
/** @file compositetexture.h Composite Texture.
*
* @author Copyright &copy; 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
* @author Copyright &copy; 2005-2013 Daniel Swanson <danij@dengine.net>
* @author Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
* @author Copyright © 2005-2013 Daniel Swanson <danij@dengine.net>
*
* @par License
* GPL: http://www.gnu.org/licenses/gpl.html
Expand Down Expand Up @@ -48,23 +47,17 @@ class CompositeTexture
/**
* Flags denoting usage traits.
*/
enum Flag
{
Custom = 0x1 /**< The texture does not originate from a definition
of the current game. */
enum Flag {
Custom = 0x1 ///< The texture does not originate from the current game.
};
Q_DECLARE_FLAGS(Flags, Flag)

/**
* Archived format variants.
*/
enum ArchiveFormat
{
/// Original format used by most id-tech 1 games.
DoomFormat,

/// StrifeFormat differs only slightly from DoomFormat (ommits some unused values).
StrifeFormat
enum ArchiveFormat {
DoomFormat, ///< Format used by most id-tech 1 games.
StrifeFormat ///< Differs slightly from DoomFormat (omits unused values).
};

/**
Expand All @@ -73,7 +66,7 @@ class CompositeTexture
struct Component
{
protected:
explicit Component(int xOrigin = 0, int yOrigin = 0);
explicit Component(Vector2i const &origin = Vector2i());

public:
/// Origin of the top left corner of the component (in texture space units).
Expand All @@ -92,20 +85,18 @@ class CompositeTexture
friend class CompositeTexture;

private:
/// Origin of the top left corner in the texture coordinate space.
Vector2i origin_;

/// Index of the lump containing the associated image.
lumpnum_t lumpNum_;
Vector2i _origin; ///< Top left corner in the texture coordinate space.
lumpnum_t _lumpNum; ///< Index of the lump containing the associated image.
};
typedef QList<Component> Components;

public:
/**
* Construct a default composite texture.
*/
explicit CompositeTexture(String percentEncodedName = "", int logicalWidth = 0,
int logicalHeight = 0, Flags _flags = 0);
explicit CompositeTexture(String const &percentEncodedName = "",
de::Vector2i logicalDimensions = de::Vector2i(),
Flags flags = 0);

/**
* Construct a composite texture by deserializing an archived id-tech 1
Expand Down Expand Up @@ -184,8 +175,7 @@ class CompositeTexture

Q_DECLARE_OPERATORS_FOR_FLAGS(CompositeTexture::Flags)

/// A map from String -> CompositeTexture
typedef QMultiMap<String, CompositeTexture *> CompositeTextureMap;
typedef CompositeTexture::Component CompositeTextureComponent;

} // namespace de

Expand Down
148 changes: 70 additions & 78 deletions doomsday/client/src/resource/compositetexture.cpp
View file
@@ -1,7 +1,7 @@
/** @file compositetexture.cpp Composite Texture Definition.
/** @file compositetexture.cpp Composite Texture.
*
* @authors Copyright &copy; 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
* @authors Copyright &copy; 2005-2013 Daniel Swanson <danij@dengine.net>
* @authors Copyright © 2003-2014 Jaakko Keränen <jaakko.keranen@iki.fi>
* @authors Copyright © 2005-2014 Daniel Swanson <danij@dengine.net>
*
* @par License
* GPL: http://www.gnu.org/licenses/gpl.html
Expand All @@ -18,70 +18,73 @@
* 02110-1301 USA</small>
*/

#include "de_platform.h"
#include "de_filesys.h"
#include "resource/patch.h"
#include "resource/patchname.h"
#include "de_base.h"
#include "resource/compositetexture.h"

#include <QList>
#include <QRect>
#include <de/ByteRefArray>
#include <de/String>
#include <de/Reader>
#include <QList>
#include <QRect>
#include <doomsday/filesys/fs_main.h>
#include <doomsday/filesys/lumpindex.h>
#include "resource/patch.h"
#include "resource/patchname.h"

#include "resource/compositetexture.h"
namespace de {
namespace internal {

using namespace de;
static String readAndPercentEncodeRawName(de::Reader &from)
{
/// @attention The raw ASCII name is not necessarily terminated.
char asciiName[9];
for(int i = 0; i < 8; ++i) { from >> asciiName[i]; }
asciiName[8] = 0;

// WAD format allows characters not typically permitted in native paths.
// To achieve uniformity we apply a percent encoding to the "raw" names.
return QString(QByteArray(asciiName).toPercentEncoding());
}

CompositeTexture::Component::Component(int xOrigin, int yOrigin)
: origin_(xOrigin, yOrigin), lumpNum_(-1)
} // namespace internal

using namespace internal;

CompositeTexture::Component::Component(Vector2i const &origin)
: _origin (origin)
, _lumpNum(-1)
{}

Vector2i const &CompositeTexture::Component::origin() const
{
return origin_;
return _origin;
}

lumpnum_t CompositeTexture::Component::lumpNum() const
{
return lumpNum_;
return _lumpNum;
}

DENG2_PIMPL(CompositeTexture)
DENG2_PIMPL_NOREF(CompositeTexture)
{
/// Symbolic name of the texture (percent encoded).
String name;

/// Flags denoting usage traits.
CompositeTexture::Flags flags;

/// Logical dimensions of the texture in map coordinate space units.
Vector2i logicalDimensions;

/// Dimensions of the texture in pixels.
Vector2i dimensions;

/// Index of this resource determined by the logic of the indexing algorithm
/// used by the original game.
int origIndex;

/// Set of component images to be composited.
Components components;

Instance(Public *i, String percentEncodedName, int width, int height,
CompositeTexture::Flags _flags)
: Base(i),
name(percentEncodedName),
flags(_flags),
logicalDimensions(width, height),
dimensions(0, 0),
origIndex(-1)
{}
String name; ///< Symbolic, percent encoded.
Flags flags; ///< Usage traits.
Vector2i logicalDimensions; ///< In map space units.
Vector2i dimensions; ///< In pixels.
int origIndex; ///< Determined by the original game logic.
Components components; ///< Images to be composited.

Instance() : origIndex(-1) {}
};

CompositeTexture::CompositeTexture(String percentEncodedName,
int width, int height, Flags flags)
: d(new Instance(this, percentEncodedName, width, height, flags))
{}
CompositeTexture::CompositeTexture(String const &percentEncodedName,
Vector2i logicalDimensions, Flags flags)
: d(new Instance)
{
d->name = percentEncodedName;
d->flags = flags;
d->logicalDimensions = logicalDimensions;
}

String CompositeTexture::percentEncodedName() const
{
Expand Down Expand Up @@ -128,18 +131,6 @@ void CompositeTexture::setOrigIndex(int newIndex)
d->origIndex = newIndex;
}

static String readAndPercentEncodeRawName(de::Reader &from)
{
/// @attention The raw ASCII name is not necessarily terminated.
char asciiName[9];
for(int i = 0; i < 8; ++i) { from >> asciiName[i]; }
asciiName[8] = 0;

// WAD format allows characters not typically permitted in native paths.
// To achieve uniformity we apply a percent encoding to the "raw" names.
return QString(QByteArray(asciiName).toPercentEncoding());
}

CompositeTexture *CompositeTexture::constructFrom(de::Reader &reader,
QList<PatchName> patchNames, ArchiveFormat format)
{
Expand All @@ -161,10 +152,8 @@ CompositeTexture *CompositeTexture::constructFrom(de::Reader &reader,

// We'll initially accept these values as logical dimensions. However
// we may need to adjust once we've checked the patch dimensions.
pctex->d->logicalDimensions.x = dimensions[0];
pctex->d->logicalDimensions.y = dimensions[1];

pctex->d->dimensions = pctex->d->logicalDimensions;
pctex->d->logicalDimensions =
pctex->d->dimensions = Vector2i(dimensions[0], dimensions[1]);

if(format == DoomFormat)
{
Expand All @@ -187,31 +176,30 @@ CompositeTexture *CompositeTexture::constructFrom(de::Reader &reader,
int foundComponentCount = 0;
for(dint16 i = 0; i < componentCount; ++i)
{
Component patch;
Component comp;

dint16 origin16[2];
reader >> origin16[0] >> origin16[1];
patch.origin_.x = origin16[0];
patch.origin_.y = origin16[1];
comp._origin = Vector2i(origin16[0], origin16[1]);

dint16 pnamesIndex;
reader >> pnamesIndex;

if(pnamesIndex < 0 || pnamesIndex >= patchNames.count())
{
LOG_RES_WARNING("Invalid PNAMES index %i in composite texture \"%s\", ignoring.")
<< pnamesIndex << pctex->d->name;
<< pnamesIndex << pctex->d->name;
}
else
{
patch.lumpNum_ = patchNames[pnamesIndex].lumpNum();
comp._lumpNum = patchNames[pnamesIndex].lumpNum();

if(patch.lumpNum() >= 0)
if(comp.lumpNum() >= 0)
{
/// There is now one more found component.
foundComponentCount += 1;

de::File1 &file = App_FileSystem().nameIndex()[patch.lumpNum_];
de::File1 &file = App_FileSystem().nameIndex()[comp.lumpNum()];

// If this a "custom" component - the whole texture is.
if(file.container().hasCustom())
Expand All @@ -226,44 +214,48 @@ CompositeTexture *CompositeTexture::constructFrom(de::Reader &reader,
try
{
Patch::Metadata info = Patch::loadMetadata(fileData);
geom |= QRect(QPoint(patch.origin_.x, patch.origin_.y),
geom |= QRect(QPoint(comp.origin().x, comp.origin().y),
QSize(info.dimensions.x, info.dimensions.y));
}
catch(IByteArray::OffsetError const &)
{
LOG_RES_WARNING("Component image \"%s\" (#%i) does not appear to be a valid Patch. "
"It may be missing from composite texture \"%s\".")
<< patchNames[pnamesIndex].percentEncodedNameRef() << i
<< pctex->d->name;
<< patchNames[pnamesIndex].percentEncodedNameRef() << i
<< pctex->d->name;
}
}
file.unlock();
}
else
{
LOG_RES_WARNING("Missing component image \"%s\" (#%i) in composite texture \"%s\", ignoring.")
<< patchNames[pnamesIndex].percentEncodedNameRef() << i
<< pctex->d->name;
<< patchNames[pnamesIndex].percentEncodedNameRef() << i
<< pctex->d->name;
}
}

// Skip the unused "step dir" and "color map" values.
reader >> unused16 >> unused16;

// Add this component.
pctex->d->components.push_back(patch);
pctex->d->components.push_back(comp);
}

// Clip and apply the final height.
if(geom.top() < 0) geom.setTop(0);
if(geom.height() > pctex->d->logicalDimensions.y)
{
pctex->d->dimensions.y = geom.height();
}

if(!foundComponentCount)
{
LOG_RES_WARNING("Zero valid component images in composite texture %s, ignoring.")
LOG_RES_WARNING("Zero valid component images in composite texture %s (will be ignored).")
<< pctex->d->name;
}

return pctex;
}

} // namespace de
4 changes: 2 additions & 2 deletions doomsday/client/src/resource/image.cpp
View file
Expand Up @@ -655,7 +655,7 @@ static Source loadPatchComposite(image_t &image, Texture const &tex,
CompositeTexture const &texDef = *reinterpret_cast<CompositeTexture *>(tex.userDataPointer());
DENG2_FOR_EACH_CONST(CompositeTexture::Components, i, texDef.components())
{
de::File1 &file = App_FileSystem().nameIndex()[i->lumpNum()];
de::File1 &file = App_FileSystem().nameIndex()[i->lumpNum()];
ByteRefArray fileData = ByteRefArray(file.cache(), file.size());

// A DOOM patch?
Expand All @@ -666,7 +666,7 @@ static Source loadPatchComposite(image_t &image, Texture const &tex,
Patch::Flags loadFlags;
if(maskZero) loadFlags |= Patch::MaskZero;

Block patchImg = Patch::load(fileData, loadFlags);
Block patchImg = Patch::load(fileData, loadFlags);
PatchMetadata info = Patch::loadMetadata(fileData);

Vector2i origin = i->origin();
Expand Down

0 comments on commit 1088c65

Please sign in to comment.