diff --git a/include/imodule.h b/include/imodule.h index ff9c0579f8..c1be5fd766 100644 --- a/include/imodule.h +++ b/include/imodule.h @@ -333,6 +333,8 @@ namespace module { #else #define DARKRADIANT_DLLEXPORT #endif +#elif defined(__APPLE__) + #define DARKRADIANT_DLLEXPORT __attribute__((visibility("default"))) #else #define DARKRADIANT_DLLEXPORT #endif diff --git a/libs/math/FloatTools.h b/libs/math/FloatTools.h index d9dd4fa489..9c89107995 100644 --- a/libs/math/FloatTools.h +++ b/libs/math/FloatTools.h @@ -65,7 +65,7 @@ inline Element float_mid(const Element& self, const Element& other) template inline int float_to_integer(const Element& f) { - return lrint(f); + return static_cast(lrint(f)); } /// \brief Returns \p f rounded to the nearest multiple of \p snap. diff --git a/libs/picomodel/lwo/clip.c b/libs/picomodel/lwo/clip.c index d83ea61f3a..92c89d39e9 100644 --- a/libs/picomodel/lwo/clip.c +++ b/libs/picomodel/lwo/clip.c @@ -86,7 +86,7 @@ lwClip *lwGetClip( picoMemStream_t *fp, int cksize ) /* remember where we started */ set_flen( 0 ); - pos = _pico_memstream_tell( fp ); + pos = (int)_pico_memstream_tell( fp ); /* index */ @@ -151,7 +151,7 @@ lwClip *lwGetClip( picoMemStream_t *fp, int cksize ) /* end of the CLIP chunk? */ - rlen = _pico_memstream_tell( fp ) - pos; + rlen = (int)_pico_memstream_tell( fp ) - pos; if ( cksize < rlen ) goto Fail; if ( cksize == rlen ) return clip; @@ -238,7 +238,7 @@ lwClip *lwGetClip( picoMemStream_t *fp, int cksize ) /* end of the CLIP chunk? */ - rlen = _pico_memstream_tell( fp ) - pos; + rlen = (int)_pico_memstream_tell( fp ) - pos; if ( cksize < rlen ) goto Fail; if ( cksize == rlen ) break; diff --git a/libs/picomodel/lwo/envelope.c b/libs/picomodel/lwo/envelope.c index c20f992287..a1c77ed490 100644 --- a/libs/picomodel/lwo/envelope.c +++ b/libs/picomodel/lwo/envelope.c @@ -61,7 +61,7 @@ lwEnvelope *lwGetEnvelope( picoMemStream_t *fp, int cksize ) /* remember where we started */ set_flen( 0 ); - pos = _pico_memstream_tell( fp ); + pos = (int)_pico_memstream_tell( fp ); /* index */ @@ -158,7 +158,7 @@ lwEnvelope *lwGetEnvelope( picoMemStream_t *fp, int cksize ) /* end of the ENVL chunk? */ - rlen = _pico_memstream_tell( fp ) - pos; + rlen = (int)_pico_memstream_tell( fp ) - pos; if ( cksize < rlen ) goto Fail; if ( cksize == rlen ) break; diff --git a/libs/picomodel/lwo/list.c b/libs/picomodel/lwo/list.c index d337296c4a..b3cfbab3a3 100644 --- a/libs/picomodel/lwo/list.c +++ b/libs/picomodel/lwo/list.c @@ -40,7 +40,7 @@ Append a node to a list. void lwListAdd( void **list, void *node ) { - lwNode *head, *tail; + lwNode *head, *tail = NULL; head = *(( lwNode ** ) list ); if ( !head ) { diff --git a/libs/picomodel/lwo/lwio.c b/libs/picomodel/lwo/lwio.c index 22e19b9680..c0b0553bcc 100644 --- a/libs/picomodel/lwo/lwio.c +++ b/libs/picomodel/lwo/lwio.c @@ -264,7 +264,7 @@ char *getS0( picoMemStream_t *fp ) if ( flen == FLEN_ERROR ) return NULL; - pos = _pico_memstream_tell( fp ); + pos = (int)_pico_memstream_tell( fp ); for ( i = 1; ; i++ ) { c = _pico_memstream_getc( fp ); if ( c <= 0 ) break; diff --git a/libs/picomodel/lwo/lwo2.c b/libs/picomodel/lwo/lwo2.c index b3dbc68ebf..5bbd931eb1 100644 --- a/libs/picomodel/lwo/lwo2.c +++ b/libs/picomodel/lwo/lwo2.c @@ -264,7 +264,7 @@ lwObject *lwGetObject( char *filename, picoMemStream_t *fp, unsigned int *failID Fail: if ( failID ) *failID = id; if ( fp ) { - if ( failpos ) *failpos = _pico_memstream_tell( fp ); + if ( failpos ) *failpos = (int)_pico_memstream_tell( fp ); } lwFreeObject( object ); return NULL; diff --git a/libs/picomodel/lwo/lwob.c b/libs/picomodel/lwo/lwob.c index 348d3e5114..e9b5187042 100644 --- a/libs/picomodel/lwo/lwob.c +++ b/libs/picomodel/lwo/lwob.c @@ -101,7 +101,7 @@ parameters. static int add_tvel( float pos[], float vel[], lwEnvelope **elist, int *nenvs ) { - lwEnvelope *env; + lwEnvelope *env = NULL; lwKey *key0, *key1; int i; @@ -219,7 +219,7 @@ lwSurface *lwGetSurface5( picoMemStream_t *fp, int cksize, lwObject *obj ) /* remember where we started */ set_flen( 0 ); - pos = _pico_memstream_tell( fp ); + pos = (int)_pico_memstream_tell( fp ); /* name */ @@ -692,7 +692,7 @@ lwObject *lwGetObject5( char *filename, picoMemStream_t *fp, unsigned int *failI Fail: if ( failID ) *failID = id; if ( fp ) { - if ( failpos ) *failpos = _pico_memstream_tell( fp ); + if ( failpos ) *failpos = (int)_pico_memstream_tell( fp ); } lwFreeObject( object ); return NULL; diff --git a/libs/picomodel/lwo/surface.c b/libs/picomodel/lwo/surface.c index 330f066af6..354dfcbf58 100644 --- a/libs/picomodel/lwo/surface.c +++ b/libs/picomodel/lwo/surface.c @@ -109,7 +109,7 @@ int lwGetTHeader( picoMemStream_t *fp, int hsz, lwTexture *tex ) /* remember where we started */ set_flen( 0 ); - pos = _pico_memstream_tell( fp ); + pos = (int)_pico_memstream_tell( fp ); /* ordinal string */ @@ -177,7 +177,7 @@ int lwGetTHeader( picoMemStream_t *fp, int hsz, lwTexture *tex ) if ( 6 != get_flen() ) return 0; } - set_flen( _pico_memstream_tell( fp ) - pos ); + set_flen( (int)_pico_memstream_tell( fp ) - pos ); return 1; } @@ -196,7 +196,7 @@ int lwGetTMap( picoMemStream_t *fp, int tmapsz, lwTMap *tmap ) unsigned short sz; int rlen, pos, i; - pos = _pico_memstream_tell( fp ); + pos = (int)_pico_memstream_tell( fp ); id = getU4( fp ); sz = getU2( fp ); if ( 0 > get_flen() ) return 0; @@ -266,7 +266,7 @@ int lwGetTMap( picoMemStream_t *fp, int tmapsz, lwTMap *tmap ) if ( 6 != get_flen() ) return 0; } - set_flen( _pico_memstream_tell( fp ) - pos ); + set_flen( (int)_pico_memstream_tell( fp ) - pos ); return 1; } @@ -284,7 +284,7 @@ int lwGetImageMap( picoMemStream_t *fp, int rsz, lwTexture *tex ) unsigned short sz; int rlen, pos; - pos = _pico_memstream_tell( fp ); + pos = (int)_pico_memstream_tell( fp ); id = getU4( fp ); sz = getU2( fp ); if ( 0 > get_flen() ) return 0; @@ -375,7 +375,7 @@ int lwGetImageMap( picoMemStream_t *fp, int rsz, lwTexture *tex ) if ( 6 != get_flen() ) return 0; } - set_flen( _pico_memstream_tell( fp ) - pos ); + set_flen( (int)_pico_memstream_tell( fp ) - pos ); return 1; } @@ -393,7 +393,7 @@ int lwGetProcedural( picoMemStream_t *fp, int rsz, lwTexture *tex ) unsigned short sz; int rlen, pos; - pos = _pico_memstream_tell( fp ); + pos = (int)_pico_memstream_tell( fp ); id = getU4( fp ); sz = getU2( fp ); if ( 0 > get_flen() ) return 0; @@ -450,7 +450,7 @@ int lwGetProcedural( picoMemStream_t *fp, int rsz, lwTexture *tex ) if ( 6 != get_flen() ) return 0; } - set_flen( _pico_memstream_tell( fp ) - pos ); + set_flen( (int)_pico_memstream_tell( fp ) - pos ); return 1; } @@ -468,7 +468,7 @@ int lwGetGradient( picoMemStream_t *fp, int rsz, lwTexture *tex ) unsigned short sz; int rlen, pos, i, j, nkeys; - pos = _pico_memstream_tell( fp ); + pos = (int)_pico_memstream_tell( fp ); id = getU4( fp ); sz = getU2( fp ); if ( 0 > get_flen() ) return 0; @@ -548,7 +548,7 @@ int lwGetGradient( picoMemStream_t *fp, int rsz, lwTexture *tex ) if ( 6 != get_flen() ) return 0; } - set_flen( _pico_memstream_tell( fp ) - pos ); + set_flen( (int)_pico_memstream_tell( fp ) - pos ); return 1; } @@ -618,7 +618,7 @@ lwPlugin *lwGetShader( picoMemStream_t *fp, int bloksz ) shdr = _pico_calloc( 1, sizeof( lwPlugin )); if ( !shdr ) return NULL; - pos = _pico_memstream_tell( fp ); + pos = (int)_pico_memstream_tell( fp ); set_flen( 0 ); hsz = getU2( fp ); shdr->ord = getS0( fp ); @@ -682,7 +682,7 @@ lwPlugin *lwGetShader( picoMemStream_t *fp, int bloksz ) if ( 6 != get_flen() ) goto Fail; } - set_flen( _pico_memstream_tell( fp ) - pos ); + set_flen( (int)_pico_memstream_tell( fp ) - pos ); return shdr; Fail: @@ -838,7 +838,7 @@ lwSurface *lwGetSurface( picoMemStream_t *fp, int cksize ) /* remember where we started */ set_flen( 0 ); - pos = _pico_memstream_tell( fp ); + pos = (int)_pico_memstream_tell( fp ); /* names */ diff --git a/libs/picomodel/pm_3ds.c b/libs/picomodel/pm_3ds.c index b573c893e1..c9be4519d0 100644 --- a/libs/picomodel/pm_3ds.c +++ b/libs/picomodel/pm_3ds.c @@ -650,7 +650,7 @@ static int DoNextEditorDataChunk (T3dsLoaderPers *pers, long endofs) #endif } /* skip unknown chunk */ - pers->cofs = nextofs; + pers->cofs = (int)nextofs; if (pers->cofs >= pers->maxofs) break; } return 1; @@ -707,7 +707,7 @@ static int DoNextChunk (T3dsLoaderPers *pers, int endofs) continue; } /* skip unknown chunk */ - pers->cofs = nextofs; + pers->cofs = (int)nextofs; if (pers->cofs >= pers->maxofs) break; } return 1; diff --git a/libs/picomodel/pm_ase.c b/libs/picomodel/pm_ase.c index 337fe8bea4..0609ed93bd 100644 --- a/libs/picomodel/pm_ase.c +++ b/libs/picomodel/pm_ase.c @@ -954,7 +954,7 @@ static picoModel_t *_ase_load( PM_PARAMS_LOAD ) float transValue = 0.0f, shineValue = 1.0f; picoColor_t ambientColor, diffuseColor, specularColor; char *mapname = NULL; - int subMtlId, subMaterialLevel = -1; + int subMtlId = -1, subMaterialLevel = -1; float uOffset = 0.0f; float vOffset = 0.0f; float uScale = 1.0f; diff --git a/libs/picomodel/pm_fm.c b/libs/picomodel/pm_fm.c index 28cc851425..b7a86e0383 100644 --- a/libs/picomodel/pm_fm.c +++ b/libs/picomodel/pm_fm.c @@ -449,7 +449,7 @@ static picoModel_t *_fm_load( PM_PARAMS_LOAD ) #endif continue; } - else if ( (p_index_LUT[triangle->index_xyz[j]].next == NULL) ) // Not equal to Main entry, and no LL entry + else if ( p_index_LUT[triangle->index_xyz[j]].next == NULL ) // Not equal to Main entry, and no LL entry { // Add first entry of LL from Main p_index_LUT2 = (index_LUT_t *)_pico_alloc(sizeof(index_LUT_t)); if (p_index_LUT2 == NULL) diff --git a/libs/picomodel/pm_obj.c b/libs/picomodel/pm_obj.c index c4f285551b..809969a946 100644 --- a/libs/picomodel/pm_obj.c +++ b/libs/picomodel/pm_obj.c @@ -664,7 +664,7 @@ static picoModel_t *_obj_load( PM_PARAMS_LOAD ) picoVec3_t normals[ 4 ]; picoVec2_t coords [ 4 ]; - int iv [ 4 ], has_v; + int iv [ 4 ], has_v = 0; int ivt[ 4 ], has_vt = 0; int ivn[ 4 ], has_vn = 0; int have_quad = 0; diff --git a/libs/render/RenderableSpacePartition.h b/libs/render/RenderableSpacePartition.h index 282c2b70fc..96e484a3d9 100644 --- a/libs/render/RenderableSpacePartition.h +++ b/libs/render/RenderableSpacePartition.h @@ -131,7 +131,7 @@ class RenderableSpacePartition : } } - void render(const RenderInfo& info) const + void render(const RenderInfo& info) const override { if (_spacePartition != NULL) { diff --git a/libs/scene/Node.h b/libs/scene/Node.h index 156c610559..92886008c2 100644 --- a/libs/scene/Node.h +++ b/libs/scene/Node.h @@ -84,12 +84,12 @@ class Node : static unsigned long getNewId(); // Default name for generic nodes - std::string name() const { return "node"; } + std::string name() const override { return "node"; } - void setSceneGraph(const GraphPtr& sceneGraph); + void setSceneGraph(const GraphPtr& sceneGraph) override; - bool isRoot() const; - void setIsRoot(bool isRoot); + bool isRoot() const override; + void setIsRoot(bool isRoot) override; void enable(unsigned int state) override; void disable(unsigned int state) override; @@ -102,34 +102,35 @@ class Node : void setForcedVisibility(bool forceVisible, bool includeChildren) override; // Layered implementation - virtual void addToLayer(int layerId); - virtual void removeFromLayer(int layerId); - virtual void moveToLayer(int layerId); - virtual LayerList getLayers() const; - virtual void assignToLayers(const LayerList& newLayers); + virtual void addToLayer(int layerId) override; + virtual void removeFromLayer(int layerId) override; + virtual void moveToLayer(int layerId) override; + virtual LayerList getLayers() const override; + virtual void assignToLayers(const LayerList& newLayers) override; virtual void addChildNode(const INodePtr& node) override; virtual void addChildNodeToFront(const INodePtr& node) override; virtual void removeChildNode(const INodePtr& node) override; virtual bool hasChildNodes() const override; - virtual void traverse(NodeVisitor& visitor); - virtual void traverseChildren(NodeVisitor& visitor) const; - virtual bool foreachNode(const VisitorFunc& functor) const; + virtual void traverse(NodeVisitor& visitor) override; + virtual void traverseChildren(NodeVisitor& visitor) const override; + virtual bool foreachNode(const VisitorFunc& functor) const override; - virtual void setParent(const INodePtr& parent); - virtual scene::INodePtr getParent() const; + virtual void setParent(const INodePtr& parent) override; + virtual scene::INodePtr getParent() const override; - const AABB& worldAABB() const; + const AABB& worldAABB() const override; const AABB& childBounds() const; - virtual void boundsChanged(); + virtual void boundsChanged() override; /** * Return the filtered status of this Instance. */ - virtual bool isFiltered() const { + virtual bool isFiltered() const override + { return (_state & eFiltered) != 0; } @@ -137,7 +138,8 @@ class Node : * Set the filtered status of this Node. Setting filtered to true will * prevent the node from being rendered. */ - virtual void setFiltered(bool filtered) { + virtual void setFiltered(bool filtered) override + { if (filtered) { _state |= eFiltered; } @@ -146,11 +148,11 @@ class Node : } } - const Matrix4& localToWorld() const; + const Matrix4& localToWorld() const override; void transformChangedLocal() override; - void transformChanged(); + void transformChanged() override; void setTransformChangedCallback(const Callback& callback); @@ -164,7 +166,7 @@ class Node : virtual void onRemoveFromScene(IMapRootNode& root) override; // Returns TRUE if this node is inserted in the scene, FALSE otherwise - bool inScene() const + bool inScene() const override { return _instantiated; } @@ -177,7 +179,7 @@ class Node : scene::Path getPath(); // Returns a shared reference to this node - scene::INodePtr getSelf(); + scene::INodePtr getSelf() override; IRenderEntity* getRenderEntity() const override { @@ -192,7 +194,7 @@ class Node : // Base renderable implementation virtual RenderSystemPtr getRenderSystem() const; - virtual void setRenderSystem(const RenderSystemPtr& renderSystem); + virtual void setRenderSystem(const RenderSystemPtr& renderSystem) override; protected: // Method for subclasses to check whether this node is forcedly visible diff --git a/libs/wxutil/TreeModel.cpp b/libs/wxutil/TreeModel.cpp index 8f8b568be6..5479ce835a 100644 --- a/libs/wxutil/TreeModel.cpp +++ b/libs/wxutil/TreeModel.cpp @@ -623,7 +623,7 @@ unsigned int TreeModel::GetChildren(const wxDataViewItem& item, wxDataViewItemAr children.Add((*iter)->item); } - return owningNode->children.size(); + return static_cast(owningNode->children.size()); } wxDataViewItem TreeModel::GetRoot() @@ -668,82 +668,80 @@ int TreeModel::Compare(const wxDataViewItem& item1, const wxDataViewItem& item2, } // When clicking on the dataviewctrl headers, we need to support some default algorithm - if (column >= 0) - { - // implement a few comparison types - switch (_columns[column].type) - { - case Column::String: - { - return ascending ? - node1->values[column].GetString().CmpNoCase(node2->values[column].GetString()) : - node2->values[column].GetString().CmpNoCase(node1->values[column].GetString()); - } - - case Column::IconText: - { - wxDataViewIconText val1; - val1 << node1->values[column]; - - wxDataViewIconText val2; - val2 << node2->values[column]; - - return ascending ? val1.GetText().CmpNoCase(val2.GetText()) : - val2.GetText().CmpNoCase(val1.GetText()); - } - - case Column::Double: - { - double val1 = node1->values[column].GetDouble(); - double val2 = node2->values[column].GetDouble(); - - if (val1 == val2) return 0; - - return ascending ? (val1 < val2 ? -1 : 1) : - (val2 < val1 ? -1 : 1); - } - - case Column::Integer: - { - long val1 = node1->values[column].GetInteger(); - long val2 = node2->values[column].GetInteger(); - - if (val1 == val2) return 0; - - return ascending ? (val1 < val2 ? -1 : 1) : - (val2 < val1 ? -1 : 1); - } - - case Column::Boolean: - { - bool val1 = node1->values[column].GetBool(); - bool val2 = node2->values[column].GetBool(); - - if (val1 == val2) return 0; - - return ascending ? (!val1 ? -1 : 1) : (val1 ? -1 : 1); - } - - case Column::Pointer: - { - void* val1 = node1->values[column].GetVoidPtr(); - void* val2 = node2->values[column].GetVoidPtr(); - - if (val1 == val2) return 0; - - return ascending ? (val1 < val2 ? -1 : 1) : - (val2 < val1 ? -1 : 1); - } - - case Column::Icon: - { - return 0; // no sense in comparing icons - } - - default: - return 0; // default case - }; - } + + // implement a few comparison types + switch (_columns[column].type) + { + case Column::String: + { + return ascending ? + node1->values[column].GetString().CmpNoCase(node2->values[column].GetString()) : + node2->values[column].GetString().CmpNoCase(node1->values[column].GetString()); + } + + case Column::IconText: + { + wxDataViewIconText val1; + val1 << node1->values[column]; + + wxDataViewIconText val2; + val2 << node2->values[column]; + + return ascending ? val1.GetText().CmpNoCase(val2.GetText()) : + val2.GetText().CmpNoCase(val1.GetText()); + } + + case Column::Double: + { + double val1 = node1->values[column].GetDouble(); + double val2 = node2->values[column].GetDouble(); + + if (val1 == val2) return 0; + + return ascending ? (val1 < val2 ? -1 : 1) : + (val2 < val1 ? -1 : 1); + } + + case Column::Integer: + { + long val1 = node1->values[column].GetInteger(); + long val2 = node2->values[column].GetInteger(); + + if (val1 == val2) return 0; + + return ascending ? (val1 < val2 ? -1 : 1) : + (val2 < val1 ? -1 : 1); + } + + case Column::Boolean: + { + bool val1 = node1->values[column].GetBool(); + bool val2 = node2->values[column].GetBool(); + + if (val1 == val2) return 0; + + return ascending ? (!val1 ? -1 : 1) : (val1 ? -1 : 1); + } + + case Column::Pointer: + { + void* val1 = node1->values[column].GetVoidPtr(); + void* val2 = node2->values[column].GetVoidPtr(); + + if (val1 == val2) return 0; + + return ascending ? (val1 < val2 ? -1 : 1) : + (val2 < val1 ? -1 : 1); + } + + case Column::Icon: + { + return 0; // no sense in comparing icons + } + + default: + return 0; // default case + }; return 0; } diff --git a/libs/wxutil/TreeModel.h b/libs/wxutil/TreeModel.h index be53dcc31a..b29e736f36 100644 --- a/libs/wxutil/TreeModel.h +++ b/libs/wxutil/TreeModel.h @@ -218,7 +218,7 @@ class TreeModel : int getInteger() const { - return getVariant().GetInteger(); + return static_cast(getVariant().GetInteger()); } double getDouble() const @@ -435,30 +435,31 @@ class TreeModel : // Base class implementation / overrides - virtual bool HasDefaultCompare() const; - virtual unsigned int GetColumnCount() const; + virtual bool HasDefaultCompare() const override; + virtual unsigned int GetColumnCount() const override; // return type as reported by wxVariant - virtual wxString GetColumnType(unsigned int col) const; + virtual wxString GetColumnType(unsigned int col) const override; // get value into a wxVariant virtual void GetValue(wxVariant &variant, - const wxDataViewItem &item, unsigned int col) const; + const wxDataViewItem &item, unsigned int col) const override; virtual bool SetValue(const wxVariant &variant, const wxDataViewItem &item, - unsigned int col); + unsigned int col) override; - virtual bool GetAttr(const wxDataViewItem& item, unsigned int col, wxDataViewItemAttr& attr) const; + virtual bool GetAttr(const wxDataViewItem& item, unsigned int col, wxDataViewItemAttr& attr) const override; - virtual wxDataViewItem GetParent(const wxDataViewItem &item) const; - virtual bool IsContainer(const wxDataViewItem& item) const; + virtual wxDataViewItem GetParent(const wxDataViewItem &item) const override; + virtual bool IsContainer(const wxDataViewItem& item) const override; - virtual unsigned int GetChildren(const wxDataViewItem& item, wxDataViewItemArray& children) const; + virtual unsigned int GetChildren(const wxDataViewItem& item, wxDataViewItemArray& children) const override; virtual wxDataViewItem GetRoot(); - virtual bool IsListModel() const; + virtual bool IsListModel() const override; - virtual int Compare(const wxDataViewItem& item1, const wxDataViewItem& item2, unsigned int column, bool ascending) const; + virtual int Compare(const wxDataViewItem& item1, const wxDataViewItem& item2, + unsigned int column, bool ascending) const override; protected: // Returns a reference to the actual rootnode, only allowed for use in subclasses diff --git a/libs/wxutil/TreeModelFilter.cpp b/libs/wxutil/TreeModelFilter.cpp index 9f6b71d16f..5d59c8690a 100644 --- a/libs/wxutil/TreeModelFilter.cpp +++ b/libs/wxutil/TreeModelFilter.cpp @@ -213,7 +213,7 @@ unsigned int TreeModelFilter::GetChildren(const wxDataViewItem& item, wxDataView } }); - return children.size(); + return static_cast(children.size()); } } // namespace diff --git a/plugins/archivezip/ZipArchive.cpp b/plugins/archivezip/ZipArchive.cpp index 79f9e2fe97..fd5d04f322 100644 --- a/plugins/archivezip/ZipArchive.cpp +++ b/plugins/archivezip/ZipArchive.cpp @@ -79,8 +79,6 @@ ArchiveTextFilePtr ZipArchive::openTextFile(const std::string& name) { ZipRecord* file = i->second.file(); - FileInputStream::size_type position = 0; - { // Guard against concurrent access std::lock_guard lock(_streamLock); diff --git a/plugins/dm.editing/AIHeadPropertyEditor.h b/plugins/dm.editing/AIHeadPropertyEditor.h index 1ab7f9f412..9304891fba 100644 --- a/plugins/dm.editing/AIHeadPropertyEditor.h +++ b/plugins/dm.editing/AIHeadPropertyEditor.h @@ -38,7 +38,7 @@ class AIHeadPropertyEditor : const std::string& key, const std::string& options) override; - std::string runDialog(Entity* entity, const std::string& key); + std::string runDialog(Entity* entity, const std::string& key) override; private: void onChooseButton(wxCommandEvent& ev); diff --git a/plugins/dm.editing/AIVocalSetPropertyEditor.h b/plugins/dm.editing/AIVocalSetPropertyEditor.h index f91a56c3b9..41e49e9edc 100644 --- a/plugins/dm.editing/AIVocalSetPropertyEditor.h +++ b/plugins/dm.editing/AIVocalSetPropertyEditor.h @@ -38,7 +38,7 @@ class AIVocalSetPropertyEditor : const std::string& key, const std::string& options) override; - std::string runDialog(Entity* entity, const std::string& key); + std::string runDialog(Entity* entity, const std::string& key) override; private: void onChooseButton(wxCommandEvent& ev); diff --git a/plugins/dm.gui/ReadableEditorDialog.cpp b/plugins/dm.gui/ReadableEditorDialog.cpp index a24c521416..2677fdc101 100644 --- a/plugins/dm.gui/ReadableEditorDialog.cpp +++ b/plugins/dm.gui/ReadableEditorDialog.cpp @@ -46,9 +46,6 @@ namespace const char* const NO_ENTITY_ERROR = N_("Cannot run Readable Editor on this selection.\n" "Please select a single XData entity."); - const char* const LABEL_PAGE_RELATED = N_("Page Editing:"); - const char* const LABEL_GENERAL_PROPERTIES = N_("General Properties:"); - enum MenuItemId { InsertWholePage = 1, diff --git a/plugins/dm.gui/XData.cpp b/plugins/dm.gui/XData.cpp index 8461f2651a..1bd980aae9 100644 --- a/plugins/dm.gui/XData.cpp +++ b/plugins/dm.gui/XData.cpp @@ -70,7 +70,7 @@ FileStatus XData::xport( const std::string& filename, ExporterCommand cmd ) ss << file.rdbuf(); std::string OutString = ss.str(); file.close(); - int DefLength = getDefLength(OutString.substr(_definitionStart)); + std::size_t DefLength = getDefLength(OutString.substr(_definitionStart)); if (DefLength == 0) //If the definitionlength can't be obtained, the merge fails. return MergeFailed; OutString.erase(_definitionStart, DefLength); diff --git a/plugins/dm.objectives/ComponentType.cpp b/plugins/dm.objectives/ComponentType.cpp index 16419bcaf4..c03ff2532c 100644 --- a/plugins/dm.objectives/ComponentType.cpp +++ b/plugins/dm.objectives/ComponentType.cpp @@ -2,6 +2,7 @@ #include "util/ObjectivesException.h" #include "i18n.h" #include +#include "string/convert.h" namespace objectives { @@ -166,7 +167,7 @@ ComponentType ComponentType::getComponentType(int id) if (i != getMap().end()) return i->second; else - throw ObjectivesException("Invalid ComponentType ID: " + id); + throw ObjectivesException("Invalid ComponentType ID: " + string::to_string(id)); } } diff --git a/plugins/dm.stimresponse/EffectEditor.cpp b/plugins/dm.stimresponse/EffectEditor.cpp index 15b3b25b49..3f8cc93d1d 100644 --- a/plugins/dm.stimresponse/EffectEditor.cpp +++ b/plugins/dm.stimresponse/EffectEditor.cpp @@ -20,9 +20,6 @@ namespace ui namespace { const char* const WINDOW_TITLE = N_("Edit Response Effect"); - const int WINDOW_MIN_WIDTH = 300; - const int WINDOW_MIN_HEIGHT = 50; - // The name of the _SELF entity as parsed by the response scripts const char* const GKEY_ENTITY_SELF = "/stimResponseSystem/selfEntity"; } diff --git a/plugins/dm.stimresponse/ResponseEditor.cpp b/plugins/dm.stimresponse/ResponseEditor.cpp index 180af47a7c..3f88ca2093 100644 --- a/plugins/dm.stimresponse/ResponseEditor.cpp +++ b/plugins/dm.stimresponse/ResponseEditor.cpp @@ -20,11 +20,6 @@ namespace ui { -namespace -{ - const char* const LABEL_RESPONSE_EFFECTS = N_("Response Effects"); -} - ResponseEditor::ResponseEditor(wxWindow* parent, StimTypes& stimTypes) : ClassEditor(parent, stimTypes) { diff --git a/plugins/dm.stimresponse/ResponseEditor.h b/plugins/dm.stimresponse/ResponseEditor.h index a0b8df4b8a..a127e153bf 100644 --- a/plugins/dm.stimresponse/ResponseEditor.h +++ b/plugins/dm.stimresponse/ResponseEditor.h @@ -50,17 +50,17 @@ class ResponseEditor : /** greebo: Sets the new entity (updates the treeviews) */ - virtual void setEntity(const SREntityPtr& entity); + virtual void setEntity(const SREntityPtr& entity) override; /** greebo: Updates the widgets (e.g. after a selection change) */ - void update(); + void update() override; private: /** greebo: Updates the associated text fields when a check box * is toggled. */ - void checkBoxToggled(wxCheckBox* toggleButton); + void checkBoxToggled(wxCheckBox* toggleButton) override; /** greebo: Adds a new response effect to the list. */ @@ -98,7 +98,7 @@ class ResponseEditor : /** greebo: Adds a new default response to the entity */ - void addSR(); + void addSR() override; // Widget creator helpers void createContextMenu(); @@ -106,7 +106,7 @@ class ResponseEditor : /** greebo: Gets called when the response selection gets changed */ - virtual void selectionChanged(); + virtual void selectionChanged() override; void openSRListContextMenu() override; diff --git a/plugins/dm.stimresponse/StimEditor.h b/plugins/dm.stimresponse/StimEditor.h index 71a6566c52..ebbdfa389a 100644 --- a/plugins/dm.stimresponse/StimEditor.h +++ b/plugins/dm.stimresponse/StimEditor.h @@ -92,11 +92,11 @@ class StimEditor : /** greebo: Sets the new entity (is called by the StimResponseEditor class) */ - virtual void setEntity(const SREntityPtr& entity); + virtual void setEntity(const SREntityPtr& entity) override; /** greebo: Updates the widgets (e.g. after a selection change) */ - void update(); + void update() override; private: /** greebo: Retrieves the formatted timer string h:m:s:ms @@ -105,17 +105,17 @@ class StimEditor : /** greebo: Adds a new stim to the list */ - void addSR(); + void addSR() override; /** greebo: Gets called when a spinbutton changes, overrides the * method from the base class. */ - void spinButtonChanged(wxSpinCtrl* ctrl); + void spinButtonChanged(wxSpinCtrl* ctrl) override; /** greebo: Updates the associated text fields when a check box * is toggled. */ - void checkBoxToggled(wxCheckBox* toggleButton); + void checkBoxToggled(wxCheckBox* toggleButton) override; /** greebo: As the name states, this creates the context menu widgets. */ @@ -123,7 +123,7 @@ class StimEditor : /** greebo: Gets called when the stim selection gets changed */ - virtual void selectionChanged(); + virtual void selectionChanged() override; void openSRListContextMenu() override; diff --git a/plugins/dm.stimresponse/StimResponseEditor.h b/plugins/dm.stimresponse/StimResponseEditor.h index 6c6f87e32c..b73086126a 100644 --- a/plugins/dm.stimresponse/StimResponseEditor.h +++ b/plugins/dm.stimresponse/StimResponseEditor.h @@ -55,7 +55,7 @@ class StimResponseEditor : StimResponseEditor(); // override DialogBase - int ShowModal(); + int ShowModal() override; // Command target to toggle the dialog static void ShowDialog(const cmd::ArgumentList& args); diff --git a/plugins/eclassmgr/Doom3EntityClass.cpp b/plugins/eclassmgr/Doom3EntityClass.cpp index c0fabc2428..f044afad07 100644 --- a/plugins/eclassmgr/Doom3EntityClass.cpp +++ b/plugins/eclassmgr/Doom3EntityClass.cpp @@ -136,31 +136,31 @@ class Doom3EntityClass::Attachments { boost::optional keySuffix; - if (keySuffix = suffixedKey(key, DEF_ATTACH)) + if ((keySuffix = suffixedKey(key, DEF_ATTACH))) { _objects[*keySuffix].className = value; } - else if (keySuffix = suffixedKey(key, NAME_ATTACH)) + else if ((keySuffix = suffixedKey(key, NAME_ATTACH))) { _objects[*keySuffix].name = value; } - else if (keySuffix = suffixedKey(key, POS_ATTACH)) + else if ((keySuffix = suffixedKey(key, POS_ATTACH))) { _objects[*keySuffix].posName = value; } - else if (keySuffix = suffixedKey(key, ATTACH_POS_NAME)) + else if ((keySuffix = suffixedKey(key, ATTACH_POS_NAME))) { _positions[*keySuffix].name = value; } - else if (keySuffix = suffixedKey(key, ATTACH_POS_ORIGIN)) + else if ((keySuffix = suffixedKey(key, ATTACH_POS_ORIGIN))) { _positions[*keySuffix].origin = string::convert(value); } - else if (keySuffix = suffixedKey(key, ATTACH_POS_ANGLES)) + else if ((keySuffix = suffixedKey(key, ATTACH_POS_ANGLES))) { _positions[*keySuffix].angles = string::convert(value); } - else if (keySuffix = suffixedKey(key, ATTACH_POS_JOINT)) + else if ((keySuffix = suffixedKey(key, ATTACH_POS_JOINT))) { _positions[*keySuffix].joint = value; } diff --git a/plugins/eclassmgr/EClassManager.h b/plugins/eclassmgr/EClassManager.h index 96c7893644..c1645ad1f1 100644 --- a/plugins/eclassmgr/EClassManager.h +++ b/plugins/eclassmgr/EClassManager.h @@ -67,8 +67,8 @@ class EClassManager : void unrealise() override; // VFS::Observer implementation - virtual void onFileSystemInitialise(); - virtual void onFileSystemShutdown(); + virtual void onFileSystemInitialise() override; + virtual void onFileSystemShutdown() override; // Find the modeldef with the given name virtual IModelDefPtr findModel(const std::string& name) override; diff --git a/plugins/entity/EntityCreator.h b/plugins/entity/EntityCreator.h index 85b739c331..ef0f7011f4 100644 --- a/plugins/entity/EntityCreator.h +++ b/plugins/entity/EntityCreator.h @@ -18,10 +18,10 @@ class Doom3EntityCreator : ITargetManagerPtr createTargetManager() override; // RegisterableModule implementation - virtual const std::string& getName() const; - virtual const StringSet& getDependencies() const; - virtual void initialiseModule(const ApplicationContext& ctx); - virtual void shutdownModule(); + virtual const std::string& getName() const override; + virtual const StringSet& getDependencies() const override; + virtual void initialiseModule(const ApplicationContext& ctx) override; + virtual void shutdownModule() override; }; typedef std::shared_ptr Doom3EntityCreatorPtr; diff --git a/plugins/entity/EntityNode.h b/plugins/entity/EntityNode.h index 716e34befd..d6a2296bcb 100644 --- a/plugins/entity/EntityNode.h +++ b/plugins/entity/EntityNode.h @@ -85,37 +85,37 @@ class EntityNode : virtual ~EntityNode(); // IEntityNode implementation - Entity& getEntity(); - virtual void refreshModel(); + Entity& getEntity() override; + virtual void refreshModel() override; // RenderEntity implementation - virtual float getShaderParm(int parmNum) const; - virtual const Vector3& getDirection() const; + virtual float getShaderParm(int parmNum) const override; + virtual const Vector3& getDirection() const override; // SelectionTestable implementation - virtual void testSelect(Selector& selector, SelectionTest& test); + virtual void testSelect(Selector& selector, SelectionTest& test) override; // Namespaced implementation // Gets/sets the namespace of this named object - std::string getName() const; - void setNamespace(INamespace* space); - INamespace* getNamespace() const; - void connectNameObservers(); - void disconnectNameObservers(); - void changeName(const std::string& newName); + std::string getName() const override; + void setNamespace(INamespace* space) override; + INamespace* getNamespace() const override; + void connectNameObservers() override; + void disconnectNameObservers() override; + void changeName(const std::string& newName) override; - void attachNames(); - void detachNames(); + void attachNames() override; + void detachNames() override; virtual void onInsertIntoScene(scene::IMapRootNode& root) override; virtual void onRemoveFromScene(scene::IMapRootNode& root) override; // Sets/clears render entity references on child nodes - virtual void onChildAdded(const scene::INodePtr& child); - virtual void onChildRemoved(const scene::INodePtr& child); + virtual void onChildAdded(const scene::INodePtr& child) override; + virtual void onChildRemoved(const scene::INodePtr& child) override; - virtual std::string name() const; - Type getNodeType() const; + virtual std::string name() const override; + Type getNodeType() const override; // Renderable implementation, can be overridden by subclasses virtual void renderSolid(RenderableCollector& collector, const VolumeTest& volume) const override; @@ -133,11 +133,11 @@ class EntityNode : ModelKey& getModelKey(); // needed by the Doom3Group class, could be a fixme - const ShaderPtr& getWireShader() const; + const ShaderPtr& getWireShader() const override; const ShaderPtr& getFillShader() const; - virtual void onPostUndo(); - virtual void onPostRedo(); + virtual void onPostUndo() override; + virtual void onPostRedo() override; protected: virtual void onModelKeyChanged(const std::string& value); diff --git a/plugins/entity/doom3group/Doom3GroupNode.h b/plugins/entity/doom3group/Doom3GroupNode.h index f0b9b679e0..d92982916d 100644 --- a/plugins/entity/doom3group/Doom3GroupNode.h +++ b/plugins/entity/doom3group/Doom3GroupNode.h @@ -50,20 +50,20 @@ class Doom3GroupNode : virtual ~Doom3GroupNode(); // CurveNode implementation - virtual bool hasEmptyCurve(); - virtual void appendControlPoints(unsigned int numPoints); - virtual void removeSelectedControlPoints(); - virtual void insertControlPointsAtSelected(); - virtual void convertCurveType(); + virtual bool hasEmptyCurve() override; + virtual void appendControlPoints(unsigned int numPoints) override; + virtual void removeSelectedControlPoints() override; + virtual void insertControlPointsAtSelected() override; + virtual void convertCurveType() override; // Bounded implementation - virtual const AABB& localAABB() const; + virtual const AABB& localAABB() const override; /** greebo: Tests the contained Doom3Group for selection. * * Note: This can be successful in vertex mode only, func_statics do not use this method. */ - void testSelect(Selector& selector, SelectionTest& test); + void testSelect(Selector& selector, SelectionTest& test) override; // ComponentSelectionTestable implementation bool isSelectedComponents() const override; @@ -76,23 +76,23 @@ class Doom3GroupNode : virtual void onRemoveFromScene(scene::IMapRootNode& root) override; // ComponentEditable implementation - const AABB& getSelectedComponentsBounds() const; + const AABB& getSelectedComponentsBounds() const override; // ComponentSnappable implementation - void snapComponents(float snap); + void snapComponents(float snap) override; // Snappable implementation - virtual void snapto(float snap); + virtual void snapto(float snap) override; void selectionChangedComponent(const ISelectable& selectable); - scene::INodePtr clone() const; + scene::INodePtr clone() const override; /** greebo: Call this right before map save to let the child * brushes have their origin recalculated. */ - void addOriginToChildren(); - void removeOriginFromChildren(); + void addOriginToChildren() override; + void removeOriginFromChildren() override; // Renderable implementation void renderSolid(RenderableCollector& collector, const VolumeTest& volume) const override; @@ -116,10 +116,10 @@ class Doom3GroupNode : void _applyTransformation() override; // Model Key changed signal - void onModelKeyChanged(const std::string& value); + void onModelKeyChanged(const std::string& value) override; // Override EntityNode::construct() - virtual void construct(); + virtual void construct() override; private: void evaluateTransform(); diff --git a/plugins/entity/eclassmodel/EclassModelNode.h b/plugins/entity/eclassmodel/EclassModelNode.h index f0ca8989ff..222e4f329b 100644 --- a/plugins/entity/eclassmodel/EclassModelNode.h +++ b/plugins/entity/eclassmodel/EclassModelNode.h @@ -55,12 +55,12 @@ class EclassModelNode : virtual ~EclassModelNode(); // Snappable implementation - virtual void snapto(float snap); + virtual void snapto(float snap) override; // Bounded implementation - virtual const AABB& localAABB() const; + virtual const AABB& localAABB() const override; - scene::INodePtr clone() const; + scene::INodePtr clone() const override; // Renderable implementation void renderSolid(RenderableCollector& collector, const VolumeTest& volume) const override; @@ -80,7 +80,7 @@ class EclassModelNode : void _applyTransformation() override; // Override EntityNode::construct() - void construct(); + void construct() override; private: void translate(const Vector3& translation); diff --git a/plugins/entity/generic/GenericEntityNode.h b/plugins/entity/generic/GenericEntityNode.h index 6bdbc9f194..ecd27347fd 100644 --- a/plugins/entity/generic/GenericEntityNode.h +++ b/plugins/entity/generic/GenericEntityNode.h @@ -44,15 +44,15 @@ class GenericEntityNode : static GenericEntityNodePtr Create(const IEntityClassPtr& eclass); // Snappable implementation - virtual void snapto(float snap); + virtual void snapto(float snap) override; // Bounded implementation - virtual const AABB& localAABB() const; + virtual const AABB& localAABB() const override; // SelectionTestable implementation - void testSelect(Selector& selector, SelectionTest& test); + void testSelect(Selector& selector, SelectionTest& test) override; - scene::INodePtr clone() const; + scene::INodePtr clone() const override; // Renderable implementation void renderSolid(RenderableCollector& collector, const VolumeTest& volume) const override; @@ -61,7 +61,7 @@ class GenericEntityNode : SolidAAABBRenderMode getSolidAABBRenderMode() const; // Override EntityNode::getDirection() - const Vector3& getDirection() const; + const Vector3& getDirection() const override; // Returns the original "origin" value const Vector3& getUntransformedOrigin() override; @@ -79,7 +79,7 @@ class GenericEntityNode : void _applyTransformation() override; // Override EntityNode::construct() - void construct(); + void construct() override; }; } // namespace entity diff --git a/plugins/entity/light/LightNode.h b/plugins/entity/light/LightNode.h index 278c819d66..49283a7279 100644 --- a/plugins/entity/light/LightNode.h +++ b/plugins/entity/light/LightNode.h @@ -51,22 +51,22 @@ class LightNode : static LightNodePtr Create(const IEntityClassPtr& eclass); // RenderEntity implementation - virtual float getShaderParm(int parmNum) const; + virtual float getShaderParm(int parmNum) const override; // Bounded implementation - virtual const AABB& localAABB() const; + virtual const AABB& localAABB() const override; // override scene::Inode methods to deselect the child components virtual void onInsertIntoScene(scene::IMapRootNode& root) override; virtual void onRemoveFromScene(scene::IMapRootNode& root) override; // Snappable implementation - virtual void snapto(float snap); + virtual void snapto(float snap) override; /** greebo: Returns the AABB of the small diamond representation. * (use this to select the light against an AABB selectiontest like CompleteTall or similar). */ - AABB getSelectAABB(); + AABB getSelectAABB() override; /*greebo: This is a callback function that gets connected in the constructor * Don't know exactly what it does, but it seems to notify the shader cache that the light has moved or @@ -81,14 +81,14 @@ class LightNode : * * If one or more components is/are selected, ONLY those are snapped to the grid. */ - void snapComponents(float snap); + void snapComponents(float snap) override; // PlaneSelectable implementation - void selectPlanes(Selector& selector, SelectionTest& test, const PlaneCallback& selectedPlaneCallback); - void selectReversedPlanes(Selector& selector, const SelectedPlanes& selectedPlanes); + void selectPlanes(Selector& selector, SelectionTest& test, const PlaneCallback& selectedPlaneCallback) override; + void selectReversedPlanes(Selector& selector, const SelectedPlanes& selectedPlanes) override; // Test the light volume for selection, this just passes the call on to the contained Light class - void testSelect(Selector& selector, SelectionTest& test); + void testSelect(Selector& selector, SelectionTest& test) override; // greebo: Returns true if drag planes or the light center is selected (both are components) bool isSelectedComponents() const override; @@ -102,9 +102,9 @@ class LightNode : * distinguishes between projected and point lights and stretches the AABB accordingly. */ // ComponentEditable implementation - const AABB& getSelectedComponentsBounds() const; + const AABB& getSelectedComponentsBounds() const override; - scene::INodePtr clone() const; + scene::INodePtr clone() const override; void selectedChangedComponent(const ISelectable& selectable); @@ -117,12 +117,12 @@ class LightNode : void renderComponents(RenderableCollector& collector, const VolumeTest& volume) const override; // RendererLight implementation - const Vector3& worldOrigin() const; - Matrix4 getLightTextureTransformation() const; - const ShaderPtr& getShader() const; - bool intersectsAABB(const AABB& other) const; + const Vector3& worldOrigin() const override; + Matrix4 getLightTextureTransformation() const override; + const ShaderPtr& getShader() const override; + bool intersectsAABB(const AABB& other) const override; - Vector3 getLightOrigin() const; + Vector3 getLightOrigin() const override; const Matrix4& rotation() const; // Returns the original "origin" value @@ -138,7 +138,7 @@ class LightNode : void _applyTransformation() override; // Override EntityNode::construct() - void construct(); + void construct() override; private: void renderInactiveComponents(RenderableCollector& collector, const VolumeTest& volume, const bool selected) const; diff --git a/plugins/entity/speaker/SpeakerNode.h b/plugins/entity/speaker/SpeakerNode.h index f67ba16bff..8081e32dde 100644 --- a/plugins/entity/speaker/SpeakerNode.h +++ b/plugins/entity/speaker/SpeakerNode.h @@ -65,8 +65,8 @@ class SpeakerNode : SpeakerNode(const SpeakerNode& other); void translate(const Vector3& translation); void rotate(const Quaternion& rotation); - void revertTransform(); - void freezeTransform(); + void revertTransform() override; + void freezeTransform() override; void updateTransform(); void updateAABB(); void originChanged(); @@ -86,14 +86,14 @@ class SpeakerNode : ~SpeakerNode(); // Snappable implementation - void snapto(float snap); + void snapto(float snap) override; // Bounded implementation - const AABB& localAABB() const; + const AABB& localAABB() const override; // PlaneSelectable implementation - void selectPlanes(Selector& selector, SelectionTest& test, const PlaneCallback& selectedPlaneCallback); - void selectReversedPlanes(Selector& selector, const SelectedPlanes& selectedPlanes); + void selectPlanes(Selector& selector, SelectionTest& test, const PlaneCallback& selectedPlaneCallback) override; + void selectReversedPlanes(Selector& selector, const SelectedPlanes& selectedPlanes) override; // ComponentSelectionTestable implementation bool isSelectedComponents() const override; @@ -102,9 +102,9 @@ class SpeakerNode : void testSelectComponents(Selector& selector, SelectionTest& test, SelectionSystem::EComponentMode mode) override; // SelectionTestable implementation - void testSelect(Selector& selector, SelectionTest& test); + void testSelect(Selector& selector, SelectionTest& test) override; - scene::INodePtr clone() const; + scene::INodePtr clone() const override; // Renderable implementation void renderSolid(RenderableCollector& collector, const VolumeTest& volume) const override; @@ -122,7 +122,7 @@ class SpeakerNode : void _applyTransformation() override; // Called after the constructor is done, overrides EntityNode - void construct(); + void construct() override; private: void evaluateTransform(); diff --git a/plugins/eventmanager/EventManager.cpp b/plugins/eventmanager/EventManager.cpp index 8a8387e811..0bebca7b90 100644 --- a/plugins/eventmanager/EventManager.cpp +++ b/plugins/eventmanager/EventManager.cpp @@ -326,7 +326,7 @@ void EventManager::disconnectToolbar(wxToolBar* toolbar) { for (std::size_t tool = 0; tool < toolbar->GetToolsCount(); tool++) { - pair.second->disconnectToolItem(const_cast(toolbar->GetToolByPos(tool))); + pair.second->disconnectToolItem(const_cast(toolbar->GetToolByPos(static_cast(tool)))); } }); } diff --git a/plugins/mapdoom3/aas/Doom3AasFile.h b/plugins/mapdoom3/aas/Doom3AasFile.h index 22286783e9..f6c7be24e0 100644 --- a/plugins/mapdoom3/aas/Doom3AasFile.h +++ b/plugins/mapdoom3/aas/Doom3AasFile.h @@ -30,7 +30,7 @@ class Doom3AasFile : public: virtual std::size_t getNumPlanes() const override; - virtual const Plane3& getPlane(std::size_t planeNum) const; + virtual const Plane3& getPlane(std::size_t planeNum) const override; virtual std::size_t getNumVertices() const override; virtual const Vector3& getVertex(std::size_t vertexNum) const override; diff --git a/plugins/md5model/MD5ModelNode.h b/plugins/md5model/MD5ModelNode.h index 72cf24823b..166b4c94ae 100644 --- a/plugins/md5model/MD5ModelNode.h +++ b/plugins/md5model/MD5ModelNode.h @@ -43,21 +43,21 @@ class MD5ModelNode : const MD5ModelPtr& getModel() const; // Bounded implementation - virtual const AABB& localAABB() const; + virtual const AABB& localAABB() const override; - virtual std::string name() const; - Type getNodeType() const; + virtual std::string name() const override; + Type getNodeType() const override; // SelectionTestable implementation - void testSelect(Selector& selector, SelectionTest& test); + void testSelect(Selector& selector, SelectionTest& test) override; // Traceable implementation - bool getIntersection(const Ray& ray, Vector3& intersection); + bool getIntersection(const Ray& ray, Vector3& intersection) override; // LitObject implementation - bool intersectsLight(const RendererLight& light) const; - void insertLight(const RendererLight& light); - void clearLights(); + bool intersectsLight(const RendererLight& light) const override; + void insertLight(const RendererLight& light) override; + void clearLights() override; // Renderable implementation void renderSolid(RenderableCollector& collector, const VolumeTest& volume) const override; @@ -70,8 +70,8 @@ class MD5ModelNode : } // Returns the name of the currently active skin - virtual std::string getSkin() const; - void skinChanged(const std::string& newSkinName); + virtual std::string getSkin() const override; + void skinChanged(const std::string& newSkinName) override; private: void render(RenderableCollector& collector, const VolumeTest& volume, diff --git a/plugins/md5model/MD5Skeleton.cpp b/plugins/md5model/MD5Skeleton.cpp index 16a7921723..3fec58ffe2 100644 --- a/plugins/md5model/MD5Skeleton.cpp +++ b/plugins/md5model/MD5Skeleton.cpp @@ -1,6 +1,6 @@ #include "MD5Skeleton.h" -#include +#include namespace md5 { @@ -17,7 +17,7 @@ namespace double cosHalfTheta = qa.w() * qb.w() + qa.x() * qb.x() + qa.y() * qb.y() + qa.z() * qb.z(); // if qa=qb or qa=-qb then theta = 0 and we can return qa - if (abs(cosHalfTheta) > 1.0) + if (std::abs(cosHalfTheta) > 1.0) { return qb; } diff --git a/plugins/model/PicoModelNode.h b/plugins/model/PicoModelNode.h index 0bfe2ccdff..a5ef65d242 100644 --- a/plugins/model/PicoModelNode.h +++ b/plugins/model/PicoModelNode.h @@ -55,12 +55,12 @@ class PicoModelNode : // SkinnedModel implementation // Skin changed notify - void skinChanged(const std::string& newSkinName); + void skinChanged(const std::string& newSkinName) override; // Returns the name of the currently active skin - std::string getSkin() const; + std::string getSkin() const override; // Bounded implementation - virtual const AABB& localAABB() const; + virtual const AABB& localAABB() const override; // Lights changed function void lightsChanged() @@ -69,20 +69,20 @@ class PicoModelNode : } // SelectionTestable implementation - void testSelect(Selector& selector, SelectionTest& test); + void testSelect(Selector& selector, SelectionTest& test) override; - virtual std::string name() const; - Type getNodeType() const; + virtual std::string name() const override; + Type getNodeType() const override; const RenderablePicoModelPtr& getModel() const; void setModel(const RenderablePicoModelPtr& model); // LitObject test function - bool intersectsLight(const RendererLight& light) const; + bool intersectsLight(const RendererLight& light) const override; // Add a light to this model instance - void insertLight(const RendererLight& light); + void insertLight(const RendererLight& light) override; // Clear all lights from this model instance - void clearLights(); + void clearLights() override; // Renderable implementation void renderSolid(RenderableCollector& collector, const VolumeTest& volume) const override; @@ -95,7 +95,7 @@ class PicoModelNode : } // Traceable implementation - bool getIntersection(const Ray& ray, Vector3& intersection); + bool getIntersection(const Ray& ray, Vector3& intersection) override; protected: virtual void _onTransformationChanged() override; diff --git a/plugins/model/RenderablePicoModel.h b/plugins/model/RenderablePicoModel.h index b96e50820b..05f0a0dbe9 100644 --- a/plugins/model/RenderablePicoModel.h +++ b/plugins/model/RenderablePicoModel.h @@ -148,12 +148,13 @@ class RenderablePicoModel : * model selector but not the main renderer, which uses the front-end render * method. */ - void render(const RenderInfo& info) const; + void render(const RenderInfo& info) const override; /** * Return the number of surfaces in this model. */ - int getSurfaceCount() const { + int getSurfaceCount() const override + { return static_cast(_surfVec.size()); } @@ -161,41 +162,42 @@ class RenderablePicoModel : * Return the number of vertices in this model, by summing the vertex * counts for each surface. */ - int getVertexCount() const; + int getVertexCount() const override; /** Return the polycount (tricount) of this model by summing the surface * polycounts. */ - int getPolyCount() const; + int getPolyCount() const override; - const IModelSurface& getSurface(unsigned surfaceNum) const; + const IModelSurface& getSurface(unsigned surfaceNum) const override; /** * Return the enclosing AABB for this model. */ - const AABB& localAABB() const { + const AABB& localAABB() const override + { return _localAABB; } /** Return the list of active materials for this model. */ - const std::vector& getActiveMaterials() const; + const std::vector& getActiveMaterials() const override; // Sets the filename this model was loaded from void setFilename(const std::string& name); // Returns the filename this model was loaded from - virtual std::string getFilename() const; + virtual std::string getFilename() const override; // Returns the VFS path to the model file - virtual std::string getModelPath() const; + virtual std::string getModelPath() const override; void setModelPath(const std::string& modelPath); /** Apply the given skin to this model. */ - void applySkin(const ModelSkin& skin); + void applySkin(const ModelSkin& skin) override; /** * Selection test. Test each surface against the SelectionTest object and diff --git a/plugins/particles/ParticleNode.h b/plugins/particles/ParticleNode.h index a3680e944c..debd8af684 100644 --- a/plugins/particles/ParticleNode.h +++ b/plugins/particles/ParticleNode.h @@ -28,11 +28,11 @@ class ParticleNode : // Construct the node giving a renderable particle ParticleNode(const RenderableParticlePtr& particle); - std::string name() const; - Type getNodeType() const; + std::string name() const override; + Type getNodeType() const override; - IRenderableParticlePtr getParticle() const; - const AABB& localAABB() const; + IRenderableParticlePtr getParticle() const override; + const AABB& localAABB() const override; std::size_t getHighlightFlags() override; void renderSolid(RenderableCollector& collector, const VolumeTest& volume) const override; @@ -41,7 +41,7 @@ class ParticleNode : void setRenderSystem(const RenderSystemPtr& renderSystem) override; // ITransformNode - const Matrix4& localToParent() const; + const Matrix4& localToParent() const override; private: void update(const VolumeTest& viewVolume) const; diff --git a/plugins/particles/RenderableParticle.h b/plugins/particles/RenderableParticle.h index 6c73280a78..b0723ffd53 100644 --- a/plugins/particles/RenderableParticle.h +++ b/plugins/particles/RenderableParticle.h @@ -61,7 +61,7 @@ class RenderableParticle : public IRenderableParticle, ~RenderableParticle(); // Time is in msecs - void update(const Matrix4& viewRotation); + void update(const Matrix4& viewRotation) override; // Front-end render methods void renderSolid(RenderableCollector& collector, const VolumeTest& volume) const override; @@ -79,14 +79,14 @@ class RenderableParticle : public IRenderableParticle, return Highlight::NoHighlight; // never highlighted } - const IParticleDefPtr& getParticleDef() const; - void setParticleDef(const IParticleDefPtr& def); + const IParticleDefPtr& getParticleDef() const override; + void setParticleDef(const IParticleDefPtr& def) override; - void setMainDirection(const Vector3& direction); - void setEntityColour(const Vector3& colour); + void setMainDirection(const Vector3& direction) override; + void setEntityColour(const Vector3& colour) override; // Updates bounds from stages and returns the value - const AABB& getBounds(); + const AABB& getBounds() override; private: void calculateBounds(); diff --git a/plugins/shaders/textures/GLTextureManager.cpp b/plugins/shaders/textures/GLTextureManager.cpp index 07c9f485e6..1812a2595b 100644 --- a/plugins/shaders/textures/GLTextureManager.cpp +++ b/plugins/shaders/textures/GLTextureManager.cpp @@ -8,9 +8,8 @@ #include "TextureManipulator.h" #include "parser/DefTokeniser.h" -namespace { - const int MAX_TEXTURE_QUALITY = 3; - +namespace +{ const std::string SHADER_NOT_FOUND = "notex.bmp"; } diff --git a/plugins/sound/SoundPlayer.cpp b/plugins/sound/SoundPlayer.cpp index 9b8913a488..0292a9e5f8 100644 --- a/plugins/sound/SoundPlayer.cpp +++ b/plugins/sound/SoundPlayer.cpp @@ -188,7 +188,7 @@ void SoundPlayer::play(ArchiveFile& file) : AL_FORMAT_STEREO16; // Get the sample Rate - ALsizei freq = (vorbisInfo->rate); + ALsizei freq = static_cast(vorbisInfo->rate); //rConsole() << "Sample rate is " << freq << std::endl; long bytes; diff --git a/plugins/uimanager/SoundChooser.h b/plugins/uimanager/SoundChooser.h index cd69b1e214..634ca4b822 100644 --- a/plugins/uimanager/SoundChooser.h +++ b/plugins/uimanager/SoundChooser.h @@ -82,7 +82,7 @@ class SoundChooser : // Set the selected sound shader, and focuses the treeview to the new selection void setSelectedShader(const std::string& shader); - virtual int ShowModal(); + virtual int ShowModal() override; // Run the dialog and return the selected shader - this will be empty if the user clicks cancel virtual std::string chooseResource(const std::string& preselected = std::string()) override; diff --git a/plugins/uimanager/animationpreview/AnimationPreview.cpp b/plugins/uimanager/animationpreview/AnimationPreview.cpp index b9624a19a7..f428c53b41 100644 --- a/plugins/uimanager/animationpreview/AnimationPreview.cpp +++ b/plugins/uimanager/animationpreview/AnimationPreview.cpp @@ -57,7 +57,7 @@ void AnimationPreview::setModelNode(const scene::INodePtr& node) try { - dynamic_cast(model->getIModel()); + dynamic_cast(model->getIModel()).getAnim(); } catch (std::bad_cast&) { diff --git a/plugins/uimanager/colourscheme/ColourSchemeEditor.cpp b/plugins/uimanager/colourscheme/ColourSchemeEditor.cpp index d1cdc72479..d8b807a606 100644 --- a/plugins/uimanager/colourscheme/ColourSchemeEditor.cpp +++ b/plugins/uimanager/colourscheme/ColourSchemeEditor.cpp @@ -21,9 +21,6 @@ namespace ui namespace { - // Constants - const int NUM_COLUMNS = 3; - const char* const EDITOR_WINDOW_TITLE = N_("Edit Colour Schemes"); } diff --git a/plugins/vfspk3/Doom3FileSystem.h b/plugins/vfspk3/Doom3FileSystem.h index 6ef5c62599..65b0b8b4fa 100644 --- a/plugins/vfspk3/Doom3FileSystem.h +++ b/plugins/vfspk3/Doom3FileSystem.h @@ -30,35 +30,35 @@ class Doom3FileSystem : // Constructor Doom3FileSystem(); - void initDirectory(const std::string& path); - void initialise(); - void shutdown(); + void initDirectory(const std::string& path) override; + void initialise() override; + void shutdown() override; - int getFileCount(const std::string& filename); - ArchiveFilePtr openFile(const std::string& filename); - ArchiveTextFilePtr openTextFile(const std::string& filename); + int getFileCount(const std::string& filename) override; + ArchiveFilePtr openFile(const std::string& filename) override; + ArchiveTextFilePtr openTextFile(const std::string& filename) override; - ArchiveFilePtr openFileInAbsolutePath(const std::string& filename); - ArchiveTextFilePtr openTextFileInAbsolutePath(const std::string& filename); + ArchiveFilePtr openFileInAbsolutePath(const std::string& filename) override; + ArchiveTextFilePtr openTextFileInAbsolutePath(const std::string& filename) override; - std::size_t loadFile(const std::string& filename, void **buffer); - void freeFile(void *p); + std::size_t loadFile(const std::string& filename, void **buffer) override; + void freeFile(void *p) override; // Call the specified callback function for each file matching extension // inside basedir. void forEachFile(const std::string& basedir, const std::string& extension, - const VisitorFunc& visitorFunc, std::size_t depth); + const VisitorFunc& visitorFunc, std::size_t depth) override; void forEachFileInAbsolutePath(const std::string& path, const std::string& extension, const VisitorFunc& visitorFunc, - std::size_t depth = 1); + std::size_t depth = 1) override; - std::string findFile(const std::string& name); - std::string findRoot(const std::string& name); + std::string findFile(const std::string& name) override; + std::string findRoot(const std::string& name) override; - virtual void addObserver(Observer& observer); - virtual void removeObserver(Observer& observer); + virtual void addObserver(Observer& observer) override; + virtual void removeObserver(Observer& observer) override; // RegisterableModule implementation const std::string& getName() const override; diff --git a/radiant/RadiantModule.h b/radiant/RadiantModule.h index 21cef8591a..fd69710761 100644 --- a/radiant/RadiantModule.h +++ b/radiant/RadiantModule.h @@ -31,16 +31,16 @@ class RadiantModule : sigc::signal signal_radiantStarted() const override; sigc::signal signal_radiantShutdown() const override; - ThreadManager& getThreadManager(); + ThreadManager& getThreadManager() override; void performLongRunningOperation( const std::function& operationFunc, - const std::string& title); + const std::string& title) override; // RegisterableModule implementation - const std::string& getName() const; - const StringSet& getDependencies() const; - void initialiseModule(const ApplicationContext& ctx); - void shutdownModule(); + const std::string& getName() const override; + const StringSet& getDependencies() const override; + void initialiseModule(const ApplicationContext& ctx) override; + void shutdownModule() override; // Stuff to be done after the modules have been loaded void postModuleInitialisation(); diff --git a/radiant/brush/BrushNode.h b/radiant/brush/BrushNode.h index c681a885c9..c1e61fb461 100644 --- a/radiant/brush/BrushNode.h +++ b/radiant/brush/BrushNode.h @@ -74,22 +74,23 @@ class BrushNode : virtual ~BrushNode(); // IBrushNode implementtation - virtual Brush& getBrush(); - virtual IBrush& getIBrush(); + virtual Brush& getBrush() override; + virtual IBrush& getIBrush() override; - std::string name() const { + std::string name() const override + { return "Brush"; } - Type getNodeType() const; + Type getNodeType() const override; void lightsChanged(); // Bounded implementation - virtual const AABB& localAABB() const; + virtual const AABB& localAABB() const override; // SelectionTestable implementation - virtual void testSelect(Selector& selector, SelectionTest& test); + virtual void testSelect(Selector& selector, SelectionTest& test) override; // ComponentSelectionTestable bool isSelectedComponents() const override; @@ -102,43 +103,43 @@ class BrushNode : virtual void onRemoveFromScene(scene::IMapRootNode& root) override; // ComponentEditable implementation - const AABB& getSelectedComponentsBounds() const; + const AABB& getSelectedComponentsBounds() const override; void selectedChangedComponent(const ISelectable& selectable); // PlaneSelectable implementation - void selectPlanes(Selector& selector, SelectionTest& test, const PlaneCallback& selectedPlaneCallback); - void selectReversedPlanes(Selector& selector, const SelectedPlanes& selectedPlanes); + void selectPlanes(Selector& selector, SelectionTest& test, const PlaneCallback& selectedPlaneCallback) override; + void selectReversedPlanes(Selector& selector, const SelectedPlanes& selectedPlanes) override; // Snappable implementation - virtual void snapto(float snap); + virtual void snapto(float snap) override; // ComponentSnappable implementation - void snapComponents(float snap); + void snapComponents(float snap) override; // Translatable implementation - virtual void translate(const Vector3& translation); + virtual void translate(const Vector3& translation) override; // Allocates a new node on the heap (via copy construction) - scene::INodePtr clone() const; + scene::INodePtr clone() const override; // BrushObserver implementation - void clear(); - void reserve(std::size_t size); - void push_back(Face& face); - void pop_back(); - void erase(std::size_t index); - void connectivityChanged(); - void edge_clear(); - void edge_push_back(SelectableEdge& edge); - void vertex_clear(); - void vertex_push_back(SelectableVertex& vertex); - void DEBUG_verify(); + void clear() override; + void reserve(std::size_t size) override; + void push_back(Face& face) override; + void pop_back() override; + void erase(std::size_t index) override; + void connectivityChanged() override; + void edge_clear() override; + void edge_push_back(SelectableEdge& edge) override; + void vertex_clear() override; + void vertex_push_back(SelectableVertex& vertex) override; + void DEBUG_verify() override; // LitObject implementation - bool intersectsLight(const RendererLight& light) const; - void insertLight(const RendererLight& light); - void clearLights(); + bool intersectsLight(const RendererLight& light) const override; + void insertLight(const RendererLight& light) override; + void clearLights() override; // Renderable implementation void renderComponents(RenderableCollector& collector, const VolumeTest& volume) const override; @@ -152,7 +153,7 @@ class BrushNode : void evaluateTransform(); // Traceable implementation - bool getIntersection(const Ray& ray, Vector3& intersection); + bool getIntersection(const Ray& ray, Vector3& intersection) override; // Update call, issued by the FilterSystem on potential shader visibility changes void updateFaceVisibility(); diff --git a/radiant/camera/CamRenderer.h b/radiant/camera/CamRenderer.h index dbb393a9be..a2db871fa0 100644 --- a/radiant/camera/CamRenderer.h +++ b/radiant/camera/CamRenderer.h @@ -47,14 +47,14 @@ class CamRenderer : void render(const Matrix4& modelview, const Matrix4& projection); // RenderableCollector implementation - void SetState(const ShaderPtr& shader, EStyle style); - bool supportsFullMaterials() const; - void PushState(); - void PopState(); + void SetState(const ShaderPtr& shader, EStyle style) override; + bool supportsFullMaterials() const override; + void PushState() override; + void PopState() override; void setHighlightFlag(Highlight::Flags flags, bool enabled) override; - void setLights(const LightList& lights); - void addRenderable(const OpenGLRenderable& renderable, const Matrix4& world); + void setLights(const LightList& lights) override; + void addRenderable(const OpenGLRenderable& renderable, const Matrix4& world) override; void addRenderable(const OpenGLRenderable& renderable, const Matrix4& world, - const IRenderEntity& entity); + const IRenderEntity& entity) override; }; diff --git a/radiant/camera/CamWnd.h b/radiant/camera/CamWnd.h index 79f42d3246..b50f7b6861 100644 --- a/radiant/camera/CamWnd.h +++ b/radiant/camera/CamWnd.h @@ -101,7 +101,7 @@ class CamWnd : void update(); // The callback when the scene gets changed - void onSceneGraphChange(); + void onSceneGraphChange() override; static void captureStates(); static void releaseStates(); @@ -129,9 +129,9 @@ class CamWnd : wxutil::GLWidget* getwxGLWidget() const { return _wxGLWidget; } wxWindow* getMainWidget() const; - void enableFreeMove(); - void disableFreeMove(); - bool freeMoveEnabled() const; + void enableFreeMove() override; + void disableFreeMove() override; + bool freeMoveEnabled() const override; void jumpToObject(SelectionTest& selectionTest); diff --git a/radiant/layers/LayerSystem.h b/radiant/layers/LayerSystem.h index df344266e2..c4ce3ec462 100644 --- a/radiant/layers/LayerSystem.h +++ b/radiant/layers/LayerSystem.h @@ -49,7 +49,7 @@ class LayerSystem : * @returns: the ID of the layer of -1 if the layer could not * be created (e.g. due to a name conflict). */ - int createLayer(const std::string& name); + int createLayer(const std::string& name) override; /** * greebo: Overload: Creates a new layer with the given name and the given ID. @@ -57,19 +57,19 @@ class LayerSystem : * @returns: the ID of the layer of -1 if the layer could not * be created (e.g. due to a name/ID conflict). */ - int createLayer(const std::string& name, int layerID); + int createLayer(const std::string& name, int layerID) override; /** * greebo: Deletes the named layer. All nodes are removed * from this layer before deletion. */ - void deleteLayer(const std::string& name); + void deleteLayer(const std::string& name) override; /** * greebo: Resets the layer system into its ground state. Deletes all * layers except for layer #0 which is renamed to "Default". */ - void reset(); + void reset() override; /** * greebo: Visits each layer using the given visitor. @@ -77,62 +77,62 @@ class LayerSystem : void foreachLayer(const LayerVisitFunc& visitor) override; // Returns the ID of the named layer, or -1 if name doesn't exist - int getLayerID(const std::string& name) const; - std::string getLayerName(int layerID) const; + int getLayerID(const std::string& name) const override; + std::string getLayerName(int layerID) const override; // Check for layer existence - bool layerExists(int layerID) const; + bool layerExists(int layerID) const override; // Renames the given layer and returns TRUE on success - bool renameLayer(int layerID, const std::string& newLayerName); + bool renameLayer(int layerID, const std::string& newLayerName) override; // Returns the ID of the first visible layer or -1 if all are hidden. - int getFirstVisibleLayer() const; + int getFirstVisibleLayer() const override; // Active layers - int getActiveLayer() const; - void setActiveLayer(int layerID); + int getActiveLayer() const override; + void setActiveLayer(int layerID) override; // Returns true if the given layer is visible - bool layerIsVisible(const std::string& layerName); - bool layerIsVisible(int layerID); + bool layerIsVisible(const std::string& layerName) override; + bool layerIsVisible(int layerID) override; // Sets the visibility state of the given layer to - void setLayerVisibility(const std::string& layerName, bool visible); - void setLayerVisibility(int layerID, bool visible); + void setLayerVisibility(const std::string& layerName, bool visible) override; + void setLayerVisibility(int layerID, bool visible) override; /** * greebo: Traverses the selection and adds each node to the given layer. */ - void addSelectionToLayer(const std::string& layerName); - void addSelectionToLayer(int layerID); + void addSelectionToLayer(const std::string& layerName) override; + void addSelectionToLayer(int layerID) override; /** * greebo: Moves all selected nodes to the given layer. This implicitly * removes the nodes from all other layers. */ - void moveSelectionToLayer(const std::string& layerName); - void moveSelectionToLayer(int layerID); + void moveSelectionToLayer(const std::string& layerName) override; + void moveSelectionToLayer(int layerID) override; /** * greebo: Removes the selected nodes from the given layers. */ - void removeSelectionFromLayer(const std::string& layerName); - void removeSelectionFromLayer(int layerID); + void removeSelectionFromLayer(const std::string& layerName) override; + void removeSelectionFromLayer(int layerID) override; - bool updateNodeVisibility(const scene::INodePtr& node); + bool updateNodeVisibility(const scene::INodePtr& node) override; // Selects/unselects an entire layer - void setSelected(int layerID, bool selected); + void setSelected(int layerID, bool selected) override; sigc::signal signal_layersChanged() override; sigc::signal signal_layerVisibilityChanged() override; sigc::signal signal_nodeMembershipChanged() override; // RegisterableModule implementation - const std::string& getName() const; - const StringSet& getDependencies() const; - void initialiseModule(const ApplicationContext& ctx); + const std::string& getName() const override; + const StringSet& getDependencies() const override; + void initialiseModule(const ApplicationContext& ctx) override; // Command target void createLayerCmd(const cmd::ArgumentList& args); diff --git a/radiant/log/LogStreamBuf.cpp b/radiant/log/LogStreamBuf.cpp index 8782343de8..1f135f53c5 100644 --- a/radiant/log/LogStreamBuf.cpp +++ b/radiant/log/LogStreamBuf.cpp @@ -68,7 +68,7 @@ LogStreamBuf::int_type LogStreamBuf::sync() void LogStreamBuf::writeToBuffer() { - int_type charsToWrite = pptr() - pbase(); + int_type charsToWrite = static_cast(pptr() - pbase()); if (pbase() != pptr()) { diff --git a/radiant/map/AutoSaver.cpp b/radiant/map/AutoSaver.cpp index 8f76715168..fb167e377c 100644 --- a/radiant/map/AutoSaver.cpp +++ b/radiant/map/AutoSaver.cpp @@ -83,7 +83,7 @@ void AutoMapSaver::startTimer() { if (!_timer) return; - _timer->Start(_interval * 1000); + _timer->Start(static_cast(_interval * 1000)); } void AutoMapSaver::stopTimer() diff --git a/radiant/map/Map.h b/radiant/map/Map.h index c3c2aa8cb2..d12f2e69c9 100644 --- a/radiant/map/Map.h +++ b/radiant/map/Map.h @@ -84,7 +84,7 @@ class Map : /** greebo: Returns the name of this class */ - std::string getMapName() const; + std::string getMapName() const override; /** * greebo: Saves the current map, doesn't ask for any filenames, diff --git a/radiant/map/RenderableAasFile.cpp b/radiant/map/RenderableAasFile.cpp index 46a936a3fd..ae11e221d8 100644 --- a/radiant/map/RenderableAasFile.cpp +++ b/radiant/map/RenderableAasFile.cpp @@ -86,7 +86,7 @@ void RenderableAasFile::render(const RenderInfo& info) const // Render the area numbers for (std::size_t areaNum = 0; areaNum < _aasFile->getNumAreas(); ++areaNum) { - const IAasFile::Area& area = _aasFile->getArea(areaNum); + const IAasFile::Area& area = _aasFile->getArea(static_cast(areaNum)); if (_hideDistantAreas && (area.center - info.getViewerLocation()).getLengthSquared() > _hideDistanceSquared) { @@ -113,7 +113,7 @@ void RenderableAasFile::constructRenderables() for (std::size_t areaNum = 0; areaNum < _aasFile->getNumAreas(); ++areaNum) { - const IAasFile::Area& area = _aasFile->getArea(areaNum); + const IAasFile::Area& area = _aasFile->getArea(static_cast(areaNum)); _renderableAabbs.push_back(RenderableSolidAABB(area.bounds)); } diff --git a/radiant/map/RootNode.h b/radiant/map/RootNode.h index 0d5828fffa..3e1a78b14f 100644 --- a/radiant/map/RootNode.h +++ b/radiant/map/RootNode.h @@ -58,19 +58,19 @@ class RootNode : return Highlight::NoHighlight; // never highlighted } - std::string name() const; - Type getNodeType() const; + std::string name() const override; + Type getNodeType() const override; void setName(const std::string& name); // Override scene::Node methods - virtual void onChildAdded(const scene::INodePtr& child); - virtual void onChildRemoved(const scene::INodePtr& child); + virtual void onChildAdded(const scene::INodePtr& child) override; + virtual void onChildRemoved(const scene::INodePtr& child) override; virtual void onInsertIntoScene(IMapRootNode& root) override; virtual void onRemoveFromScene(IMapRootNode& root) override; - const AABB& localAABB() const + const AABB& localAABB() const override { return _emptyAABB; } diff --git a/radiant/model/NullModelNode.h b/radiant/model/NullModelNode.h index 9a128dda39..bae236d6b2 100644 --- a/radiant/model/NullModelNode.h +++ b/radiant/model/NullModelNode.h @@ -24,8 +24,8 @@ class NullModelNode : // Alternative constructor, uses the given nullModel NullModelNode(const NullModelPtr& nullModel); - std::string name() const; - Type getNodeType() const; + std::string name() const override; + Type getNodeType() const override; // Accessor to the singleton instance static NullModelNodePtr InstancePtr(); @@ -34,7 +34,7 @@ class NullModelNode : IModel& getIModel() override; bool hasModifiedScale() override; - void testSelect(Selector& selector, SelectionTest& test); + void testSelect(Selector& selector, SelectionTest& test) override; void renderSolid(RenderableCollector& collector, const VolumeTest& volume) const override; void renderWireframe(RenderableCollector& collector, const VolumeTest& volume) const override; @@ -46,7 +46,7 @@ class NullModelNode : } // Bounded implementation - virtual const AABB& localAABB() const; + virtual const AABB& localAABB() const override; }; } // namespace model diff --git a/radiant/patch/Patch.cpp b/radiant/patch/Patch.cpp index e9ab57d830..38afdbd644 100644 --- a/radiant/patch/Patch.cpp +++ b/radiant/patch/Patch.cpp @@ -1925,8 +1925,8 @@ void Patch::constructPlane(const AABB& aabb, int axis, std::size_t width, std::s vStart[y] = aabb.origin[y] - aabb.extents[y]; vStart[z] = aabb.origin[z]; - float xAdj = fabsf((vStart[x] - (aabb.origin[x] + aabb.extents[x])) / (float)(_width - 1)); - float yAdj = fabsf((vStart[y] - (aabb.origin[y] + aabb.extents[y])) / (float)(_height - 1)); + float xAdj = std::abs((vStart[x] - (aabb.origin[x] + aabb.extents[x])) / (float)(_width - 1)); + float yAdj = std::abs((vStart[y] - (aabb.origin[y] + aabb.extents[y])) / (float)(_height - 1)); Vector3 vTmp; vTmp[z] = vStart[z]; diff --git a/radiant/patch/Patch.h b/radiant/patch/Patch.h index 24cb36b0d1..35f8281f53 100644 --- a/radiant/patch/Patch.h +++ b/radiant/patch/Patch.h @@ -120,7 +120,7 @@ class Patch : const Matrix4& localToParent() const; // Return the interally stored AABB - const AABB& localAABB() const; + const AABB& localAABB() const override; // Render functions: solid mode, wireframe mode and components void render_solid(RenderableCollector& collector, const VolumeTest& volume, @@ -163,7 +163,7 @@ class Patch : bool isDegenerate() const override; // Snaps the control points to the grid - void snapto(float snap); + void snapto(float snap) override; // Gets the shader name or sets the shader to const std::string& getShader() const override; @@ -331,10 +331,10 @@ class Patch : void undoSave(); // Save the current patch state into a new UndoMemento instance (allocated on heap) and return it to the undo observer - IUndoMementoPtr exportState() const; + IUndoMementoPtr exportState() const override; // Revert the state of this patch to the one that has been saved in the UndoMemento - void importState(const IUndoMementoPtr& state); + void importState(const IUndoMementoPtr& state) override; /** greebo: Gets whether this patch is a patchDef3 (fixed tesselation) */ diff --git a/radiant/patch/PatchNode.h b/radiant/patch/PatchNode.h index 44bc88fc0d..864556971e 100644 --- a/radiant/patch/PatchNode.h +++ b/radiant/patch/PatchNode.h @@ -59,27 +59,27 @@ class PatchNode : // Patch::Observer implementation void allocate(std::size_t size); - std::string name() const; - Type getNodeType() const; + std::string name() const override; + Type getNodeType() const override; void lightsChanged(); // Bounded implementation - const AABB& localAABB() const; + const AABB& localAABB() const override; // IPatchNode implementation - Patch& getPatchInternal(); - IPatch& getPatch(); + Patch& getPatchInternal() override; + IPatch& getPatch() override; // Snappable implementation - virtual void snapto(float snap); + virtual void snapto(float snap) override; // Test the Patch instance for selection (SelectionTestable) - void testSelect(Selector& selector, SelectionTest& test); + void testSelect(Selector& selector, SelectionTest& test) override; // Check if the drag planes pass the given selection test (and select them of course and call the callback) - void selectPlanes(Selector& selector, SelectionTest& test, const PlaneCallback& selectedPlaneCallback); - void selectReversedPlanes(Selector& selector, const SelectedPlanes& selectedPlanes); + void selectPlanes(Selector& selector, SelectionTest& test, const PlaneCallback& selectedPlaneCallback) override; + void selectReversedPlanes(Selector& selector, const SelectedPlanes& selectedPlanes) override; // Returns true if any of the patch components is selected bool isSelectedComponents() const override; @@ -95,10 +95,10 @@ class PatchNode : virtual void onRemoveFromScene(scene::IMapRootNode& root) override; // Traceable implementation - bool getIntersection(const Ray& ray, Vector3& intersection); + bool getIntersection(const Ray& ray, Vector3& intersection) override; // Create the axis aligned bounding box of the selected components - const AABB& getSelectedComponentsBounds() const; + const AABB& getSelectedComponentsBounds() const override; // Sets all Control Instances to selected = void selectCtrl(bool selected); @@ -110,20 +110,20 @@ class PatchNode : bool hasVisibleMaterial() const; // greebo: snaps all the _selected_ components to the grid (should be called "snapSelectedComponents") - void snapComponents(float snap); + void snapComponents(float snap) override; // Returns true if any of the Control Vertices is selected bool selectedVertices(); // Clones this node, allocates a new Node on the heap and passes itself to the constructor of the new node - scene::INodePtr clone() const; + scene::INodePtr clone() const override; // greebo: This gets called by the ObservedSelectable as soon as its selection state changes // (see ObservedSelectable and PatchControlInstance) void selectedChangedComponent(const ISelectable& selectable); // LitObject implementation - bool intersectsLight(const RendererLight& light) const; + bool intersectsLight(const RendererLight& light) const override; // Renderable implementation diff --git a/radiant/patch/PatchTesselation.cpp b/radiant/patch/PatchTesselation.cpp index 335164428a..7995cfeb94 100644 --- a/radiant/patch/PatchTesselation.cpp +++ b/radiant/patch/PatchTesselation.cpp @@ -119,7 +119,7 @@ void PatchTesselation::generateNormals() around[k] = Vector3(0, 0, 0); good[k] = false; - for (std::size_t dist = 1; dist <= 3; dist++) + for (int dist = 1; dist <= 3; dist++) { int x = static_cast(i) + neighbors[k][0] * dist; int y = static_cast(j) + neighbors[k][1] * dist; @@ -128,11 +128,11 @@ void PatchTesselation::generateNormals() { if (x < 0) { - x = width - 1 + x; + x = static_cast(width) - 1 + x; } else if (x >= static_cast(width)) { - x = 1 + x - width; + x = 1 + x - static_cast(width); } } @@ -140,11 +140,11 @@ void PatchTesselation::generateNormals() { if (y < 0) { - y = height - 1 + y; + y = static_cast(height) - 1 + y; } else if (y >= static_cast(height)) { - y = 1 + y - height; + y = 1 + y - static_cast(height); } } @@ -335,9 +335,9 @@ void PatchTesselation::expandMesh() if (width != _maxWidth) { - for (int j = height - 1; j >= 0; j--) + for (int j = static_cast(height) - 1; j >= 0; j--) { - for (int i = width - 1; i >= 0; i--) + for (int i = static_cast(width) - 1; i >= 0; i--) { vertices[j*_maxWidth + i] = vertices[j*width + i]; } @@ -345,14 +345,14 @@ void PatchTesselation::expandMesh() } } -void PatchTesselation::resizeExpandedMesh(int newHeight, int newWidth) +void PatchTesselation::resizeExpandedMesh(std::size_t newHeight, std::size_t newWidth) { - if (newHeight <= static_cast(_maxHeight) && newWidth <= static_cast(_maxWidth)) + if (newHeight <= _maxHeight && newWidth <= _maxWidth) { return; } - if (newHeight * newWidth > static_cast(_maxHeight * _maxWidth)) + if (newHeight * newWidth > _maxHeight * _maxWidth) { vertices.resize(newHeight * newWidth); } diff --git a/radiant/patch/PatchTesselation.h b/radiant/patch/PatchTesselation.h index 3385639e32..28872ee477 100644 --- a/radiant/patch/PatchTesselation.h +++ b/radiant/patch/PatchTesselation.h @@ -56,7 +56,7 @@ class PatchTesselation void subdivideMeshFixed(std::size_t subdivX, std::size_t subdivY); void collapseMesh(); void expandMesh(); - void resizeExpandedMesh(int newHeight, int newWidth); + void resizeExpandedMesh(std::size_t newHeight, std::size_t newWidth); void putOnCurve(); void removeLinearColumnsRows(); diff --git a/radiant/render/OpenGLRenderSystem.h b/radiant/render/OpenGLRenderSystem.h index 3762d927d7..5f48b95052 100644 --- a/radiant/render/OpenGLRenderSystem.h +++ b/radiant/render/OpenGLRenderSystem.h @@ -65,33 +65,33 @@ class OpenGLRenderSystem /* RenderSystem implementation */ - ShaderPtr capture(const std::string& name); + ShaderPtr capture(const std::string& name) override; void render(RenderStateFlags globalstate, const Matrix4& modelview, const Matrix4& projection, - const Vector3& viewer); - void realise(); - void unrealise(); + const Vector3& viewer) override; + void realise() override; + void unrealise() override; GLProgramFactory& getGLProgramFactory(); - std::size_t getTime() const; - void setTime(std::size_t milliSeconds); + std::size_t getTime() const override; + void setTime(std::size_t milliSeconds) override; - ShaderProgram getCurrentShaderProgram() const; - void setShaderProgram(ShaderProgram prog); + ShaderProgram getCurrentShaderProgram() const override; + void setShaderProgram(ShaderProgram prog) override; - void extensionsInitialised(); - sigc::signal signal_extensionsInitialised(); + void extensionsInitialised() override; + sigc::signal signal_extensionsInitialised() override; - LightList& attachLitObject(LitObject& cullable); - void detachLitObject(LitObject& cullable); - void litObjectChanged(LitObject& cullable); + LightList& attachLitObject(LitObject& cullable) override; + void detachLitObject(LitObject& cullable) override; + void litObjectChanged(LitObject& cullable) override; // Attach and detach light sources - void attachLight(RendererLight& light); - void detachLight(RendererLight& light); - void lightChanged(RendererLight& light); + void attachLight(RendererLight& light) override; + void detachLight(RendererLight& light) override; + void lightChanged(RendererLight& light) override; typedef std::set Renderables; Renderables m_renderables; @@ -102,9 +102,9 @@ class OpenGLRenderSystem void eraseSortedState(const OpenGLStates::key_type& key) override; // renderables - void attachRenderable(const Renderable& renderable); - void detachRenderable(const Renderable& renderable); - void forEachRenderable(const RenderableCallback& callback) const; + void attachRenderable(const Renderable& renderable) override; + void detachRenderable(const Renderable& renderable) override; + void forEachRenderable(const RenderableCallback& callback) const override; // RegisterableModule implementation virtual const std::string& getName() const override; diff --git a/radiant/selection/ManipulateMouseTool.cpp b/radiant/selection/ManipulateMouseTool.cpp index 2d9dd9f476..8096d73310 100644 --- a/radiant/selection/ManipulateMouseTool.cpp +++ b/radiant/selection/ManipulateMouseTool.cpp @@ -179,8 +179,6 @@ void ManipulateMouseTool::handleMouseMove(const render::View& view, const Vector _debugText += (boost::format("\nTest reversal x,y,z = (%5.3lf %5.3lf %5.3lf)") % worldPosH.x() % worldPosH.y() % worldPosH.z()).str(); #endif - Vector2 constrainedDevicePoint(devicePoint); - // Constrain the movement to the axes, if the modifier is held bool constrainedFlag = wxGetKeyState(WXK_SHIFT); diff --git a/radiant/selection/RadiantSelectionSystem.h b/radiant/selection/RadiantSelectionSystem.h index e735f6679b..3eb3a5b445 100644 --- a/radiant/selection/RadiantSelectionSystem.h +++ b/radiant/selection/RadiantSelectionSystem.h @@ -81,7 +81,7 @@ class RadiantSelectionSystem : * information about the current selection (brush count, * entity count, etc.) */ - const SelectionInfo& getSelectionInfo(); + const SelectionInfo& getSelectionInfo() override; void onSceneBoundsChanged(); @@ -89,61 +89,61 @@ class RadiantSelectionSystem : void pivotChangedSelection(const ISelectable& selectable); - void addObserver(Observer* observer); - void removeObserver(Observer* observer); + void addObserver(Observer* observer) override; + void removeObserver(Observer* observer) override; - void SetMode(EMode mode); - EMode Mode() const; + void SetMode(EMode mode) override; + EMode Mode() const override; - void SetComponentMode(EComponentMode mode); - EComponentMode ComponentMode() const; + void SetComponentMode(EComponentMode mode) override; + EComponentMode ComponentMode() const override; // Returns the ID of the registered manipulator - std::size_t registerManipulator(const ManipulatorPtr& manipulator); - void unregisterManipulator(const ManipulatorPtr& manipulator); + std::size_t registerManipulator(const ManipulatorPtr& manipulator) override; + void unregisterManipulator(const ManipulatorPtr& manipulator) override; Manipulator::Type getActiveManipulatorType() override; const ManipulatorPtr& getActiveManipulator() override; void setActiveManipulator(std::size_t manipulatorId) override; void setActiveManipulator(Manipulator::Type manipulatorType) override; - std::size_t countSelected() const; - std::size_t countSelectedComponents() const; + std::size_t countSelected() const override; + std::size_t countSelectedComponents() const override; - void onSelectedChanged(const scene::INodePtr& node, const ISelectable& selectable); - void onComponentSelection(const scene::INodePtr& node, const ISelectable& selectable); + void onSelectedChanged(const scene::INodePtr& node, const ISelectable& selectable) override; + void onComponentSelection(const scene::INodePtr& node, const ISelectable& selectable) override; - SelectionChangedSignal signal_selectionChanged() const + SelectionChangedSignal signal_selectionChanged() const override { return _sigSelectionChanged; } - scene::INodePtr ultimateSelected(); - scene::INodePtr penultimateSelected(); + scene::INodePtr ultimateSelected() override; + scene::INodePtr penultimateSelected() override; - void setSelectedAll(bool selected); - void setSelectedAllComponents(bool selected); + void setSelectedAll(bool selected) override; + void setSelectedAllComponents(bool selected) override; - void foreachSelected(const Visitor& visitor); - void foreachSelectedComponent(const Visitor& visitor); + void foreachSelected(const Visitor& visitor) override; + void foreachSelectedComponent(const Visitor& visitor) override; - void foreachSelected(const std::function& functor); - void foreachSelectedComponent(const std::function& functor); + void foreachSelected(const std::function& functor) override; + void foreachSelectedComponent(const std::function& functor) override; - void foreachBrush(const std::function& functor); - void foreachFace(const std::function& functor); - void foreachPatch(const std::function& functor); + void foreachBrush(const std::function& functor) override; + void foreachFace(const std::function& functor) override; + void foreachPatch(const std::function& functor) override; void deselectAll(); - void SelectPoint(const render::View& view, const Vector2& device_point, const Vector2& device_epsilon, EModifier modifier, bool face); - void SelectArea(const render::View& view, const Vector2& device_point, const Vector2& device_delta, EModifier modifier, bool face); + void SelectPoint(const render::View& view, const Vector2& device_point, const Vector2& device_epsilon, EModifier modifier, bool face) override; + void SelectArea(const render::View& view, const Vector2& device_point, const Vector2& device_delta, EModifier modifier, bool face) override; void onManipulationStart() override; void onManipulationChanged() override; void onManipulationEnd() override; - const WorkZone& getWorkZone(); + const WorkZone& getWorkZone() override; void renderSolid(RenderableCollector& collector, const VolumeTest& volume) const override; void renderWireframe(RenderableCollector& collector, const VolumeTest& volume) const override; @@ -169,7 +169,7 @@ class RadiantSelectionSystem : protected: // Called when the app is idle to recalculate the workzone (if necessary) - virtual void onIdle(); + virtual void onIdle() override; // Traverses the scene and adds any selectable nodes matching the given SelectionTest to the "targetList". void testSelectScene(SelectablesList& targetList, SelectionTest& test, diff --git a/radiant/selection/algorithm/SelectionPolicies.h b/radiant/selection/algorithm/SelectionPolicies.h index 74d0de9e4a..7b4bbd3e0d 100644 --- a/radiant/selection/algorithm/SelectionPolicies.h +++ b/radiant/selection/algorithm/SelectionPolicies.h @@ -66,7 +66,7 @@ class SelectionPolicy_Touching const AABB& other(node->worldAABB()); for (unsigned int i = 0; i < 3; ++i) { - if (fabsf(box.origin[i] - other.origin[i]) > (box.extents[i] + other.extents[i])) { + if (std::abs(box.origin[i] - other.origin[i]) > (box.extents[i] + other.extents[i])) { return false; } } @@ -96,7 +96,7 @@ class SelectionPolicy_Inside } for (unsigned int i = 0; i < 3; ++i) { - if (fabsf(box.origin[i] - other.origin[i]) > (box.extents[i] - other.extents[i])) { + if (std::abs(box.origin[i] - other.origin[i]) > (box.extents[i] - other.extents[i])) { return false; } } diff --git a/radiant/selection/algorithm/Transformation.cpp b/radiant/selection/algorithm/Transformation.cpp index 9c9ca3b9de..ee5946294a 100644 --- a/radiant/selection/algorithm/Transformation.cpp +++ b/radiant/selection/algorithm/Transformation.cpp @@ -342,7 +342,7 @@ void nudgeSelected(ENudgeDirection direction, float amount, EViewType viewtype) { AxisBase axes(AxisBase_forViewType(viewtype)); - Vector3 view_direction(-axes.z); + //Vector3 view_direction(-axes.z); Vector3 nudge(AxisBase_axisForDirection(axes, direction) * amount); if (GlobalSelectionSystem().getActiveManipulatorType() == selection::Manipulator::Translate || diff --git a/radiant/selection/group/SelectionGroup.h b/radiant/selection/group/SelectionGroup.h index b8f18a83e1..2b4b2f41c2 100644 --- a/radiant/selection/group/SelectionGroup.h +++ b/radiant/selection/group/SelectionGroup.h @@ -76,7 +76,7 @@ class SelectionGroup : }); } - std::size_t size() const + std::size_t size() const override { return _nodes.size(); } diff --git a/radiant/selection/manipulators/RotateManipulator.h b/radiant/selection/manipulators/RotateManipulator.h index f7601ed6f3..2023efd7b6 100644 --- a/radiant/selection/manipulators/RotateManipulator.h +++ b/radiant/selection/manipulators/RotateManipulator.h @@ -68,7 +68,7 @@ class RotateManipulator : void updateCircleTransforms(); void render(RenderableCollector& collector, const VolumeTest& volume) override; - void render(const RenderInfo& info) const; + void render(const RenderInfo& info) const override; void testSelect(const render::View& view, const Matrix4& pivot2world) override; diff --git a/radiant/textool/item/FaceItem.h b/radiant/textool/item/FaceItem.h index 1aa51c6b41..35872095bd 100644 --- a/radiant/textool/item/FaceItem.h +++ b/radiant/textool/item/FaceItem.h @@ -21,13 +21,13 @@ class FaceItem : virtual ~FaceItem() {} // Gets the AABB of this object in texture space - virtual AABB getExtents(); + virtual AABB getExtents() override; // Renders this object's visual representation. - virtual void render(); + virtual void render() override; // Transforms this object with the given transformation matrix - virtual void transform(const Matrix4& matrix); + virtual void transform(const Matrix4& matrix) override; // Overrides default behaviour to pass the call to the first selected child item only // otherwise we get a double translation when moving stuff @@ -35,18 +35,18 @@ class FaceItem : /** greebo: Returns true if the object can be selected at the given coords. */ - virtual bool testSelect(const Rectangle& rectangle); + virtual bool testSelect(const Rectangle& rectangle) override; /** greebo: Snaps the face translation to the grid. */ - virtual void snapSelectedToGrid(float grid); + virtual void snapSelectedToGrid(float grid) override; /** greebo: Flips the face texdef (if selected) * about the given axis in texture space. * * @axis: 0 = s-axis flip, 1 = t-axis flip */ - virtual void flipSelected(const int& axis); + virtual void flipSelected(const int& axis) override; private: /** greebo: Calculates the mean value of all the texCoords, diff --git a/radiant/ui/about/AboutDialog.cpp b/radiant/ui/about/AboutDialog.cpp index 3a40d1f73c..e265286ffb 100644 --- a/radiant/ui/about/AboutDialog.cpp +++ b/radiant/ui/about/AboutDialog.cpp @@ -20,7 +20,9 @@ namespace ui { namespace { +#if WIN32 const char* const RKEY_SHOW_BUILD_TIME = "user/showBuildTime"; +#endif const char* const WINDOW_TITLE = N_("About DarkRadiant"); } diff --git a/radiant/ui/common/ShaderChooser.cpp b/radiant/ui/common/ShaderChooser.cpp index e14c196654..716ebbf783 100644 --- a/radiant/ui/common/ShaderChooser.cpp +++ b/radiant/ui/common/ShaderChooser.cpp @@ -14,8 +14,6 @@ namespace ui { const char* const LABEL_TITLE = N_("Choose Shader"); const std::string SHADER_PREFIXES = "textures"; - const int DEFAULT_SIZE_X = 550; - const int DEFAULT_SIZE_Y = 500; const std::string RKEY_WINDOW_STATE = "user/ui/textures/shaderChooser/window"; } diff --git a/radiant/ui/einspector/ClassnamePropertyEditor.h b/radiant/ui/einspector/ClassnamePropertyEditor.h index 467d5d3d4c..2b090d2f93 100644 --- a/radiant/ui/einspector/ClassnamePropertyEditor.h +++ b/radiant/ui/einspector/ClassnamePropertyEditor.h @@ -21,7 +21,7 @@ class ClassnamePropertyEditor : private: - void onBrowseButtonClick(); + void onBrowseButtonClick() override; public: diff --git a/radiant/ui/einspector/EntityInspector.cpp b/radiant/ui/einspector/EntityInspector.cpp index 55d6f1880e..a1eb23d86f 100644 --- a/radiant/ui/einspector/EntityInspector.cpp +++ b/radiant/ui/einspector/EntityInspector.cpp @@ -45,11 +45,8 @@ namespace ui { /* CONSTANTS */ -namespace { - - const int TREEVIEW_MIN_WIDTH = 220; - const int TREEVIEW_MIN_HEIGHT = 60; - +namespace +{ const char* const PROPERTY_NODES_XPATH = "/entityInspector//property"; const std::string RKEY_ROOT = "user/ui/entityInspector/"; diff --git a/radiant/ui/einspector/EntityPropertyEditor.h b/radiant/ui/einspector/EntityPropertyEditor.h index eecd534dc2..bb7fdb5deb 100644 --- a/radiant/ui/einspector/EntityPropertyEditor.h +++ b/radiant/ui/einspector/EntityPropertyEditor.h @@ -38,7 +38,7 @@ class EntityPropertyEditor: } private: - void onBrowseButtonClick(); + void onBrowseButtonClick() override; }; } diff --git a/radiant/ui/einspector/PropertyEditor.h b/radiant/ui/einspector/PropertyEditor.h index f272c45d22..5db4aef483 100644 --- a/radiant/ui/einspector/PropertyEditor.h +++ b/radiant/ui/einspector/PropertyEditor.h @@ -87,7 +87,7 @@ class PropertyEditor : // IPropertyEditor implementation wxPanel* getWidget() override; - virtual void updateFromEntity() + virtual void updateFromEntity() override { // nothing by default, override in subclasses if needed } diff --git a/radiant/ui/einspector/SkinPropertyEditor.h b/radiant/ui/einspector/SkinPropertyEditor.h index 821901a657..351c94f302 100644 --- a/radiant/ui/einspector/SkinPropertyEditor.h +++ b/radiant/ui/einspector/SkinPropertyEditor.h @@ -21,7 +21,7 @@ class SkinPropertyEditor : private: - void onBrowseButtonClick(); + void onBrowseButtonClick() override; public: @@ -41,7 +41,7 @@ class SkinPropertyEditor : return PropertyEditorPtr(new SkinPropertyEditor(parent, entity, name, options)); } - std::string runDialog(Entity* entity, const std::string& key); + std::string runDialog(Entity* entity, const std::string& key) override; }; } // namespace diff --git a/radiant/ui/einspector/SoundPropertyEditor.h b/radiant/ui/einspector/SoundPropertyEditor.h index fdf9e0708f..43e93df871 100644 --- a/radiant/ui/einspector/SoundPropertyEditor.h +++ b/radiant/ui/einspector/SoundPropertyEditor.h @@ -17,7 +17,7 @@ class SoundPropertyEditor : private: - void onBrowseButtonClick(); + void onBrowseButtonClick() override; public: diff --git a/radiant/ui/einspector/TexturePropertyEditor.h b/radiant/ui/einspector/TexturePropertyEditor.h index 9a4be74e5c..cee41a7ce7 100644 --- a/radiant/ui/einspector/TexturePropertyEditor.h +++ b/radiant/ui/einspector/TexturePropertyEditor.h @@ -22,7 +22,7 @@ class TexturePropertyEditor : private: - void onBrowseButtonClick(); + void onBrowseButtonClick() override; public: diff --git a/radiant/ui/mainframe/MainFrame.h b/radiant/ui/mainframe/MainFrame.h index 3afab82797..00bec984ac 100644 --- a/radiant/ui/mainframe/MainFrame.h +++ b/radiant/ui/mainframe/MainFrame.h @@ -58,10 +58,10 @@ class MainFrame : void toggleFullscreenCameraView(const cmd::ArgumentList& args); // RegisterableModule implementation - const std::string& getName() const; - const StringSet& getDependencies() const; - void initialiseModule(const ApplicationContext& ctx); - void shutdownModule(); + const std::string& getName() const override; + const StringSet& getDependencies() const override; + void initialiseModule(const ApplicationContext& ctx) override; + void shutdownModule() override; private: void create(); diff --git a/radiant/ui/mousetool/BindToolDialog.cpp b/radiant/ui/mousetool/BindToolDialog.cpp index 4727e884ba..6d74fe5af9 100644 --- a/radiant/ui/mousetool/BindToolDialog.cpp +++ b/radiant/ui/mousetool/BindToolDialog.cpp @@ -13,8 +13,6 @@ namespace ui namespace { - const int BINDTOOLDIALOG_DEFAULT_SIZE_X = 300; - const int BINDTOOLDIALOG_DEFAULT_SIZE_Y = 250; const char* const TOOLMAPPING_WINDOW_TITLE = N_("Select new Binding: %s"); } diff --git a/radiant/ui/patch/PatchThickenDialog.cpp b/radiant/ui/patch/PatchThickenDialog.cpp index 8a3cca62d0..7ff58aaca5 100644 --- a/radiant/ui/patch/PatchThickenDialog.cpp +++ b/radiant/ui/patch/PatchThickenDialog.cpp @@ -12,9 +12,6 @@ namespace { const char* const WINDOW_TITLE = N_("Patch Thicken"); - - const float DEFAULT_THICKNESS = 16.0f; - const bool DEFAULT_CREATE_SEAMS = TRUE; } namespace ui diff --git a/radiant/xyview/GlobalXYWnd.h b/radiant/xyview/GlobalXYWnd.h index b06698174d..7d96a99dff 100644 --- a/radiant/xyview/GlobalXYWnd.h +++ b/radiant/xyview/GlobalXYWnd.h @@ -157,10 +157,10 @@ class XYWndManager : void foreachMouseTool(const std::function& func); // RegisterableModule implementation - const std::string& getName() const; - const StringSet& getDependencies() const; - void initialiseModule(const ApplicationContext& ctx); - void shutdownModule(); + const std::string& getName() const override; + const StringSet& getDependencies() const override; + void initialiseModule(const ApplicationContext& ctx) override; + void shutdownModule() override; private: /* greebo: This function determines the point currently being "looked" at, it is used for toggling the ortho views diff --git a/radiant/xyview/XYWnd.h b/radiant/xyview/XYWnd.h index 48f919bf65..a0c21b2d26 100644 --- a/radiant/xyview/XYWnd.h +++ b/radiant/xyview/XYWnd.h @@ -116,7 +116,7 @@ class XYWnd : void positionView(const Vector3& position); const Vector3& getOrigin(); void setOrigin(const Vector3& origin); - void scroll(int x, int y); + void scroll(int x, int y) override; Vector4 getWindowCoordinates(); void draw(); @@ -125,38 +125,38 @@ class XYWnd : void drawGrid(); Vector3 convertXYToWorld(int x, int y); - void snapToGrid(Vector3& point); + void snapToGrid(Vector3& point) override; void mouseToPoint(int x, int y, Vector3& point); void beginMove(); void endMove(); - void zoomIn(); - void zoomOut(); + void zoomIn() override; + void zoomOut() override; void setActive(bool b); bool isActive() const; - void setCursorType(IOrthoView::CursorType type); + void setCursorType(IOrthoView::CursorType type) override; void updateModelview(); void updateProjection(); virtual void setViewType(EViewType n); - EViewType getViewType() const; + EViewType getViewType() const override; void setScale(float f); - float getScale() const; + float getScale() const override; int getWidth() const; int getHeight() const; // greebo: CameraObserver implementation; gets called when the camera is moved - void cameraMoved(); + void cameraMoved() override; // greebo: This gets called upon scene change - void onSceneGraphChange(); + void onSceneGraphChange() override; protected: // Disconnects all widgets and unsubscribes as observer diff --git a/radiant/xyview/tools/BrushCreatorTool.cpp b/radiant/xyview/tools/BrushCreatorTool.cpp index 655be9a472..1a349f837e 100644 --- a/radiant/xyview/tools/BrushCreatorTool.cpp +++ b/radiant/xyview/tools/BrushCreatorTool.cpp @@ -128,7 +128,7 @@ MouseTool::Result BrushCreatorTool::onMouseUp(Event& ev) try { // We only operate on XY view events, so attempt to cast - dynamic_cast(ev); + dynamic_cast(ev).getScale(); GlobalUndoSystem().finish("brushDragNew"); diff --git a/radiant/xyview/tools/CameraAngleTool.h b/radiant/xyview/tools/CameraAngleTool.h index 0fe6d8150d..93489d5be2 100644 --- a/radiant/xyview/tools/CameraAngleTool.h +++ b/radiant/xyview/tools/CameraAngleTool.h @@ -65,7 +65,7 @@ class CameraAngleTool : try { // We only operate on XY view events, so attempt to cast - dynamic_cast(ev); + dynamic_cast(ev).getScale(); return Result::Finished; } catch (std::bad_cast&) diff --git a/radiant/xyview/tools/CameraMoveTool.h b/radiant/xyview/tools/CameraMoveTool.h index e917fa5d9f..7ab2c5788d 100644 --- a/radiant/xyview/tools/CameraMoveTool.h +++ b/radiant/xyview/tools/CameraMoveTool.h @@ -63,7 +63,7 @@ class CameraMoveTool : try { // We only operate on XY view events, so attempt to cast - dynamic_cast(ev); + dynamic_cast(ev).getScale(); return Result::Finished; } catch (std::bad_cast&) diff --git a/radiant/xyview/tools/ClipperTool.cpp b/radiant/xyview/tools/ClipperTool.cpp index d75f58c647..486f902486 100644 --- a/radiant/xyview/tools/ClipperTool.cpp +++ b/radiant/xyview/tools/ClipperTool.cpp @@ -100,7 +100,7 @@ MouseTool::Result ClipperTool::onMouseUp(Event& ev) try { // We only operate on XY view events, so attempt to cast - dynamic_cast(ev); + dynamic_cast(ev).getScale(); if (GlobalClipper().clipMode()) { diff --git a/radiant/xyview/tools/MeasurementTool.cpp b/radiant/xyview/tools/MeasurementTool.cpp index 43acdd6e38..730ad533a4 100644 --- a/radiant/xyview/tools/MeasurementTool.cpp +++ b/radiant/xyview/tools/MeasurementTool.cpp @@ -108,7 +108,7 @@ MouseTool::Result MeasurementTool::onMouseUp(Event& ev) try { // We only operate on XY view events, so attempt to cast - dynamic_cast(ev); + dynamic_cast(ev).getScale(); // We continue until the user hits ESC return Result::Continued; diff --git a/radiant/xyview/tools/MoveViewTool.h b/radiant/xyview/tools/MoveViewTool.h index a15bedf26b..c1d372e1d8 100644 --- a/radiant/xyview/tools/MoveViewTool.h +++ b/radiant/xyview/tools/MoveViewTool.h @@ -38,7 +38,7 @@ class MoveViewTool : { try { - dynamic_cast(ev); + dynamic_cast(ev).getScale(); return Result::Activated; } catch (std::bad_cast&) @@ -72,7 +72,7 @@ class MoveViewTool : try { // We only operate on XY view events, so attempt to cast - dynamic_cast(ev); + dynamic_cast(ev).getScale(); return Result::Finished; } catch (std::bad_cast&) diff --git a/radiant/xyview/tools/ZoomTool.h b/radiant/xyview/tools/ZoomTool.h index 328d3d0011..0b02798acb 100644 --- a/radiant/xyview/tools/ZoomTool.h +++ b/radiant/xyview/tools/ZoomTool.h @@ -41,7 +41,8 @@ class ZoomTool : { try { - dynamic_cast(ev); + // Perform a dynamic cast to ensure we're on the correct view + dynamic_cast(ev).getScale(); _dragZoom = 0; @@ -94,7 +95,7 @@ class ZoomTool : try { // We only operate on XY view events, so attempt to cast - dynamic_cast(ev); + dynamic_cast(ev).getScale(); return Result::Finished; } catch (std::bad_cast&) diff --git a/tools/xcode/DarkRadiant.xcodeproj/project.pbxproj b/tools/xcode/DarkRadiant.xcodeproj/project.pbxproj index eee5bb9551..7681aafb8c 100644 --- a/tools/xcode/DarkRadiant.xcodeproj/project.pbxproj +++ b/tools/xcode/DarkRadiant.xcodeproj/project.pbxproj @@ -3775,6 +3775,113 @@ 3AEDE3CD1E4F04BD005A8641 /* base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = base.xcconfig; sourceTree = ""; }; 3AEDE3CE1E4F04E9005A8641 /* sigc++.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "sigc++.xcconfig"; sourceTree = ""; }; 3AF475D01E6B247B006B26C2 /* darkradiant.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = darkradiant.icns; path = ../darkradiant.icns; sourceTree = ""; }; + 3AF475D31E6BEE89006B26C2 /* Bounded.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Bounded.h; path = ../../include/Bounded.h; sourceTree = ""; }; + 3AF475D41E6BEE89006B26C2 /* editable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = editable.h; path = ../../include/editable.h; sourceTree = ""; }; + 3AF475D51E6BEE89006B26C2 /* GLProgramAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GLProgramAttributes.h; path = ../../include/GLProgramAttributes.h; sourceTree = ""; }; + 3AF475D61E6BEE89006B26C2 /* i18n.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = i18n.h; path = ../../include/i18n.h; sourceTree = ""; }; + 3AF475D71E6BEE89006B26C2 /* iaasfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iaasfile.h; path = ../../include/iaasfile.h; sourceTree = ""; }; + 3AF475D81E6BEE89006B26C2 /* ianimationchooser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ianimationchooser.h; path = ../../include/ianimationchooser.h; sourceTree = ""; }; + 3AF475D91E6BEE89006B26C2 /* iarchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iarchive.h; path = ../../include/iarchive.h; sourceTree = ""; }; + 3AF475DA1E6BEE89006B26C2 /* ibrush.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ibrush.h; path = ../../include/ibrush.h; sourceTree = ""; }; + 3AF475DB1E6BEE89006B26C2 /* icamera.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = icamera.h; path = ../../include/icamera.h; sourceTree = ""; }; + 3AF475DC1E6BEE89006B26C2 /* icameraview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = icameraview.h; path = ../../include/icameraview.h; sourceTree = ""; }; + 3AF475DD1E6BEE89006B26C2 /* iclipper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iclipper.h; path = ../../include/iclipper.h; sourceTree = ""; }; + 3AF475DE1E6BEE89006B26C2 /* icommandsystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = icommandsystem.h; path = ../../include/icommandsystem.h; sourceTree = ""; }; + 3AF475DF1E6BEE89006B26C2 /* icounter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = icounter.h; path = ../../include/icounter.h; sourceTree = ""; }; + 3AF475E01E6BEE89006B26C2 /* icurve.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = icurve.h; path = ../../include/icurve.h; sourceTree = ""; }; + 3AF475E11E6BEE89006B26C2 /* idatastream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = idatastream.h; path = ../../include/idatastream.h; sourceTree = ""; }; + 3AF475E21E6BEE89006B26C2 /* idialogmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = idialogmanager.h; path = ../../include/idialogmanager.h; sourceTree = ""; }; + 3AF475E31E6BEE89006B26C2 /* ieclass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ieclass.h; path = ../../include/ieclass.h; sourceTree = ""; }; + 3AF475E41E6BEE89006B26C2 /* ientity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ientity.h; path = ../../include/ientity.h; sourceTree = ""; }; + 3AF475E51E6BEE89006B26C2 /* ientityinspector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ientityinspector.h; path = ../../include/ientityinspector.h; sourceTree = ""; }; + 3AF475E61E6BEE89006B26C2 /* ieventmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ieventmanager.h; path = ../../include/ieventmanager.h; sourceTree = ""; }; + 3AF475E71E6BEE89006B26C2 /* ifilechooser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ifilechooser.h; path = ../../include/ifilechooser.h; sourceTree = ""; }; + 3AF475E81E6BEE89006B26C2 /* ifilesystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ifilesystem.h; path = ../../include/ifilesystem.h; sourceTree = ""; }; + 3AF475E91E6BEE89006B26C2 /* ifiletypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ifiletypes.h; path = ../../include/ifiletypes.h; sourceTree = ""; }; + 3AF475EA1E6BEE89006B26C2 /* ifilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ifilter.h; path = ../../include/ifilter.h; sourceTree = ""; }; + 3AF475EB1E6BEE89006B26C2 /* ifiltermenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ifiltermenu.h; path = ../../include/ifiltermenu.h; sourceTree = ""; }; + 3AF475EC1E6BEE89006B26C2 /* ifonts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ifonts.h; path = ../../include/ifonts.h; sourceTree = ""; }; + 3AF475ED1E6BEE89006B26C2 /* igame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = igame.h; path = ../../include/igame.h; sourceTree = ""; }; + 3AF475EE1E6BEE89006B26C2 /* igl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = igl.h; path = ../../include/igl.h; sourceTree = ""; }; + 3AF475EF1E6BEE89006B26C2 /* iglprogram.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iglprogram.h; path = ../../include/iglprogram.h; sourceTree = ""; }; + 3AF475F01E6BEE89006B26C2 /* iglrender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iglrender.h; path = ../../include/iglrender.h; sourceTree = ""; }; + 3AF475F11E6BEE89006B26C2 /* igrid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = igrid.h; path = ../../include/igrid.h; sourceTree = ""; }; + 3AF475F21E6BEE89006B26C2 /* igroupdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = igroupdialog.h; path = ../../include/igroupdialog.h; sourceTree = ""; }; + 3AF475F31E6BEE89006B26C2 /* igroupnode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = igroupnode.h; path = ../../include/igroupnode.h; sourceTree = ""; }; + 3AF475F41E6BEE89006B26C2 /* iimage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iimage.h; path = ../../include/iimage.h; sourceTree = ""; }; + 3AF475F51E6BEE89006B26C2 /* iinteractiveview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iinteractiveview.h; path = ../../include/iinteractiveview.h; sourceTree = ""; }; + 3AF475F61E6BEE89006B26C2 /* ilayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ilayer.h; path = ../../include/ilayer.h; sourceTree = ""; }; + 3AF475F71E6BEE89006B26C2 /* ilightnode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ilightnode.h; path = ../../include/ilightnode.h; sourceTree = ""; }; + 3AF475F81E6BEE89006B26C2 /* imainframe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imainframe.h; path = ../../include/imainframe.h; sourceTree = ""; }; + 3AF475F91E6BEE89006B26C2 /* imainframelayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imainframelayout.h; path = ../../include/imainframelayout.h; sourceTree = ""; }; + 3AF475FA1E6BEE89006B26C2 /* imap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imap.h; path = ../../include/imap.h; sourceTree = ""; }; + 3AF475FB1E6BEE89006B26C2 /* imapformat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imapformat.h; path = ../../include/imapformat.h; sourceTree = ""; }; + 3AF475FC1E6BEE89006B26C2 /* imapinfofile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imapinfofile.h; path = ../../include/imapinfofile.h; sourceTree = ""; }; + 3AF475FD1E6BEE89006B26C2 /* imapresource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imapresource.h; path = ../../include/imapresource.h; sourceTree = ""; }; + 3AF475FE1E6BEE89006B26C2 /* imd5anim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imd5anim.h; path = ../../include/imd5anim.h; sourceTree = ""; }; + 3AF475FF1E6BEE89006B26C2 /* imd5model.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imd5model.h; path = ../../include/imd5model.h; sourceTree = ""; }; + 3AF476001E6BEE89006B26C2 /* imediabrowser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imediabrowser.h; path = ../../include/imediabrowser.h; sourceTree = ""; }; + 3AF476011E6BEE89006B26C2 /* imenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imenu.h; path = ../../include/imenu.h; sourceTree = ""; }; + 3AF476021E6BEE89006B26C2 /* imodel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imodel.h; path = ../../include/imodel.h; sourceTree = ""; }; + 3AF476031E6BEE89006B26C2 /* imodelcache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imodelcache.h; path = ../../include/imodelcache.h; sourceTree = ""; }; + 3AF476041E6BEE89006B26C2 /* imodelsurface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imodelsurface.h; path = ../../include/imodelsurface.h; sourceTree = ""; }; + 3AF476051E6BEE89006B26C2 /* imodule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imodule.h; path = ../../include/imodule.h; sourceTree = ""; }; + 3AF476061E6BEE89006B26C2 /* imousetool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imousetool.h; path = ../../include/imousetool.h; sourceTree = ""; }; + 3AF476071E6BEE89006B26C2 /* imousetoolevent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imousetoolevent.h; path = ../../include/imousetoolevent.h; sourceTree = ""; }; + 3AF476081E6BEE89006B26C2 /* imousetoolmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imousetoolmanager.h; path = ../../include/imousetoolmanager.h; sourceTree = ""; }; + 3AF476091E6BEE89006B26C2 /* inameobserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = inameobserver.h; path = ../../include/inameobserver.h; sourceTree = ""; }; + 3AF4760A1E6BEE89006B26C2 /* inamespace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = inamespace.h; path = ../../include/inamespace.h; sourceTree = ""; }; + 3AF4760B1E6BEE89006B26C2 /* inode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = inode.h; path = ../../include/inode.h; sourceTree = ""; }; + 3AF4760C1E6BEE89006B26C2 /* iorthocontextmenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iorthocontextmenu.h; path = ../../include/iorthocontextmenu.h; sourceTree = ""; }; + 3AF4760D1E6BEE89006B26C2 /* iorthoview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iorthoview.h; path = ../../include/iorthoview.h; sourceTree = ""; }; + 3AF4760E1E6BEE89006B26C2 /* iparticlenode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iparticlenode.h; path = ../../include/iparticlenode.h; sourceTree = ""; }; + 3AF4760F1E6BEE89006B26C2 /* iparticles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iparticles.h; path = ../../include/iparticles.h; sourceTree = ""; }; + 3AF476101E6BEE89006B26C2 /* iparticlestage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iparticlestage.h; path = ../../include/iparticlestage.h; sourceTree = ""; }; + 3AF476111E6BEE89006B26C2 /* ipatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ipatch.h; path = ../../include/ipatch.h; sourceTree = ""; }; + 3AF476121E6BEE89006B26C2 /* ipath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ipath.h; path = ../../include/ipath.h; sourceTree = ""; }; + 3AF476131E6BEE89006B26C2 /* ipreferencesystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ipreferencesystem.h; path = ../../include/ipreferencesystem.h; sourceTree = ""; }; + 3AF476141E6BEE89006B26C2 /* iradiant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iradiant.h; path = ../../include/iradiant.h; sourceTree = ""; }; + 3AF476151E6BEE89006B26C2 /* iregistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iregistry.h; path = ../../include/iregistry.h; sourceTree = ""; }; + 3AF476161E6BEE89006B26C2 /* irender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = irender.h; path = ../../include/irender.h; sourceTree = ""; }; + 3AF476171E6BEE89006B26C2 /* irenderable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = irenderable.h; path = ../../include/irenderable.h; sourceTree = ""; }; + 3AF476181E6BEE89006B26C2 /* irendersystemfactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = irendersystemfactory.h; path = ../../include/irendersystemfactory.h; sourceTree = ""; }; + 3AF476191E6BEE89006B26C2 /* iresourcechooser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iresourcechooser.h; path = ../../include/iresourcechooser.h; sourceTree = ""; }; + 3AF4761A1E6BEE89006B26C2 /* iscenegraph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iscenegraph.h; path = ../../include/iscenegraph.h; sourceTree = ""; }; + 3AF4761B1E6BEE89006B26C2 /* iscenegraphfactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iscenegraphfactory.h; path = ../../include/iscenegraphfactory.h; sourceTree = ""; }; + 3AF4761C1E6BEE89006B26C2 /* iscript.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iscript.h; path = ../../include/iscript.h; sourceTree = ""; }; + 3AF4761D1E6BEE89006B26C2 /* iselectable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iselectable.h; path = ../../include/iselectable.h; sourceTree = ""; }; + 3AF4761E1E6BEE89006B26C2 /* iselection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iselection.h; path = ../../include/iselection.h; sourceTree = ""; }; + 3AF4761F1E6BEE89006B26C2 /* iselectiongroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iselectiongroup.h; path = ../../include/iselectiongroup.h; sourceTree = ""; }; + 3AF476201E6BEE89006B26C2 /* iselectionset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iselectionset.h; path = ../../include/iselectionset.h; sourceTree = ""; }; + 3AF476211E6BEE89006B26C2 /* iselectiontest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iselectiontest.h; path = ../../include/iselectiontest.h; sourceTree = ""; }; + 3AF476221E6BEE89006B26C2 /* ishaderexpression.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ishaderexpression.h; path = ../../include/ishaderexpression.h; sourceTree = ""; }; + 3AF476231E6BEE89006B26C2 /* ishaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ishaders.h; path = ../../include/ishaders.h; sourceTree = ""; }; + 3AF476241E6BEE89006B26C2 /* isound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = isound.h; path = ../../include/isound.h; sourceTree = ""; }; + 3AF476251E6BEE89006B26C2 /* ispacepartition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ispacepartition.h; path = ../../include/ispacepartition.h; sourceTree = ""; }; + 3AF476261E6BEE89006B26C2 /* itexdef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = itexdef.h; path = ../../include/itexdef.h; sourceTree = ""; }; + 3AF476271E6BEE89006B26C2 /* itextstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = itextstream.h; path = ../../include/itextstream.h; sourceTree = ""; }; + 3AF476281E6BEE89006B26C2 /* ithread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ithread.h; path = ../../include/ithread.h; sourceTree = ""; }; + 3AF476291E6BEE89006B26C2 /* itraceable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = itraceable.h; path = ../../include/itraceable.h; sourceTree = ""; }; + 3AF4762A1E6BEE89006B26C2 /* itransformable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = itransformable.h; path = ../../include/itransformable.h; sourceTree = ""; }; + 3AF4762B1E6BEE89006B26C2 /* itransformnode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = itransformnode.h; path = ../../include/itransformnode.h; sourceTree = ""; }; + 3AF4762C1E6BEE89006B26C2 /* iuimanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iuimanager.h; path = ../../include/iuimanager.h; sourceTree = ""; }; + 3AF4762D1E6BEE89006B26C2 /* iundo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iundo.h; path = ../../include/iundo.h; sourceTree = ""; }; + 3AF4762E1E6BEE89006B26C2 /* ivolumetest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ivolumetest.h; path = ../../include/ivolumetest.h; sourceTree = ""; }; + 3AF4762F1E6BEE89006B26C2 /* mapfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mapfile.h; path = ../../include/mapfile.h; sourceTree = ""; }; + 3AF476301E6BEE89006B26C2 /* modelskin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = modelskin.h; path = ../../include/modelskin.h; sourceTree = ""; }; + 3AF476311E6BEE89006B26C2 /* ModResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ModResource.h; path = ../../include/ModResource.h; sourceTree = ""; }; + 3AF476321E6BEE89006B26C2 /* precompiled_boost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = precompiled_boost.h; path = ../../include/precompiled_boost.h; sourceTree = ""; }; + 3AF476331E6BEE89006B26C2 /* precompiled_interfaces.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = precompiled_interfaces.h; path = ../../include/precompiled_interfaces.h; sourceTree = ""; }; + 3AF476341E6BEE89006B26C2 /* precompiled_main.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = precompiled_main.h; path = ../../include/precompiled_main.h; sourceTree = ""; }; + 3AF476351E6BEE89006B26C2 /* precompiled_math.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = precompiled_math.h; path = ../../include/precompiled_math.h; sourceTree = ""; }; + 3AF476361E6BEE89006B26C2 /* Rotatable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Rotatable.h; path = ../../include/Rotatable.h; sourceTree = ""; }; + 3AF476371E6BEE89006B26C2 /* Scalable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Scalable.h; path = ../../include/Scalable.h; sourceTree = ""; }; + 3AF476381E6BEE89006B26C2 /* ShaderLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ShaderLayer.h; path = ../../include/ShaderLayer.h; sourceTree = ""; }; + 3AF476391E6BEE89006B26C2 /* StringSerialisable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StringSerialisable.h; path = ../../include/StringSerialisable.h; sourceTree = ""; }; + 3AF4763A1E6BEE89006B26C2 /* Texture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Texture.h; path = ../../include/Texture.h; sourceTree = ""; }; + 3AF4763B1E6BEE89006B26C2 /* Translatable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Translatable.h; path = ../../include/Translatable.h; sourceTree = ""; }; + 3AF4763C1E6BEE89006B26C2 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = version.h; path = ../../include/version.h; sourceTree = ""; }; + 3AF4763D1E6BEE89006B26C2 /* VolumeIntersectionValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VolumeIntersectionValue.h; path = ../../include/VolumeIntersectionValue.h; sourceTree = ""; }; 3AF743021E4F79DA003465B5 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 3AF743041E4F79FC003465B5 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; }; 3AF743061E4F7A06003465B5 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; @@ -5164,6 +5271,7 @@ 3ADBCC681E4E4B7C00CA94F6 = { isa = PBXGroup; children = ( + 3AF475D21E6BEE74006B26C2 /* Include */, 3A01240F1E50426500A62BC1 /* Configuration */, 3AE20CD41E59687300F5A0A6 /* Bundle */, 3A01240E1E50420C00A62BC1 /* Libraries */, @@ -6480,6 +6588,120 @@ path = DarkRadiant; sourceTree = SOURCE_ROOT; }; + 3AF475D21E6BEE74006B26C2 /* Include */ = { + isa = PBXGroup; + children = ( + 3AF475D31E6BEE89006B26C2 /* Bounded.h */, + 3AF475D41E6BEE89006B26C2 /* editable.h */, + 3AF475D51E6BEE89006B26C2 /* GLProgramAttributes.h */, + 3AF475D61E6BEE89006B26C2 /* i18n.h */, + 3AF475D71E6BEE89006B26C2 /* iaasfile.h */, + 3AF475D81E6BEE89006B26C2 /* ianimationchooser.h */, + 3AF475D91E6BEE89006B26C2 /* iarchive.h */, + 3AF475DA1E6BEE89006B26C2 /* ibrush.h */, + 3AF475DB1E6BEE89006B26C2 /* icamera.h */, + 3AF475DC1E6BEE89006B26C2 /* icameraview.h */, + 3AF475DD1E6BEE89006B26C2 /* iclipper.h */, + 3AF475DE1E6BEE89006B26C2 /* icommandsystem.h */, + 3AF475DF1E6BEE89006B26C2 /* icounter.h */, + 3AF475E01E6BEE89006B26C2 /* icurve.h */, + 3AF475E11E6BEE89006B26C2 /* idatastream.h */, + 3AF475E21E6BEE89006B26C2 /* idialogmanager.h */, + 3AF475E31E6BEE89006B26C2 /* ieclass.h */, + 3AF475E41E6BEE89006B26C2 /* ientity.h */, + 3AF475E51E6BEE89006B26C2 /* ientityinspector.h */, + 3AF475E61E6BEE89006B26C2 /* ieventmanager.h */, + 3AF475E71E6BEE89006B26C2 /* ifilechooser.h */, + 3AF475E81E6BEE89006B26C2 /* ifilesystem.h */, + 3AF475E91E6BEE89006B26C2 /* ifiletypes.h */, + 3AF475EA1E6BEE89006B26C2 /* ifilter.h */, + 3AF475EB1E6BEE89006B26C2 /* ifiltermenu.h */, + 3AF475EC1E6BEE89006B26C2 /* ifonts.h */, + 3AF475ED1E6BEE89006B26C2 /* igame.h */, + 3AF475EE1E6BEE89006B26C2 /* igl.h */, + 3AF475EF1E6BEE89006B26C2 /* iglprogram.h */, + 3AF475F01E6BEE89006B26C2 /* iglrender.h */, + 3AF475F11E6BEE89006B26C2 /* igrid.h */, + 3AF475F21E6BEE89006B26C2 /* igroupdialog.h */, + 3AF475F31E6BEE89006B26C2 /* igroupnode.h */, + 3AF475F41E6BEE89006B26C2 /* iimage.h */, + 3AF475F51E6BEE89006B26C2 /* iinteractiveview.h */, + 3AF475F61E6BEE89006B26C2 /* ilayer.h */, + 3AF475F71E6BEE89006B26C2 /* ilightnode.h */, + 3AF475F81E6BEE89006B26C2 /* imainframe.h */, + 3AF475F91E6BEE89006B26C2 /* imainframelayout.h */, + 3AF475FA1E6BEE89006B26C2 /* imap.h */, + 3AF475FB1E6BEE89006B26C2 /* imapformat.h */, + 3AF475FC1E6BEE89006B26C2 /* imapinfofile.h */, + 3AF475FD1E6BEE89006B26C2 /* imapresource.h */, + 3AF475FE1E6BEE89006B26C2 /* imd5anim.h */, + 3AF475FF1E6BEE89006B26C2 /* imd5model.h */, + 3AF476001E6BEE89006B26C2 /* imediabrowser.h */, + 3AF476011E6BEE89006B26C2 /* imenu.h */, + 3AF476021E6BEE89006B26C2 /* imodel.h */, + 3AF476031E6BEE89006B26C2 /* imodelcache.h */, + 3AF476041E6BEE89006B26C2 /* imodelsurface.h */, + 3AF476051E6BEE89006B26C2 /* imodule.h */, + 3AF476061E6BEE89006B26C2 /* imousetool.h */, + 3AF476071E6BEE89006B26C2 /* imousetoolevent.h */, + 3AF476081E6BEE89006B26C2 /* imousetoolmanager.h */, + 3AF476091E6BEE89006B26C2 /* inameobserver.h */, + 3AF4760A1E6BEE89006B26C2 /* inamespace.h */, + 3AF4760B1E6BEE89006B26C2 /* inode.h */, + 3AF4760C1E6BEE89006B26C2 /* iorthocontextmenu.h */, + 3AF4760D1E6BEE89006B26C2 /* iorthoview.h */, + 3AF4760E1E6BEE89006B26C2 /* iparticlenode.h */, + 3AF4760F1E6BEE89006B26C2 /* iparticles.h */, + 3AF476101E6BEE89006B26C2 /* iparticlestage.h */, + 3AF476111E6BEE89006B26C2 /* ipatch.h */, + 3AF476121E6BEE89006B26C2 /* ipath.h */, + 3AF476131E6BEE89006B26C2 /* ipreferencesystem.h */, + 3AF476141E6BEE89006B26C2 /* iradiant.h */, + 3AF476151E6BEE89006B26C2 /* iregistry.h */, + 3AF476161E6BEE89006B26C2 /* irender.h */, + 3AF476171E6BEE89006B26C2 /* irenderable.h */, + 3AF476181E6BEE89006B26C2 /* irendersystemfactory.h */, + 3AF476191E6BEE89006B26C2 /* iresourcechooser.h */, + 3AF4761A1E6BEE89006B26C2 /* iscenegraph.h */, + 3AF4761B1E6BEE89006B26C2 /* iscenegraphfactory.h */, + 3AF4761C1E6BEE89006B26C2 /* iscript.h */, + 3AF4761D1E6BEE89006B26C2 /* iselectable.h */, + 3AF4761E1E6BEE89006B26C2 /* iselection.h */, + 3AF4761F1E6BEE89006B26C2 /* iselectiongroup.h */, + 3AF476201E6BEE89006B26C2 /* iselectionset.h */, + 3AF476211E6BEE89006B26C2 /* iselectiontest.h */, + 3AF476221E6BEE89006B26C2 /* ishaderexpression.h */, + 3AF476231E6BEE89006B26C2 /* ishaders.h */, + 3AF476241E6BEE89006B26C2 /* isound.h */, + 3AF476251E6BEE89006B26C2 /* ispacepartition.h */, + 3AF476261E6BEE89006B26C2 /* itexdef.h */, + 3AF476271E6BEE89006B26C2 /* itextstream.h */, + 3AF476281E6BEE89006B26C2 /* ithread.h */, + 3AF476291E6BEE89006B26C2 /* itraceable.h */, + 3AF4762A1E6BEE89006B26C2 /* itransformable.h */, + 3AF4762B1E6BEE89006B26C2 /* itransformnode.h */, + 3AF4762C1E6BEE89006B26C2 /* iuimanager.h */, + 3AF4762D1E6BEE89006B26C2 /* iundo.h */, + 3AF4762E1E6BEE89006B26C2 /* ivolumetest.h */, + 3AF4762F1E6BEE89006B26C2 /* mapfile.h */, + 3AF476301E6BEE89006B26C2 /* modelskin.h */, + 3AF476311E6BEE89006B26C2 /* ModResource.h */, + 3AF476321E6BEE89006B26C2 /* precompiled_boost.h */, + 3AF476331E6BEE89006B26C2 /* precompiled_interfaces.h */, + 3AF476341E6BEE89006B26C2 /* precompiled_main.h */, + 3AF476351E6BEE89006B26C2 /* precompiled_math.h */, + 3AF476361E6BEE89006B26C2 /* Rotatable.h */, + 3AF476371E6BEE89006B26C2 /* Scalable.h */, + 3AF476381E6BEE89006B26C2 /* ShaderLayer.h */, + 3AF476391E6BEE89006B26C2 /* StringSerialisable.h */, + 3AF4763A1E6BEE89006B26C2 /* Texture.h */, + 3AF4763B1E6BEE89006B26C2 /* Translatable.h */, + 3AF4763C1E6BEE89006B26C2 /* version.h */, + 3AF4763D1E6BEE89006B26C2 /* VolumeIntersectionValue.h */, + ); + name = Include; + sourceTree = ""; + }; 3AF7430F1E4F861A003465B5 /* brush */ = { isa = PBXGroup; children = ( diff --git a/tools/xcode/DarkRadiant.xcodeproj/xcshareddata/xcschemes/DarkRadiant.xcscheme b/tools/xcode/DarkRadiant.xcodeproj/xcshareddata/xcschemes/DarkRadiant.xcscheme new file mode 100644 index 0000000000..09e65006ae --- /dev/null +++ b/tools/xcode/DarkRadiant.xcodeproj/xcshareddata/xcschemes/DarkRadiant.xcscheme @@ -0,0 +1,623 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/xcode/sound.xcconfig b/tools/xcode/sound.xcconfig index c9c10561af..dbb5096c7d 100644 --- a/tools/xcode/sound.xcconfig +++ b/tools/xcode/sound.xcconfig @@ -9,7 +9,7 @@ OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS) $(DR_BASE_CPLUSPLUSFLAGS) HEADER_SEARCH_PATHS = $(DR_BASE_HEADER_SEARCH_PATHS) "/opt/local/include" -LIBRARY_SEARCH_PATHS = $(DR_BASE_LIBRARY_SEARCH_PATHS) "/opt/local/libs" +LIBRARY_SEARCH_PATHS = $(DR_BASE_LIBRARY_SEARCH_PATHS) "/opt/local/lib" OTHER_LDFLAGS = $(DR_BASE_LINKFLAGS) "-lvorbisfile" FRAMEWORK_SEARCH_PATHS = "/System/Library/Frameworks" \ No newline at end of file