diff --git a/docs/index.html b/docs/index.html index fd57079..36082c6 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1,7 +1,7 @@ - - - + + + @@ -11,18 +11,18 @@ - + - + - + - + - MS-Engine 24.9.10.1 API reference + MS-Engine 24.9.12.69 API reference -

MS-Engine 24.9.10.1 API reference

+

MS-Engine 24.9.12.69 API reference

@@ -99,7 +99,7 @@

JavaScript is required to show and hide elements.

- - - - - - + -
Copyright © 2024 MS-Design, All Rights Reserved.
- This document was generated at Tue Sep 10 00:10:54 2024 +0100
+ This document was generated at Thu Sep 12 21:21:23 2024 +0100 diff --git a/src/archive.hpp b/src/archive.hpp index 29c26e9..f810928 100644 --- a/src/archive.hpp +++ b/src/archive.hpp @@ -415,7 +415,7 @@ CTOR_MEM_BEGIN_ASYNC_CSLAVE(Archives, Archive, ICHelperUnsafe), cLog->LogInfoExSafe("Archive unloaded '$' successfully.", IdentGet()); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Archive) // Supress copy constructor for safety + DELETECOPYCTORS(Archive) // Suppress default functions for safety /* -- Done with these defines -------------------------------------------- */ #undef LZMAGetHandle // Done with this macro #undef LZMAOpen // Done with this macro diff --git a/src/asset.hpp b/src/asset.hpp index 231973d..bf616f0 100644 --- a/src/asset.hpp +++ b/src/asset.hpp @@ -221,7 +221,7 @@ CTOR_MEM_BEGIN_ASYNC_CSLAVE(Assets, Asset, ICHelperUnsafe), /* -- Destructor --------------------------------------------------------- */ ~Asset(void) { AsyncCancel(); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Asset) // Disable copy constructor and operator + DELETECOPYCTORS(Asset) // Suppress default functions for safety };/* ======================================================================= */ CTOR_END_ASYNC_NOFUNCS(Assets, Asset, ASSET, ASSET, bOverride(false)); /* -- Class to help enumerate files ---------------------------------------- */ diff --git a/src/async.hpp b/src/async.hpp index 7276eb9..870dd0f 100644 --- a/src/async.hpp +++ b/src/async.hpp @@ -617,7 +617,7 @@ templateclass AsyncLoader : AsyncStop(); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(AsyncLoader) // Disable copy constructor + DELETECOPYCTORS(AsyncLoader) // Suppress default functions for safety };/* -- Function to wait for async of all members in a collector ----------- */ templateclass CoEncoder : /* -- Base classes ------------------------------------------------------- */ @@ -508,7 +508,7 @@ templateclass CoEncoder : /* -- Code ------------------------------------------------------------- */ { InitHeader(); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(CoEncoder) // Omit copy constructor for safety + DELETECOPYCTORS(CoEncoder) // Suppress default functions for safety };/* ======================================================================= ** ** ######################################################################### ** ** ## Encoder helpers ## ** @@ -564,7 +564,7 @@ templateclass Block final : public EncoderType /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Block) // Omit copy constructor for safety + DELETECOPYCTORS(Block) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ } // End of public module namespace /* ------------------------------------------------------------------------- */ diff --git a/src/collect.hpp b/src/collect.hpp index c06bd9b..a423830 100644 --- a/src/collect.hpp +++ b/src/collect.hpp @@ -36,7 +36,7 @@ class LuaIdent { /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(LuaIdent) // Don't need the copy constructor + DELETECOPYCTORS(LuaIdent) // Suppress default functions for safety };/* -- Collector header --------------------------------------------------- */ #define CTOR_HDR_BEGIN(p, /* The parent (collector) class type */\ m, /* The member class type */\ @@ -58,7 +58,7 @@ class LuaIdent { public LuaIdent, /* Name of object for Lua */\ public hn /* Derived by our collector class */\ __VA_ARGS__ /* Any other custom class derives */\ - { DELETECOPYCTORS(p) /* Remove default functions */\ + { DELETECOPYCTORS(p) /* Suppress copy constructor */\ p(void); /* Constructor prototype */\ ~p(void) noexcept(false); /* Destructor prototype */\ x /* Any extra variables? (no comma!) */ @@ -200,7 +200,7 @@ class IHelper : // The Init Helper class /* -- No code ---------------------------------------------------------- */ { } /* -- Default suppressions ----------------------------------------------- */ - DELETECOPYCTORS(IHelper) // Remove copy ctor/assign oper + DELETECOPYCTORS(IHelper) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ /* == Collector class helper =============================================== ** ** ######################################################################### ** @@ -259,7 +259,7 @@ class CLHelperBase : /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(CLHelperBase) // Don't need the copy constructor + DELETECOPYCTORS(CLHelperBase) // Suppress default functions for safety /* -- Set limit ---------------------------------------------------------- */ CVarReturn CLBaseSetLimitUnsafe(const size_t stLimit) { return CVarSimpleSetInt(stMaximum, stLimit); } @@ -302,7 +302,7 @@ class CLHelperSafe : /* -- Destructor --------------------------------------------------------- */ ~CLHelperSafe(void) { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(CLHelperSafe) // Don't need the copy constructor + DELETECOPYCTORS(CLHelperSafe) // Suppress default functions for safety /* -- Return the mutex ------------------------------------------- */ public: mutex &CollectorGetMutex(void) { return *this; } /* -- Lock the mutex and return the removed iterator --------------------- */ @@ -338,7 +338,7 @@ class CLHelperUnsafe : // Members initially private /* -- Destructor --------------------------------------------------------- */ ~CLHelperUnsafe(void) { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(CLHelperUnsafe) // Don't need the copy constructor + DELETECOPYCTORS(CLHelperUnsafe) // Suppress default functions for safety /* -- Set maximum objects ------------------------------------------------ */ CVarReturn CLSetLimit(const size_t stLimit) { return this->CLBaseSetLimitUnsafe(stLimit); } @@ -382,7 +382,7 @@ struct CLHelper : // Members initially public /* -- Destructor --------------------------------------------------------- */ ~CLHelper(void) { this->CLBaseCheckAndDestroyUnsafe(); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(CLHelper) // Don't need the copy constructor + DELETECOPYCTORS(CLHelper) // Suppress default functions for safety /* -- Set maximum objects ------------------------------------------------ */ CVarReturn CollectorSetLimit(const size_t stLimit) { return this->CLSetLimit(stLimit); } @@ -471,7 +471,7 @@ struct ICHelperBase // Members initially public /* ----------------------------------------------------------------------- */ ~ICHelperBase(void) { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(ICHelperBase) // Remove default functions + DELETECOPYCTORS(ICHelperBase) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ /* == Collector class helper WITH locks ==================================== ** ** ######################################################################### ** @@ -511,7 +511,7 @@ class ICHelperSafe : // Members initially private explicit ICHelperSafe(CollectorType*const ctPtr, MemberType*const mtPtr) : BaseType(ctPtr, StdMove(ICHelperInit(ctPtr, mtPtr))) { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(ICHelperSafe) // Remove default functions + DELETECOPYCTORS(ICHelperSafe) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ /* == Collector class helper without locks ================================= ** ** ######################################################################### ** @@ -551,7 +551,7 @@ class ICHelperUnsafe : // Members initially private /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(ICHelperUnsafe) // Remove default functions + DELETECOPYCTORS(ICHelperUnsafe) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ /* == Collector class ====================================================== ** ** ######################################################################### ** @@ -597,7 +597,7 @@ struct ICHelper : // Members initially public /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(ICHelper) // Remove default functions + DELETECOPYCTORS(ICHelper) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ /* == Lua userdata helper ================================================== ** ** ######################################################################### ** @@ -628,7 +628,7 @@ class Lockable // Members initially private /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Lockable) // Remove default functions + DELETECOPYCTORS(Lockable) // Suppress default functions for safety };/* -- End ---------------------------------------------------------------- */ }; // End of private module namespace /* ------------------------------------------------------------------------- */ diff --git a/src/congraph.hpp b/src/congraph.hpp index 43cf4bd..1eb34aa 100644 --- a/src/congraph.hpp +++ b/src/congraph.hpp @@ -353,7 +353,7 @@ static class ConGraphics final : // Members initially private /* -- Destructor --------------------------------------------------------- */ DTORHELPER(~ConGraphics, DeInit()) /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(ConGraphics) // Disable copy constructor and operator + DELETECOPYCTORS(ConGraphics) // Suppress default functions for safety /* -- Set console background colour -------------------------------------- */ CVarReturn TextBackgroundColourModified(const uint32_t ulNewColour) { return CVarSimpleSetInt(ulBgColour, ulNewColour); } diff --git a/src/console.hpp b/src/console.hpp index 5c6ce6b..8df0cf9 100644 --- a/src/console.hpp +++ b/src/console.hpp @@ -904,7 +904,7 @@ static class Console final : // Members initially private /* -- Destructor --------------------------------------------------------- */ DTORHELPER(~Console, DeInit()) /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Console) // Disable copy constructor and operator + DELETECOPYCTORS(Console) // Suppress default functions for safety /* -- Set page move count ------------------------------------------------ */ CVarReturn SetPageMoveCount(const ssize_t sstAmount) { // Deny if invalid value diff --git a/src/core.hpp b/src/core.hpp index 17b2c73..db51a9c 100644 --- a/src/core.hpp +++ b/src/core.hpp @@ -885,7 +885,7 @@ class Core final : // Members initially private /* -- Destructor that clears the core pointer ---------------------------- */ DTORHELPER(~Core, cCore = nullptr) /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Core) // Disable copy constructor and operator + DELETECOPYCTORS(Core) // Suppress default functions for safety /* -- Set lua error mode behaviour --------------------------------------- */ CVarReturn CoreErrorBehaviourModified(const CoreErrorFlags cefNMode) { return CVarSimpleSetIntNGE(cefMode, cefNMode, CEF_MAX); } diff --git a/src/crypt.hpp b/src/crypt.hpp index c8faea9..d65ac2d 100644 --- a/src/crypt.hpp +++ b/src/crypt.hpp @@ -948,7 +948,7 @@ static class Crypt final : // Done DTORHELPEREND(~Crypt) /* -- Macros ---------------------------------------------------- */ private: - DELETECOPYCTORS(Crypt) // Do not need defaults + DELETECOPYCTORS(Crypt) // Suppress default functions for safety /* ----------------------------------------------------------------------- */ } *cCrypt = nullptr; // Pointer to static class /* -- URL decode the specified string -------------------------------------- */ diff --git a/src/cvar.hpp b/src/cvar.hpp index a876a61..01b7051 100644 --- a/src/cvar.hpp +++ b/src/cvar.hpp @@ -518,7 +518,7 @@ class CVarItem : // Members initially private /* -- No code ---------------------------------------------------------- */ { } /* -- Other -------------------------------------------------------------- */ - DELETECOPYCTORS(CVarItem) // No copy constructor + DELETECOPYCTORS(CVarItem) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ } // End of public module namespace /* ------------------------------------------------------------------------- */ diff --git a/src/cvars.hpp b/src/cvars.hpp index 6627f4e..26eb4e5 100644 --- a/src/cvars.hpp +++ b/src/cvars.hpp @@ -735,7 +735,7 @@ static struct CVars final : // Start of vars class /* -- Destructor --------------------------------------------------------- */ DTORHELPER(~CVars, DeInit()) // Save and clean-up all variables /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(CVars) // Disable copy constructor and operator + DELETECOPYCTORS(CVars) // Suppress default functions for safety /* ----------------------------------------------------------------------- */ CVarReturn SetDefaults(const CVarDefaults cvdVal) { // Compare defaults setting diff --git a/src/dir.hpp b/src/dir.hpp index 825207b..fdc13dc 100644 --- a/src/dir.hpp +++ b/src/dir.hpp @@ -280,7 +280,7 @@ class DirFile // Files container class /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(DirFile) // Disable copy constructor and operator + DELETECOPYCTORS(DirFile) // Suppress default functions for safety };/* -- DirCore class ------------------------------------------------------ */ class DirCore : // System specific implementation /* -- Base classes ------------------------------------------------------- */ @@ -424,7 +424,7 @@ class DirCore : // System specific implementation /* ----------------------------------------------------------------------- */ #endif // End of system implementation check /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(DirCore) // Disable copy constructor and operator + DELETECOPYCTORS(DirCore) // Suppress default functions for safety };/* == Dir class ========================================================== */ class Dir : // Directory information class /* -- Base classes ------------------------------------------------------- */ @@ -495,7 +495,7 @@ class Dir : // Directory information class Dir(const string &strDir, const string &strExt) : DirFile{ ScanDirExt(strDir, strExt) } { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Dir) // Disable copy constructor and operator + DELETECOPYCTORS(Dir) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ /* -- Get current directory ------------------------------------------------ */ static const string DirGetCWD(void) diff --git a/src/display.hpp b/src/display.hpp index e73b853..19c1cd2 100644 --- a/src/display.hpp +++ b/src/display.hpp @@ -1067,7 +1067,7 @@ static class Display final : /* -- Destructor --------------------------------------------------------- */ DTORHELPER(~Display, DeInit()) /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Display) // Do not need copy defaults + DELETECOPYCTORS(Display) // Suppress default functions for safety /* -- Helper macro for boolean based CVars based on OS ------------------- */ #define CBCVARFLAG(n, f) CVarReturn n(const bool bState) \ { FlagSetOrClear(f, bState); return ACCEPT; } diff --git a/src/evtcore.hpp b/src/evtcore.hpp index a45008d..5661a24 100644 --- a/src/evtcore.hpp +++ b/src/evtcore.hpp @@ -115,7 +115,7 @@ class EvtCore // Start of common event system class /* -- No code -------------------------------------------------------- */ { } /* --------------------------------------------------------------------- */ - DELETECOPYCTORS(Event) // No copying of this structure allowed + DELETECOPYCTORS(Event) // Suppress default functions for safety };/* -- Private variables --------------------------------------- */ private: Funcs fFuncs; // Event callback storage mutex mMutex; // Primary events list mutex @@ -335,7 +335,7 @@ class EvtCore // Start of common event system class explicit EvtCore(const string &strN) : strName{StdMove(strN)} { fFuncs.fill(bind(&EvtCore::BlankFunction, this, _1)); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(EvtCore) // Delete copy constructor and operator + DELETECOPYCTORS(EvtCore) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ }; // End of public module namespace /* ------------------------------------------------------------------------- */ diff --git a/src/evtmain.hpp b/src/evtmain.hpp index fbd19f7..a8790c1 100644 --- a/src/evtmain.hpp +++ b/src/evtmain.hpp @@ -237,7 +237,7 @@ static class EvtMain final : // Event list for render thread /* --------------------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(EvtMain) // Delete copy constructor and operator + DELETECOPYCTORS(EvtMain) // Suppress default functions for safety /* -- End ---------------------------------------------------------------- */ } *cEvtMain = nullptr; // Pointer to static class /* ------------------------------------------------------------------------- */ diff --git a/src/evtwin.hpp b/src/evtwin.hpp index 02e4a13..cb6f15d 100644 --- a/src/evtwin.hpp +++ b/src/evtwin.hpp @@ -73,7 +73,7 @@ static class EvtWin final : // Event list for window thread /* -- No core ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(EvtWin) // Delete copy constructor and operator + DELETECOPYCTORS(EvtWin) // Suppress default functions for safety /* -- End ---------------------------------------------------------------- */ } *cEvtWin = nullptr; // Pointer to static class /* ------------------------------------------------------------------------- */ diff --git a/src/fbo.hpp b/src/fbo.hpp index cb23fd3..14ccfeb 100644 --- a/src/fbo.hpp +++ b/src/fbo.hpp @@ -98,7 +98,7 @@ class FboBase : // Fbo base class /* --------------------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(FboBase) // No copy constructors + DELETECOPYCTORS(FboBase) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ /* == Fbo object class ===================================================== */ CTOR_MEM_BEGIN_CSLAVE(Fbos, Fbo, ICHelperUnsafe), @@ -527,7 +527,7 @@ CTOR_MEM_BEGIN_CSLAVE(Fbos, Fbo, ICHelperUnsafe), /* -- Destructor --------------------------------------------------------- */ ~Fbo(void) { FboDeInit(); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Fbo) // Disable copy constructor and operator + DELETECOPYCTORS(Fbo) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ CTOR_END(Fbos, Fbo, FBO,,,, fboActive(nullptr), fboMain(nullptr)) /* ========================================================================= */ diff --git a/src/fbocore.hpp b/src/fbocore.hpp index 3c1e996..f08033e 100644 --- a/src/fbocore.hpp +++ b/src/fbocore.hpp @@ -83,11 +83,11 @@ static class FboCore final : // The main fbo operations manager fboMain.FboItemGetData()); // Specify format of the interlaced triangle data cOgl->VertexAttribPointer(A_COORD, stCompsPerCoord, 0, - fboMain.FboItemGetTCIndex()); + fboMain.FboItemGetTCPos()); cOgl->VertexAttribPointer(A_VERTEX, stCompsPerPos, 0, - fboMain.FboItemGetVIndex()); + fboMain.FboItemGetVPos()); cOgl->VertexAttribPointer(A_COLOUR, stCompsPerColour, 0, - fboMain.FboItemGetCIndex()); + fboMain.FboItemGetCPos()); // Blit the two triangles cOgl->DrawArraysTriangles(stTwoTriangles); // Swap buffers diff --git a/src/fboitem.hpp b/src/fboitem.hpp index 94b0b5a..3b53540 100644 --- a/src/fboitem.hpp +++ b/src/fboitem.hpp @@ -8,59 +8,140 @@ #pragma once // Only one incursion allowed /* ------------------------------------------------------------------------- */ namespace IFboItem { // Start of private module namespace -/* ------------------------------------------------------------------------- */ -using namespace IFboDef::P; using namespace IUtil::P; -using namespace Lib::OS::GlFW; +/* -- Outside types used --------------------------------------------------- */ +using Lib::OS::GlFW::GLfloat; using Lib::OS::GlFW::GLsizei; +using Lib::OS::GlFW::GLvoid; +/* -- Outside functions used ----------------------------------------------- */ +using IUtil::P::UtilNormaliseEx; +/* -- Outside variables used ----------------------------------------------- */ +using IFboDef::P::stFloatsPerColour; using IFboDef::P::stFloatsPerCoord; +using IFboDef::P::stFloatsPerPos; using IFboDef::P::stFloatsPerQuad; +using IFboDef::P::stTrisPerQuad; /* ------------------------------------------------------------------------- */ namespace P { // Start of public module namespace /* == Fbo item class ======================================================= */ -class FboItem -{ /* ----------------------------------------------------------------------- */ - constexpr static const size_t - stUInt8Bits = sizeof(uint8_t) * 8, - stUInt16Bits = sizeof(uint16_t) * 8, - stUInt24Bits = stUInt8Bits + stUInt16Bits; - /* -- Typedefs for types we need --------------------------------- */ public: +struct FboItem +{ /* -- Public typedefs ---------------------------------------------------- */ typedef array TriCoordData; // Triangle TexCoords typedef array QuadCoordData; // Quad tex-coord typedef array TriPosData; // Triangle positions typedef array QuadPosData; // Quad position data typedef array TriColData; // Triangle intensities typedef array QuadColData; // Quad colour data + /* -- Stored colour data ------------------------------------------------- */ + QuadColData faCSave; // Saved colour data (Push/PopColour) + /* -- Private typedefs ------------------------------------------ */ private: typedef array AllData; // All data elements - /* -- Variables ------------------------------------------------- */ private: + /* -- Private variables -------------------------------------------------- */ union Quad // Render to texture Vertex array data - { AllData faData; // Vertices to upload to VBO - struct Parts { QuadCoordData qdCoord; // Quad tex-coords data - QuadPosData qdPos; // Quad position data - QuadColData qdColour; } c; // Quad colour mod data + { /* --------------------------------------------------------------------- */ + AllData faData; // Vertices to upload to VBO + /* --------------------------------------------------------------------- */ + struct Parts // Parts of 'faData' + { /* ------------------------------------------------------------------- */ + QuadCoordData qdCoord; // Quad tex-coords data + QuadPosData qdPos; // Quad position data + QuadColData qdColour; // Quad colour data + /* ------------------------------------------------------------------- */ + } c; // Quad variable + /* --------------------------------------------------------------------- */ } sBuffer; // End of quad data union - /* -- Saved data --------------------------------------------------------- */ - QuadColData faCSave; // Saved colour data - /* -- Get specific data from specified triangle index ------------ */ public: + /* ----------------------------------------------------------------------- */ + constexpr static const size_t + stUInt8Bits = sizeof(uint8_t) * 8, + stUInt16Bits = sizeof(uint16_t) * 8, + stUInt24Bits = stUInt8Bits + stUInt16Bits; + /* -- Get defaults as lookup table --------------------------------------- */ + const Quad &FboItemGetDefaultLookup(void) const + { // This is equal to the following calls. It's just easier to memcpy the + // whole table across then doing pointless calculation. + // - SetTexCoord(0, 0, 1, 1); + // - SetVertex(-1, 1, 1, -1); + // - SetRGBA(1, 1, 1, 1); + static const Quad qData{{ + // QuadCoordData qdCoord (render the entire texture on the triangles) + 0.0f, 0.0f, 1.0f, 0.0f, // (T1V1,T1V2)[X+Y] V1 V2 V3 + 0.0f, 1.0f, 1.0f, 1.0f, // (T1V3,T2V1)[X+Y] T1 -> |XX/ /XX| <- T2 + 0.0f, 1.0f, 1.0f, 0.0f, // (T2V2,T2V3)[X+Y] V3 V2 V1 + // QuadPosData qdPos (render the two triangles full-screen) + -1.0f, 1.0f, 1.0f, 1.0f, // (T1V1,T1V2)[X+Y] V1 V2 V3 + -1.0f,-1.0f, 1.0f,-1.0f, // (T1V3,T2V1)[X+Y] T1 -> |XX/ /XX| <- T2 + -1.0f,-1.0f, 1.0f, 1.0f, // (T2V2,T2V3)[X+Y] V3 V2 V1 + // QuadColData qdColour (all solid white intensity fully opaque) + 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, // (T1V1,T1V2)[R+G+B+A] + 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, // (T1V3,T2V1)[R+G+B+A] + 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f // (T2V2,T2V3)[R+G+B+A] + }}; // Return the lookup table + return qData; + } + /* -- Return static offset indexes for glVertexAttribPointer() --- */ public: + constexpr static const size_t stTCPos = 0; + static const GLvoid *FboItemGetTCPos(void) + { return reinterpret_cast(stTCPos); } + constexpr static const size_t stVPos = stTCPos + sizeof(sBuffer.c.qdCoord); + static const GLvoid *FboItemGetVPos(void) + { return reinterpret_cast(stVPos); } + constexpr static const size_t stCPos = stVPos + sizeof(sBuffer.c.qdPos); + static const GLvoid *FboItemGetCPos(void) + { return reinterpret_cast(stCPos); } + /* -- Positions of data for in aReturn static offset indexes ------------- */ QuadPosData &FboItemGetVData(void) { return sBuffer.c.qdPos; } - TriPosData &FboItemGetVData(const size_t stT) - { return FboItemGetVData()[stT]; } + TriPosData &FboItemGetVData(const size_t stPos) + { return FboItemGetVData()[stPos]; } TriPosData &FboItemGetVDataT1(void) { return FboItemGetVData().front(); } TriPosData &FboItemGetVDataT2(void) { return FboItemGetVData().back(); } QuadCoordData &FboItemGetTCData(void) { return sBuffer.c.qdCoord; } - TriCoordData &FboItemGetTCData(const size_t stT) - { return FboItemGetTCData()[stT]; } + TriCoordData &FboItemGetTCData(const size_t stPos) + { return FboItemGetTCData()[stPos]; } TriCoordData &FboItemGetTCDataT1(void) { return FboItemGetTCData().front(); } TriCoordData &FboItemGetTCDataT2(void) { return FboItemGetTCData().back(); } QuadColData &FboItemGetCData(void) { return sBuffer.c.qdColour; } - TriColData &FboItemGetCData(const size_t stT) - { return FboItemGetCData()[stT]; } + TriColData &FboItemGetCData(const size_t stPos) + { return FboItemGetCData()[stPos]; } TriColData &FboItemGetCDataT1(void) { return FboItemGetCData().front(); } TriColData &FboItemGetCDataT2(void) { return FboItemGetCData().back(); } + /* -- Get data ----------------------------------------------------------- */ + const GLvoid *FboItemGetData(void) const { return sBuffer.faData.data(); } + GLsizei FboItemGetDataSize(void) const { return sizeof(sBuffer.faData); } /* -- Set vertex bounds directly on one triangle ------------------------- */ - void FboItemSetVertexEx(const size_t stId, const TriPosData &tdNew) - { memcpy(FboItemGetVData(stId).data(), tdNew.data(), sizeof(TriPosData)); } - void FboItemSetTexCoordEx(const size_t stId, const TriCoordData &tdNew) - { memcpy(FboItemGetTCData(stId).data(), tdNew.data(), - sizeof(TriCoordData)); } - void FboItemSetColourEx(const size_t stId, const TriColData &tdNew) - { memcpy(FboItemGetCData(stId).data(), tdNew.data(), sizeof(TriColData)); } + void FboItemSetVertexEx(const size_t stId, const TriPosData &tpdNew) + { FboItemGetVData(stId) = tpdNew; } + void FboItemSetTexCoordEx(const size_t stId, const TriCoordData &tcdNew) + { FboItemGetTCData(stId) = tcdNew; } + void FboItemSetColourEx(const size_t stId, const TriColData &tcdNew) + { FboItemGetCData(stId) = tcdNew; } + /* -- Save and restore colour data --------------------------------------- */ + void FboItemPushQuadColour(void) { faCSave = FboItemGetCData(); } + void FboItemPopQuadColour(void) { FboItemGetCData() = faCSave; } + /* -- Set vertex bounds with pivoted angle ------------------------------- */ + void FboItemSetVertex(const GLfloat fX1, const GLfloat fY1, + const GLfloat fX2, const GLfloat fY2, const GLfloat fA) + { // UtilDenormalise the angle to radians (M_PI) + const GLfloat fAR = fA * 2.0f * 3.141592653589793238462643383279502884f, + // Get the middle pixel of the quad. + fXP = (fX2-fX1)/2, fYP = (fY2-fY1)/2, + // Rotate vertices around the centre of the quad + fC1 = atan2f(-fYP,fXP)+fAR, fC2 = atan2f(-fYP,-fXP)+fAR, + fC3 = atan2f( fYP,fXP)+fAR, fC4 = atan2f( fYP,-fXP)+fAR, + fXPs = fXP*fXP, fXPsN = -fXP*-fXP, + fYPs = fYP*fYP, fYPsN = -fYP*-fYP, + fC5 = sqrtf(fYPsN+fXPs), fC6 = sqrtf(fYPsN+fXPsN), + fC7 = sqrtf(fYPs+fXPs), fC8 = sqrtf(fYPs+fXPsN), + fCa = cosf(fC2)*fC5, fCb = sinf(fC2)*fC5, + fCc = cosf(fC1)*fC6, fCd = sinf(fC1)*fC6, + fCe = cosf(fC4)*fC7, fCf = sinf(fC4)*fC7, + fCg = cosf(fC3)*fC8, fCh = sinf(fC3)*fC8; + // Update the first triangle of the quad + TriPosData &tdT1 = FboItemGetVDataT1(); + tdT1[0] = fX1+fCa; tdT1[1] = fY1+fCb; // Vertex 1 / Triangle 1 (XY) V1 V2 + tdT1[2] = fX1+fCc; tdT1[3] = fY1+fCd; // " 2 / " 1 (XY) |XX/ + tdT1[4] = fX1+fCe; tdT1[5] = fY1+fCf; // " 3 / " 1 (XY) V3 + // Update the second triangle of the quad + TriPosData &tdT2 = FboItemGetVDataT2(); + tdT2[0] = fX1+fCg; tdT2[1] = fY1+fCh; // Vertex 1 / Triangle 2 (XY) V3 + tdT2[2] = fX1+fCe; tdT2[3] = fY1+fCf; // " 2 / " 2 (XY) /XX| + tdT2[4] = fX1+fCc; tdT2[5] = fY1+fCd; // " 3 / " 2 (XY) V2 V1 + } /* -- Set vertex bounds -------------------------------------------------- */ void FboItemSetVertex(const GLfloat fX1, const GLfloat fY1, const GLfloat fX2, const GLfloat fY2) @@ -75,14 +156,6 @@ class FboItem tdT2[2] = fX1; tdT2[3] = fY2; // " / " 2 (XY) /XX| tdT2[4] = fX2; tdT2[5] = fY1; // " / " 3 (XY) V2 V1 } - /* -- Set vertex co-ordinates and dimensions ----------------------------- */ - void FboItemSetVertexWH(const GLfloat fX, const GLfloat fY, const GLfloat fW, - const GLfloat fH) - { FboItemSetVertex(fX, fY, fX+fW, fY+fH); } - /* -- Set vertex bounds and return it ------------------------------------ */ - const QuadPosData &FboItemSetAndGetVertex(const GLfloat fX1, - const GLfloat fY1, const GLfloat fX2, const GLfloat fY2) - { FboItemSetVertex(fX1, fY1, fX2, fY2); return FboItemGetVData(); } /* -- Set vertex bounds modified by normals horizontally ----------------- */ void FboItemSetVertex(const GLfloat fX1, const GLfloat fY1, const GLfloat fX2, const GLfloat fY2, const GLfloat fML, const GLfloat fMR) @@ -97,49 +170,28 @@ class FboItem tdT2[2] = tdT2[0]+((fX1-tdT2[0])*fML); tdT2[3] = fY2; // T2 / V2 /XX| tdT2[4] = tdT2[0]; tdT2[5] = fY1; // T2 / V3 V2 V1 } - /* -- Set vertex bounds with modified left and right bounds and get ------ */ - const QuadPosData &FboItemSetAndGetVertex(const GLfloat fX1, - const GLfloat fY1, const GLfloat fX2, const GLfloat fY2, const GLfloat fML, - const GLfloat fMR) - { FboItemSetVertex(fX1, fY1, fX2, fY2, fML, fMR); - return FboItemGetVData(); } - /* -- Set vertex bounds with angle --------------------------------------- */ - void FboItemSetVertex(const GLfloat fX1, const GLfloat fY1, - const GLfloat fX2, const GLfloat fY2, const GLfloat fA) - { // UtilDenormalise the angle to radians (M_PI) - const GLfloat fAR = fA * 2.0f * 3.141592653589793238462643383279502884f, - // Calculate centre - fXC = (fX2-fX1)/2, fYC = (fY2-fY1)/2, - // Rotate vertices - fC1 = atan2f(-fYC,fXC)+fAR, fC2 = atan2f(-fYC,-fXC)+fAR, - fC3 = atan2f( fYC,fXC)+fAR, fC4 = atan2f( fYC,-fXC)+fAR, - fXCs = fXC*fXC, fXCsN = -fXC*-fXC, - fYCs = fYC*fYC, fYCsN = -fYC*-fYC, - fC5 = sqrtf(fYCsN+fXCs), fC6 = sqrtf(fYCsN+fXCsN), - fC7 = sqrtf(fYCs+fXCs), fC8 = sqrtf(fYCs+fXCsN), - fCa = cosf(fC2)*fC5, fCb = sinf(fC2)*fC5, - fCc = cosf(fC1)*fC6, fCd = sinf(fC1)*fC6, - fCe = cosf(fC4)*fC7, fCf = sinf(fC4)*fC7, - fCg = cosf(fC3)*fC8, fCh = sinf(fC3)*fC8; - // Update the first triangle of the quad - TriPosData &tdT1 = FboItemGetVDataT1(); - tdT1[0] = fX1+fCa; tdT1[1] = fY1+fCb; // Vertex 1 / Triangle 1 (XY) V1 V2 - tdT1[2] = fX1+fCc; tdT1[3] = fY1+fCd; // " 2 / " 1 (XY) |XX/ - tdT1[4] = fX1+fCe; tdT1[5] = fY1+fCf; // " 3 / " 1 (XY) V3 - // Update the second triangle of the quad - TriPosData &tdT2 = FboItemGetVDataT2(); - tdT2[0] = fX1+fCg; tdT2[1] = fY1+fCh; // Vertex 1 / Triangle 2 (XY) V3 - tdT2[2] = fX1+fCe; tdT2[3] = fY1+fCf; // " 2 / " 2 (XY) /XX| - tdT2[4] = fX1+fCc; tdT2[5] = fY1+fCd; // " 3 / " 2 (XY) V2 V1 - } /* -- Set vertex with coords, dimensions and angle ----------------------- */ void FboItemSetVertexWH(const GLfloat fX, const GLfloat fY, const GLfloat fW, const GLfloat fH, const GLfloat fA) { FboItemSetVertex(fX, fY, fX+fW, fY+fH, fA); } + /* -- Set vertex co-ordinates and dimensions ----------------------------- */ + void FboItemSetVertexWH(const GLfloat fX, const GLfloat fY, const GLfloat fW, + const GLfloat fH) + { FboItemSetVertex(fX, fY, fX+fW, fY+fH); } /* -- Set vertex bounds and return it ------------------------------------ */ const QuadPosData &FboItemSetAndGetVertex(const GLfloat fX1, const GLfloat fY1, const GLfloat fX2, const GLfloat fY2, const GLfloat fA) { FboItemSetVertex(fX1, fY1, fX2, fY2, fA); return FboItemGetVData(); } + /* -- Set vertex bounds and return it ------------------------------------ */ + const QuadPosData &FboItemSetAndGetVertex(const GLfloat fX1, + const GLfloat fY1, const GLfloat fX2, const GLfloat fY2) + { FboItemSetVertex(fX1, fY1, fX2, fY2); return FboItemGetVData(); } + /* -- Set vertex bounds with modified left and right bounds and get ------ */ + const QuadPosData &FboItemSetAndGetVertex(const GLfloat fX1, + const GLfloat fY1, const GLfloat fX2, const GLfloat fY2, const GLfloat fML, + const GLfloat fMR) + { FboItemSetVertex(fX1, fY1, fX2, fY2, fML, fMR); + return FboItemGetVData(); } /* -- Set tex coords for FBO (Full and simple) --------------------------- */ void FboItemSetTexCoord(const GLfloat fX1, const GLfloat fY1, const GLfloat fX2, const GLfloat fY2) @@ -154,10 +206,6 @@ class FboItem tdT2[2] = fX1; tdT2[3] = fY2; // Vertex 2 of Triangle 2 / V2 tdT2[4] = fX2; tdT2[5] = fY1; // Vertex 3 of Triangle 2 V1 V0 T2 } - /* -- Set texture coords and dimensions ---------------------------------- */ - void FboItemSetTexCoordWH(const GLfloat fX, const GLfloat fY, - const GLfloat fW, const GLfloat fH) - { FboItemSetTexCoord(fX, fY, fX+fW, fY+fH); } /* -- Set tex coords for FBO based on horizontal scale normals ----------- */ void FboItemSetTexCoord(const QuadCoordData &fTC, const GLfloat fML, const GLfloat fMR) @@ -174,10 +222,6 @@ class FboItem tdTD2[2] = tdTD2[0]+((tdTS2[2]-tdTD2[0])*fML); tdTD2[3] = tdTS2[3]; // V3V1 tdTD2[4] = tdTD2[0]; tdTD2[5] = tdTS2[5]; // V2V3 } - /* -- Set vertex bounds and return it ------------------------------------ */ - const QuadCoordData &FboItemSetAndGetCoord(const QuadCoordData &fTC, - const GLfloat fML, const GLfloat fMR) - { FboItemSetTexCoord(fTC, fML, fMR); return FboItemGetTCData(); } /* -- Set colour for FBO ------------------------------------------------- */ void FboItemSetQuadRGBA(const GLfloat fR, const GLfloat fG, const GLfloat fB, const GLfloat fA) @@ -192,93 +236,64 @@ class FboItem tdT2[ 4] = fR; tdT2[ 5] = fG; tdT2[ 6] = fB; tdT2[ 7] = fA; // V2 of T2 tdT2[ 8] = fR; tdT2[ 9] = fG; tdT2[10] = fB; tdT2[11] = fA; // V3 of T2 } - /* -- Return static offset indexes --------------------------------------- */ - const GLvoid *FboItemGetTCIndex(void) const - { return reinterpret_cast(0); } - const GLvoid *FboItemGetVIndex(void) const - { return reinterpret_cast(sizeof(sBuffer.c.qdCoord)); } - const GLvoid *FboItemGetCIndex(void) const - { return reinterpret_cast - (sizeof(sBuffer.c.qdCoord) + sizeof(sBuffer.c.qdPos)); } - /* -- Get data ----------------------------------------------------------- */ - const GLvoid *FboItemGetData(void) const { return sBuffer.faData.data(); } - GLsizei FboItemGetDataSize(void) const { return sizeof(sBuffer.faData); } - /* -- Get defaults as lookup table --------------------------------------- */ - const Quad &FboItemGetDefaultLookup(void) const - { // This is equal to the following calls. It's just easier to memcpy the - // whole table across then doing pointless calculation. - // - SetTexCoord(0, 0, 1, 1); - // - SetVertex(-1, 1, 1, -1); - // - SetRGBA(1, 1, 1, 1); - static const Quad qData{{ - // QuadCoordData qdCoord (render the entire texture on the triangles) - 0.0f, 0.0f, 1.0f, 0.0f, // (T1V1,T1V2)[X+Y] V1 V2 V3 - 0.0f, 1.0f, 1.0f, 1.0f, // (T1V3,T2V1)[X+Y] T1 -> |XX/ /XX| <- T2 - 0.0f, 1.0f, 1.0f, 0.0f, // (T2V2,T2V3)[X+Y] V3 V2 V1 - // QuadPosData qdPos (render the two triangles full-screen) - -1.0f, 1.0f, 1.0f, 1.0f, // (T1V1,T1V2)[X+Y] V1 V2 V3 - -1.0f,-1.0f, 1.0f,-1.0f, // (T1V3,T2V1)[X+Y] T1 -> |XX/ /XX| <- T2 - -1.0f,-1.0f, 1.0f, 1.0f, // (T2V2,T2V3)[X+Y] V3 V2 V1 - // QuadColData qdColour (all solid white intensity with no alpha) - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, // (T1V1,T1V2)[R+G+B+A] - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, // (T1V3,T2V1)[R+G+B+A] - 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f // (T2V2,T2V3)[R+G+B+A] - }}; // Return the lookup table - return qData; - } - /* -- Set defaults ------------------------------------------------------- */ - void FboItemSetDefaults(void) { sBuffer = FboItemGetDefaultLookup(); } + /* -- Set texture coords and dimensions ---------------------------------- */ + void FboItemSetTexCoordWH(const GLfloat fX, const GLfloat fY, + const GLfloat fW, const GLfloat fH) + { FboItemSetTexCoord(fX, fY, fX+fW, fY+fH); } + /* -- Set vertex bounds and return it ------------------------------------ */ + const QuadCoordData &FboItemSetAndGetCoord(const QuadCoordData &fTC, + const GLfloat fML, const GLfloat fMR) + { FboItemSetTexCoord(fTC, fML, fMR); return FboItemGetTCData(); } /* -- Set colour components (0xAARRGGBB) --------------------------------- */ - void FboItemSetQuadRGBAInt(const unsigned int uiC) - { FboItemSetQuadRGBA(UtilNormaliseEx(uiC), - UtilNormaliseEx(uiC), - UtilNormaliseEx(uiC), - UtilNormaliseEx(uiC)); } + void FboItemSetQuadRGBAInt(const unsigned int uiColour) + { FboItemSetQuadRGBA(UtilNormaliseEx(uiColour), + UtilNormaliseEx(uiColour), + UtilNormaliseEx(uiColour), + UtilNormaliseEx(uiColour)); } /* -- Set colour components (0xRRGGBB) ----------------------------------- */ - void FboItemSetQuadRGB(const GLfloat fR, const GLfloat fG, const GLfloat fB) - { FboItemSetQuadRed(fR); FboItemSetQuadGreen(fG); FboItemSetQuadBlue(fB); } + void FboItemSetQuadRGB(const GLfloat fRed, const GLfloat fGreen, + const GLfloat fBlue) + { FboItemSetQuadRed(fRed); + FboItemSetQuadGreen(fGreen); + FboItemSetQuadBlue(fBlue); } /* -- Set colour components by integer ----------------------------------- */ - void FboItemSetQuadRGBInt(const unsigned int uiC) - { FboItemSetQuadRGB(UtilNormaliseEx(uiC), - UtilNormaliseEx(uiC), - UtilNormaliseEx(uiC)); } + void FboItemSetQuadRGBInt(const unsigned int uiColour) + { FboItemSetQuadRGB(UtilNormaliseEx(uiColour), + UtilNormaliseEx(uiColour), + UtilNormaliseEx(uiColour)); } /* -- Update red component ----------------------------------------------- */ void FboItemSetQuadRed(const GLfloat fRed) - { // Get references to triangle colour data and modify the red values - TriColData &tdT1 = FboItemGetCDataT1(), &tdT2 = FboItemGetCDataT2(); - tdT1[0] = tdT1[4] = tdT1[8] = tdT2[0] = tdT2[4] = tdT2[8] = fRed; - } + { TriColData &tdT1 = FboItemGetCDataT1(), &tdT2 = FboItemGetCDataT2(); + tdT1[0] = tdT1[4] = tdT1[8] = tdT2[0] = tdT2[4] = tdT2[8] = fRed; } /* -- Update green component --------------------------------------------- */ void FboItemSetQuadGreen(const GLfloat fGreen) - { // Get references to triangle colour data and modify the green values - TriColData &tdT1 = FboItemGetCDataT1(), &tdT2 = FboItemGetCDataT2(); - tdT1[1] = tdT1[5] = tdT1[9] = tdT2[1] = tdT2[5] = tdT2[9] = fGreen; - } + { TriColData &tdT1 = FboItemGetCDataT1(), &tdT2 = FboItemGetCDataT2(); + tdT1[1] = tdT1[5] = tdT1[9] = tdT2[1] = tdT2[5] = tdT2[9] = fGreen; } /* -- Update blue component ---------------------------------------------- */ void FboItemSetQuadBlue(const GLfloat fBlue) - { // Get references to triangle colour data and modify the blue values - TriColData &tdT1 = FboItemGetCDataT1(), &tdT2 = FboItemGetCDataT2(); - tdT1[2] = tdT1[6] = tdT1[10] = tdT2[2] = tdT2[6] = tdT2[10] = fBlue; - } + { TriColData &tdT1 = FboItemGetCDataT1(), &tdT2 = FboItemGetCDataT2(); + tdT1[2] = tdT1[6] = tdT1[10] = tdT2[2] = tdT2[6] = tdT2[10] = fBlue; } /* -- Update alpha component --------------------------------------------- */ void FboItemSetQuadAlpha(const GLfloat fAlpha) - { // Get references to triangle colour data and modify the alpha values - TriColData &tdT1 = FboItemGetCDataT1(), &tdT2 = FboItemGetCDataT2(); - tdT1[3] = tdT1[7] = tdT1[11] = tdT2[3] = tdT2[7] = tdT2[11] = fAlpha; - } - /* -- Save and restore colour data --------------------------------------- */ - void FboItemPushQuadColour(void) { faCSave = FboItemGetCData(); } - void FboItemPopQuadColour(void) { sBuffer.c.qdColour = faCSave; } - /* -- Init with colour (from font) --------------------------------------- */ - explicit FboItem(const unsigned int uiC) { FboItemSetQuadRGBAInt(uiC); } - /* ----------------------------------------------------------------------- */ + { TriColData &tdT1 = FboItemGetCDataT1(), &tdT2 = FboItemGetCDataT2(); + tdT1[3] = tdT1[7] = tdT1[11] = tdT2[3] = tdT2[7] = tdT2[11] = fAlpha; } + /* -- Set defaults ------------------------------------------------------- */ + void FboItemSetDefaults(void) { sBuffer = FboItemGetDefaultLookup(); } + /* -- Constructor -------------------------------------------------------- */ FboItem(void) : /* -- Initialisers ----------------------------------------------------- */ - sBuffer{ FboItemGetDefaultLookup() } + sBuffer{ // Initialise storage... + FboItemGetDefaultLookup() } // ...with default values /* -- No code ---------------------------------------------------------- */ { } + /* -- Init with colour (from font) --------------------------------------- */ + explicit FboItem(const unsigned int uiColour) : + /* -- Initialisers ----------------------------------------------------- */ + FboItem{} // Initialise default values + /* -- Initialise colour ------------------------------------------------ */ + { FboItemSetQuadRGBAInt(uiColour); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(FboItem) + DELETECOPYCTORS(FboItem) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ } // End of public module namespace /* ------------------------------------------------------------------------- */ diff --git a/src/file.hpp b/src/file.hpp index acf5183..00f2ca9 100644 --- a/src/file.hpp +++ b/src/file.hpp @@ -29,7 +29,7 @@ CTOR_BEGIN_DUO(Files, File, CLHelperUnsafe, ICHelperUnsafe), /* --------------------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(File) // Disable copy constructor and operator + DELETECOPYCTORS(File) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ CTOR_END_NOINITS(Files, File, FILE) // Finish global Files collector /* -- Read string to file in one go ---------------------------------------- */ diff --git a/src/filemap.hpp b/src/filemap.hpp index b6f13fa..de12719 100644 --- a/src/filemap.hpp +++ b/src/filemap.hpp @@ -236,7 +236,7 @@ class FileMap : ~FileMap(void) { if(MemIsPtrSet() && MemPtr() != SysMapGetMemory()) MemFreePtr(); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(FileMap) // Disable copy constructor and operator + DELETECOPYCTORS(FileMap) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ } // End of public module namespace /* ------------------------------------------------------------------------- */ diff --git a/src/font.hpp b/src/font.hpp index 67367ef..08d6f30 100644 --- a/src/font.hpp +++ b/src/font.hpp @@ -127,7 +127,7 @@ class FontBase : // Members initially private /* --------------------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(FontBase) // No copy constructors + DELETECOPYCTORS(FontBase) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ /* == Font Class (which inherits a Texture) ================================ */ CTOR_MEM_BEGIN(Fonts, Font, ICHelperUnsafe, /* n/a */), @@ -471,7 +471,7 @@ CTOR_MEM_BEGIN(Fonts, Font, ICHelperUnsafe, /* n/a */), /* --------------------------------------------------------------------- */ { } // Do nothing else /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Font) // Omit copy constructor for safety + DELETECOPYCTORS(Font) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ CTOR_END_NOINITS(Fonts, Font, FONT) // End of collector class /* -- DeInit Font Textures ------------------------------------------------- */ diff --git a/src/fstream.hpp b/src/fstream.hpp index e4f2708..47842e1 100644 --- a/src/fstream.hpp +++ b/src/fstream.hpp @@ -344,7 +344,7 @@ class FStreamBase : // File stream base class ~FStreamBase(void) { if(FStreamOpened() && FStreamIsHandleNotStd()) FStreamDoClose(); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(FStreamBase) // Disable copy constructor and operator + DELETECOPYCTORS(FStreamBase) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ class FStream : // Main file stream class /* -- Base classes ------------------------------------------------------- */ @@ -363,7 +363,7 @@ class FStream : // Main file stream class /* -- MOVE assignment constructor ---------------------------------------- */ FStream(FStream &&fsOther) : FStreamBase{ StdMove(fsOther) } { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(FStream) // Disable copy constructor and operator + DELETECOPYCTORS(FStream) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ } // End of public module namespace /* ------------------------------------------------------------------------- */ diff --git a/src/ft.hpp b/src/ft.hpp index c9f68d5..61aa5c7 100644 --- a/src/ft.hpp +++ b/src/ft.hpp @@ -103,7 +103,7 @@ static class FreeType final : // Members initially private /* ----------------------------------------------------------------------- */ DTORHELPER(~FreeType, DoDeInit()) /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(FreeType) // No copying of class allowed + DELETECOPYCTORS(FreeType) // Suppress default functions for safety /* ----------------------------------------------------------------------- */ } *cFreeType = nullptr; // Pointer to static class /* ------------------------------------------------------------------------- */ diff --git a/src/ftf.hpp b/src/ftf.hpp index 142d319..bd87148 100644 --- a/src/ftf.hpp +++ b/src/ftf.hpp @@ -201,7 +201,7 @@ CTOR_BEGIN_ASYNC_DUO(Ftfs, Ftf, CLHelperUnsafe, ICHelperUnsafe), /* -- Destructor --------------------------------------------------------- */ ~Ftf(void) { AsyncCancel(); DoDeInit(); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Ftf) // Disable copy constructor and operator + DELETECOPYCTORS(Ftf) // Suppress default functions for safety };/* -- End ---------------------------------------------------------------- */ CTOR_END_ASYNC_NOFUNCS(Ftfs, Ftf, FTF, FONT) // Finish collector class /* ------------------------------------------------------------------------- */ diff --git a/src/glfw.hpp b/src/glfw.hpp index 2a3246f..0171762 100644 --- a/src/glfw.hpp +++ b/src/glfw.hpp @@ -204,7 +204,7 @@ static class GlFW final : // Root engine class /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(GlFW) // Prevent copying for safety reasons + DELETECOPYCTORS(GlFW) // Suppress default functions for safety /* ----------------------------------------------------------------------- */ } *cGlFW = nullptr; // Pointer to static class /* == Process a glfw error ================================================= */ diff --git a/src/glfwwin.hpp b/src/glfwwin.hpp index acf8200..27d5c1e 100644 --- a/src/glfwwin.hpp +++ b/src/glfwwin.hpp @@ -430,7 +430,7 @@ class GlFWWindow : // GLFW window class /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(GlFWWindow) // Do not need defaults + DELETECOPYCTORS(GlFWWindow) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ } // End of public module namespace /* ------------------------------------------------------------------------- */ diff --git a/src/ident.hpp b/src/ident.hpp index 07cdebd..dd42453 100644 --- a/src/ident.hpp +++ b/src/ident.hpp @@ -46,7 +46,7 @@ template // STL string type to use /* -- Standby constructor ------------------------------------------------ */ IdentBase(void) { } /* -- Default suppressions ----------------------------------------------- */ - DELETECOPYCTORS(IdentBase) // Remove default functions + DELETECOPYCTORS(IdentBase) // Suppress default functions for safety };/* -- Identifier class --------------------------------------------------- */ struct Ident : // Members initially public /* -- Base classes ------------------------------------------------------- */ @@ -96,7 +96,7 @@ struct Ident : // Members initially public /* -- No code ---------------------------------------------------------- */ { } /* -- Default suppressions ----------------------------------------------- */ - DELETECOPYCTORS(Ident) // Remove default functions + DELETECOPYCTORS(Ident) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ typedef IdentBase IdentConst; // Const type of Ident /* == Id to string list helper class ======================================= */ diff --git a/src/image.hpp b/src/image.hpp index c90be04..4832525 100644 --- a/src/image.hpp +++ b/src/image.hpp @@ -924,7 +924,7 @@ CTOR_MEM_BEGIN_ASYNC_CSLAVE(Images, Image, ICHelperUnsafe), /* -- Destructor --------------------------------------------------------- */ ~Image(void) { AsyncCancel(); } // Wait for loading thread to cancel /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Image) // Disable copy constructor and operator + DELETECOPYCTORS(Image) // Suppress default functions for safety };/* -- End ---------------------------------------------------------------- */ CTOR_END_ASYNC(Images, Image, IMAGE, IMAGE,,,, idFormatModes{{ // Pixel formats /* ----------------------------------------------------------------------- */ diff --git a/src/imagefmt.hpp b/src/imagefmt.hpp index 9d292e1..84f055b 100644 --- a/src/imagefmt.hpp +++ b/src/imagefmt.hpp @@ -345,7 +345,7 @@ struct CodecDDS final : // Members initially public /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(CodecDDS) // Omit copy constructor for safety + DELETECOPYCTORS(CodecDDS) // Suppress default functions for safety };/* -- End ---------------------------------------------------------------- */ /* ========================================================================= ** ** ######################################################################### ** @@ -484,7 +484,7 @@ class CodecGIF final : // Members initially private /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(CodecGIF) // Omit copy constructor for safety + DELETECOPYCTORS(CodecGIF) // Suppress default functions for safety };/* -- End ---------------------------------------------------------------- */ /* ========================================================================= ** ** ######################################################################### ** @@ -873,7 +873,7 @@ class CodecPNG final : // Members initially private /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(CodecPNG) // Omit copy constructor for safety + DELETECOPYCTORS(CodecPNG) // Suppress default functions for safety };/* -- End ---------------------------------------------------------------- */ /* ========================================================================= ** ** ######################################################################### ** @@ -1052,7 +1052,7 @@ class CodecJPG final : // Members initially private /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(CodecJPG) // Omit copy constructor for safety + DELETECOPYCTORS(CodecJPG) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ } // End of public module namespace /* ------------------------------------------------------------------------- */ diff --git a/src/imagelib.hpp b/src/imagelib.hpp index 5b994bd..8ebd870 100644 --- a/src/imagelib.hpp +++ b/src/imagelib.hpp @@ -74,7 +74,7 @@ CTOR_MEM_BEGIN_CSLAVE(ImageLibs, ImageLib, ICHelperUnsafe) /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(ImageLib) // Omit copy constructor for safety + DELETECOPYCTORS(ImageLib) // Suppress default functions for safety };/* -- End of objects collector (reserve and set limit for formats) ------- */ CTOR_END(ImageLibs, ImageLib, IMAGELIB, reserve(IFMT_MAX); CollectorSetLimit(IFMT_MAX),) diff --git a/src/input.hpp b/src/input.hpp index 455a42c..dfed3fd 100644 --- a/src/input.hpp +++ b/src/input.hpp @@ -798,7 +798,7 @@ static class Input final : // Handles keyboard, mouse & controllers /* -- Destructor --------------------------------------------------------- */ DTORHELPER(~Input, DeInit()) /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Input) // Do not need defaults + DELETECOPYCTORS(Input) // Suppress default functions for safety /* -- Handle a deadzone change ------------------------------------------- */ CVarReturn SetDefaultJoyDZ(const float fDZ, const function &fcbCallBack) diff --git a/src/json.hpp b/src/json.hpp index a3ea88b..7c7322b 100644 --- a/src/json.hpp +++ b/src/json.hpp @@ -272,7 +272,7 @@ CTOR_BEGIN_ASYNC_DUO(Jsons, Json, CLHelperUnsafe, ICHelperUnsafe), /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Json) // Disable copy constructor and operator + DELETECOPYCTORS(Json) // Suppress default functions for safety };/* -- End ---------------------------------------------------------------- */ CTOR_END_ASYNC_NOFUNCS(Jsons, Json, JSON, JSON) // Finish collector class /* ------------------------------------------------------------------------- */ diff --git a/src/llfbo.hpp b/src/llfbo.hpp index 36beea3..9b41611 100644 --- a/src/llfbo.hpp +++ b/src/llfbo.hpp @@ -164,24 +164,6 @@ LLFUNC(SetVLTWH, 0, aHeight{lS, 5}; aFbo().FboItemSetVertexWH(aLeft, aTop, aWidth, aHeight)) /* ========================================================================= */ -// $ Fbo:SetVLTRBA -// > Left:number=The destination left co-ordinate. -// > Top:number=The destination top co-ordinate. -// > Right:number=The destination right co-ordinate. -// > Bottom:number=The destination bottom co-ordinate. -// > Angle:number=The angle of the vertex. -// ? Allows you to set basic vertex co-ordinates when blitting the fbo with -// ? angle calculations. -/* ------------------------------------------------------------------------- */ -LLFUNC(SetVLTRBA, 0, - const AgFbo aFbo{lS, 1}; - const AgGLfloat aLeft{lS, 2}, - aTop{lS, 3}, - aRight{lS, 4}, - aBottom{lS, 5}; - const AgAngle aAngle{lS, 6}; - aFbo().FboItemSetVertex(aLeft, aTop, aRight, aBottom, aAngle)) -/* ========================================================================= */ // $ Fbo:SetVLTWHA // > Left:number=The destination left co-ordinate. // > Top:number=The destination top co-ordinate. @@ -413,8 +395,7 @@ LLRSMFBEGIN // Fbo:* member functions begin LLRSFUNC(SetCRGBA), LLRSFUNC(SetCX), LLRSFUNC(SetFilter), LLRSFUNC(SetMatrix), LLRSFUNC(SetTCLTRB), LLRSFUNC(SetTCLTWH), LLRSFUNC(SetTCX), LLRSFUNC(SetVLTRB), LLRSFUNC(SetVLTWH), - LLRSFUNC(SetVLTRBA), LLRSFUNC(SetVLTWHA), LLRSFUNC(SetVX), - LLRSFUNC(SetWireframe), + LLRSFUNC(SetVLTWHA), LLRSFUNC(SetVX), LLRSFUNC(SetWireframe), LLRSEND // Fbo:* member functions end /* ========================================================================= */ // $ Fbo.Main diff --git a/src/lltexture.hpp b/src/lltexture.hpp index 884b18a..8aa6723 100644 --- a/src/lltexture.hpp +++ b/src/lltexture.hpp @@ -95,25 +95,6 @@ LLFUNC(BlitILTRB, 0, aBottom{lS, 6}; aTexture().BlitLTRB(aTextureId, 0, aLeft, aTop, aRight, aBottom)) /* ========================================================================= */ -// $ Texture:BlitILTRBA -// > TexIndex:integer=The texture index to use. -// > Left:number=The starting column to draw from. -// > Top:number=The starting row to draw from. -// > Right:number=The ending column pixel to draw to. -// > Bottom:number=The ending row pixel to draw to. -// > Angle:number=The angle in which to rotate from the centre point (-1 to 1). -// ? Blits tile 0 of texture 'TexIndex' at the specified bounds. -/* ------------------------------------------------------------------------- */ -LLFUNC(BlitILTRBA, 0, - const AgTexture aTexture{lS, 1}; - const AgTextureId aTextureId{lS, 2, aTexture}; - const AgGLfloat aLeft{lS, 3}, - aTop{lS, 4}, - aRight{lS, 5}, - aBottom{lS, 6}; - const AgAngle aAngle{lS, 7}; - aTexture().BlitLTRBA(aTextureId, 0, aLeft, aTop, aRight, aBottom, aAngle)) -/* ========================================================================= */ // $ Texture:BlitILTWH // > TexIndex:integer=The texture index to use. // > Left:number=The starting column to draw from. @@ -208,29 +189,6 @@ LLFUNC(BlitISLTRB, 0, aBottom{lS, 7}; aTexture().BlitLTRB(aTextureId, aTileId, aLeft, aTop, aRight, aBottom)) /* ========================================================================= */ -// $ Texture:BlitISLTRBA -// > TexIndex:integer=The texture index to use. -// > TileIndex:integer=The tile index to blit. -// > Left:number=The starting column to draw from. -// > Top:number=The starting row to draw from. -// > Right:number=The ending column pixel to draw to. -// > Bottom:number=The ending row pixel to draw to. -// > Angle:number=The angle in which to rotate from the centre point (-1 to 1). -// ? Blits tile 'TileIndex' of texture 'TexIndex' at the specified screen -// ? bounds. -/* ------------------------------------------------------------------------- */ -LLFUNC(BlitISLTRBA, 0, - const AgTexture aTexture{lS, 1}; - const AgTextureId aTextureId{lS, 2, aTexture}; - const AgTileId aTileId{lS, 3, aTexture}; - const AgGLfloat aLeft{lS, 4}, - aTop{lS, 5}, - aRight{lS, 6}, - aBottom{lS, 7}; - const AgAngle aAngle{lS, 8}; - aTexture().BlitLTRBA(aTextureId, aTileId, aLeft, aTop, aRight, aBottom, - aAngle)) -/* ========================================================================= */ // $ Texture:BlitISLTWH // > TexIndex:integer=The texture index to use. // > TileIndex:integer=The tile index to blit. @@ -316,24 +274,6 @@ LLFUNC(BlitLTRB, 0, aBottom{lS, 5}; aTexture().BlitLTRB(0, 0, aLeft, aTop, aRight, aBottom)) /* ========================================================================= */ -// $ Texture:BlitLTRBA -// > Left:number=The starting column to draw from. -// > Top:number=The starting row to draw from. -// > Right:number=The ending column pixel to draw to. -// > Bottom:number=The ending row pixel to draw to. -// > Angle:number=The angle in which to rotate from the centre point (-1 to 1). -// ? Blits tile 0 of texture 0 at the specified screen bounds and angle from -// ? the centre of the quad. -/* ------------------------------------------------------------------------- */ -LLFUNC(BlitLTRBA, 0, - const AgTexture aTexture{lS, 1}; - const AgGLfloat aLeft{lS, 2}, - aTop{lS, 3}, - aRight{lS, 4}, - aBottom{lS, 5}; - const AgAngle aAngle{lS, 6}; - aTexture().BlitLTRBA(0, 0, aLeft, aTop, aRight, aBottom, aAngle)) -/* ========================================================================= */ // $ Texture:BlitLTWH // > Left:number=The starting column to draw from. // > Top:number=The starting row to draw from. @@ -436,26 +376,6 @@ LLFUNC(BlitSLTRB, 0, aBottom{lS, 6}; aTexture().BlitLTRB(0, aTileId, aLeft, aTop, aRight, aBottom)) /* ========================================================================= */ -// $ Texture:BlitSLTRBA -// > TileIndex:integer=The tile index of the texture to blit. -// > Left:number=The starting column to draw from. -// > Top:number=The starting row to draw from. -// > Right:number=The ending column pixel to draw to. -// > Bottom:number=The ending row pixel to draw to. -// > Angle:number=The angle in which to rotate from the centre point (-1 to 1). -// ? Blits tile 'TileIndex' of texture 0 at the specified screenbounds and -// ? angle. -/* ------------------------------------------------------------------------- */ -LLFUNC(BlitSLTRBA, 0, - const AgTexture aTexture{lS, 1}; - const AgTileId aTileId{lS, 2, aTexture}; - const AgGLfloat aLeft{lS, 3}, - aTop{lS, 4}, - aRight{lS, 5}, - aBottom{lS, 6}; - const AgAngle aAngle{lS, 7}; - aTexture().BlitLTRBA(0, aTileId, aLeft, aTop, aRight, aBottom, aAngle)) -/* ========================================================================= */ // $ Texture:BlitSLTWH // > TileIndex:integer=The tile index of the texture to blit. // > Left:number=The starting column to draw from. @@ -736,24 +656,6 @@ LLFUNC(SetVLTRB, 0, aBottom{lS, 5}; aTexture().FboItemSetVertex(aLeft, aTop, aRight, aBottom)) /* ========================================================================= */ -// $ Texture:SetVLTRBA -// > Left:number=The starting column to draw from. -// > Top:number=The starting row to draw from. -// > Right:number=The ending column pixel to draw to. -// > Bottom:number=The ending row pixel to draw to. -// > Angle:number=The angle in which to rotate from the centre point (-1 to 1). -// ? Presets the specified screen bounds and angle for the next use of -// ? Texture:BlitP*. -/* ------------------------------------------------------------------------- */ -LLFUNC(SetVLTRBA, 0, - const AgTexture aTexture{lS, 1}; - const AgGLfloat aLeft{lS, 2}, - aTop{lS, 3}, - aRight{lS, 4}, - aBottom{lS, 5}; - const AgAngle aAngle{lS, 6}; - aTexture().FboItemSetVertex(aLeft, aTop, aRight, aBottom, aAngle)) -/* ========================================================================= */ // $ Texture:SetVLTWH // > Left:number=The starting column to draw from. // > Top:number=The starting row to draw from. @@ -1040,27 +942,26 @@ LLFUNC(UploadEx, 0, ** ------------------------------------------------------------------------- */ LLRSMFBEGIN // Texture:* member functions begin LLRSFUNC(Blit), LLRSFUNC(BlitILT), LLRSFUNC(BlitILTA), - LLRSFUNC(BlitILTRB), LLRSFUNC(BlitILTRBA), LLRSFUNC(BlitILTWH), - LLRSFUNC(BlitILTWHA), LLRSFUNC(BlitISLT), LLRSFUNC(BlitISLTA), - LLRSFUNC(BlitISLTRB), LLRSFUNC(BlitISLTRBA), LLRSFUNC(BlitISLTWH), - LLRSFUNC(BlitISLTWHA), LLRSFUNC(BlitLT), LLRSFUNC(BlitLTA), - LLRSFUNC(BlitLTRB), LLRSFUNC(BlitLTRBA), LLRSFUNC(BlitLTWH), + LLRSFUNC(BlitILTRB), LLRSFUNC(BlitILTWH), LLRSFUNC(BlitILTWHA), + LLRSFUNC(BlitISLT), LLRSFUNC(BlitISLTA), LLRSFUNC(BlitISLTRB), + LLRSFUNC(BlitISLTWH), LLRSFUNC(BlitISLTWHA), LLRSFUNC(BlitLT), + LLRSFUNC(BlitLTA), LLRSFUNC(BlitLTRB), LLRSFUNC(BlitLTWH), LLRSFUNC(BlitLTWHA), LLRSFUNC(BlitM), LLRSFUNC(BlitSLT), - LLRSFUNC(BlitSLTA), LLRSFUNC(BlitSLTRB), LLRSFUNC(BlitSLTRBA), - LLRSFUNC(BlitSLTWH), LLRSFUNC(BlitSLTWHA), LLRSFUNC(Destroy), - LLRSFUNC(Download), LLRSFUNC(Dump), LLRSFUNC(GetHeight), - LLRSFUNC(GetId), LLRSFUNC(GetName), LLRSFUNC(GetSubCount), - LLRSFUNC(GetWidth), LLRSFUNC(PopColour), LLRSFUNC(PushColour), - LLRSFUNC(SetCA), LLRSFUNC(SetCB), LLRSFUNC(SetCG), - LLRSFUNC(SetCR), LLRSFUNC(SetCRGB), LLRSFUNC(SetCRGBA), - LLRSFUNC(SetCRGBAI), LLRSFUNC(SetCX), LLRSFUNC(SetTCLTRB), - LLRSFUNC(SetTCLTWH), LLRSFUNC(SetTCX), LLRSFUNC(SetVLTRB), - LLRSFUNC(SetVLTRBA), LLRSFUNC(SetVLTWH), LLRSFUNC(SetVLTWHA), - LLRSFUNC(SetVX), LLRSFUNC(TileA), LLRSFUNC(TileAD), - LLRSFUNC(TileAS), LLRSFUNC(TileASD), LLRSFUNC(TileGSTC), - LLRSFUNC(TileGTC), LLRSFUNC(TileS), LLRSFUNC(TileSD), - LLRSFUNC(TileSS), LLRSFUNC(TileSSD), LLRSFUNC(TileSSTC), - LLRSFUNC(TileSTC), LLRSFUNC(Upload), LLRSFUNC(UploadEx), + LLRSFUNC(BlitSLTA), LLRSFUNC(BlitSLTRB), LLRSFUNC(BlitSLTWH), + LLRSFUNC(BlitSLTWHA), LLRSFUNC(Destroy), LLRSFUNC(Download), + LLRSFUNC(Dump), LLRSFUNC(GetHeight), LLRSFUNC(GetId), + LLRSFUNC(GetName), LLRSFUNC(GetSubCount), LLRSFUNC(GetWidth), + LLRSFUNC(PopColour), LLRSFUNC(PushColour), LLRSFUNC(SetCA), + LLRSFUNC(SetCB), LLRSFUNC(SetCG), LLRSFUNC(SetCR), + LLRSFUNC(SetCRGB), LLRSFUNC(SetCRGBA), LLRSFUNC(SetCRGBAI), + LLRSFUNC(SetCX), LLRSFUNC(SetTCLTRB), LLRSFUNC(SetTCLTWH), + LLRSFUNC(SetTCX), LLRSFUNC(SetVLTRB), LLRSFUNC(SetVLTWH), + LLRSFUNC(SetVLTWHA), LLRSFUNC(SetVX), LLRSFUNC(TileA), + LLRSFUNC(TileAD), LLRSFUNC(TileAS), LLRSFUNC(TileASD), + LLRSFUNC(TileGSTC), LLRSFUNC(TileGTC), LLRSFUNC(TileS), + LLRSFUNC(TileSD), LLRSFUNC(TileSS), LLRSFUNC(TileSSD), + LLRSFUNC(TileSSTC), LLRSFUNC(TileSTC), LLRSFUNC(Upload), + LLRSFUNC(UploadEx), LLRSEND // Texture:* member functions end /* ========================================================================= */ // $ Texture.Console diff --git a/src/llutil.hpp b/src/llutil.hpp index fddb618..7e9cb12 100644 --- a/src/llutil.hpp +++ b/src/llutil.hpp @@ -939,7 +939,7 @@ LLFUNC(SHA512, 1, LLFUNC(SHA512A, 1, LuaUtilPushVar(lS, SHA512functions::HashMB(AgAsset{lS, 1}))) /* ========================================================================= */ -// $ Crypt.Sanitise +// $ Util.Sanitise // > Text:string=The string to sanitise. // < Text:string=The modified string. // ? Tries to remove repetitions in the specified string. diff --git a/src/llvideo.hpp b/src/llvideo.hpp index bf85d3a..ad1bce4 100644 --- a/src/llvideo.hpp +++ b/src/llvideo.hpp @@ -349,24 +349,6 @@ LLFUNC(SetVLTWH, 0, aHeight{lS, 5}; aVideo().FboItemSetVertexWH(aLeft, aTop, aWidth, aHeight)) /* ========================================================================= */ -// $ Video:SetVLTRBA -// > Left:number=The destination left co-ordinate. -// > Top:number=The destination top co-ordinate. -// > Right:number=The destination right co-ordinate. -// > Bottom:number=The destination bottom co-ordinate. -// > Angle:number=The angle of the vertex -// ? Allows you to set basic vertex co-ordinates when blitting the video's -// ? frame buffer object. -/* ------------------------------------------------------------------------- */ -LLFUNC(SetVLTRBA, 0, - const AgVideo aVideo{lS, 1}; - const AgGLfloat aLeft{lS, 2}, - aTop{lS, 3}, - aRight{lS, 4}, - aBottom{lS, 5}; - const AgAngle aAngle{lS, 6}; - aVideo().FboItemSetVertex(aLeft, aTop, aRight, aBottom, aAngle)) -/* ========================================================================= */ // $ Video:SetVLTWHA // > Left:number=The destination left co-ordinate. // > Top:number=The destination top co-ordinate. @@ -427,9 +409,8 @@ LLRSMFBEGIN // Video:* member functions begin LLRSFUNC(SetCRGBA), LLRSFUNC(SetCX), LLRSFUNC(SetFilter), LLRSFUNC(SetKeyColour), LLRSFUNC(SetKeyed), LLRSFUNC(SetLoop), LLRSFUNC(SetTCLTRB), LLRSFUNC(SetTCLTWH), LLRSFUNC(SetTCX), - LLRSFUNC(SetVLTRB), LLRSFUNC(SetVLTRBA), LLRSFUNC(SetVLTWH), - LLRSFUNC(SetVLTWHA), LLRSFUNC(SetVX), LLRSFUNC(SetVolume), - LLRSFUNC(Stop), + LLRSFUNC(SetVLTRB), LLRSFUNC(SetVLTWH), LLRSFUNC(SetVLTWHA), + LLRSFUNC(SetVX), LLRSFUNC(SetVolume), LLRSFUNC(Stop), LLRSEND // Video:* member functions end /* ========================================================================= */ // $ Video.Asset diff --git a/src/log.hpp b/src/log.hpp index 4e6d38e..3095e78 100644 --- a/src/log.hpp +++ b/src/log.hpp @@ -286,7 +286,7 @@ static class Log final : /* -- Destructor --------------------------------------------------------- */ DTORHELPER(~Log, DeInitSafe()) /* -- Macros ------------------------------------------------------------- */ - DELETECOPYCTORS(Log) // Do not need defaults + DELETECOPYCTORS(Log) // Suppress default functions for safety /* -- Conlib callback function for APP_LOG variable ---------------------- */ CVarReturn LogFileModified(const string &strFN, string &strCV) { // Lock mutex diff --git a/src/lua.hpp b/src/lua.hpp index b2fd4a6..b3e3049 100644 --- a/src/lua.hpp +++ b/src/lua.hpp @@ -304,28 +304,24 @@ static class Lua final : "- $ ($ members, $ methods, $ tables and $ statics); Id:$; Ref:$.", llRef.strvName, llRef.iLLMFCount, llRef.iLLCount, llRef.iLLKICount, iStaticsNS, llRef.lciId, iReference); - // For some reason, I cannot specify a __gc member for the garbage - // collector in this metadata part above because LUA seems to remove - // the __gc for some reason. My guess it is to protect from double - // clean-ups which is obviously fatal. - // Count libraries and report them - cLog->LogDebugExSafe( - "Lua registered $ of $ global namespaces...\n" - "- $ of $ static tables are registered.\n" - "- $ of $ static variables are registered.\n" - "- $ of $ member functions are registered.\n" - "- $ of $ method functions are registered.\n" - "- $ of $ functions are registered in total.\n" - "- $ of $ variables are registered in total.", - iCount, iTotal, - iTables, iTotalTables, - iStatics, iTotalStatics, - iMembers, iTotalMembers, - iMethods, iTotalMethods, - iMembers+iMethods, iTotalMembers+iTotalMethods, - iMembers+iMethods+iTables+iStatics, - iTotalMembers+iTotalMethods+iTotalTables+iTotalStatics); - } // Load default libraries and log progress + } // Report summary of API usage + cLog->LogDebugExSafe( + "Lua registered $ of $ global namespaces...\n" + "- $ of $ static tables are registered.\n" + "- $ of $ static variables are registered.\n" + "- $ of $ member functions are registered.\n" + "- $ of $ method functions are registered.\n" + "- $ of $ functions are registered in total.\n" + "- $ of $ variables are registered in total.", + iCount, iTotal, + iTables, iTotalTables, + iStatics, iTotalStatics, + iMembers, iTotalMembers, + iMethods, iTotalMethods, + iMembers+iMethods, iTotalMembers+iTotalMethods, + iMembers+iMethods+iTables+iStatics, + iTotalMembers+iTotalMethods+iTotalTables+iTotalStatics); + // Load default libraries and log progress cLog->LogDebugSafe("Lua registering core namespaces..."); luaL_openlibs(GetState()); cLog->LogDebugSafe("Lua registered core namespaces."); @@ -506,7 +502,7 @@ static class Lua final : /* -- Destructor --------------------------------------------------------- */ DTORHELPER(~Lua, DeInit()) /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Lua) // Do not need defaults + DELETECOPYCTORS(Lua) // Suppress default functions for safety /* -- When operations count have changed --------------------------------- */ CVarReturn SetOpsInterval(const int iCount) { return CVarSimpleSetIntNL(iOperations, iCount, 1); } diff --git a/src/luacmd.hpp b/src/luacmd.hpp index 85550d9..2c5f7d1 100644 --- a/src/luacmd.hpp +++ b/src/luacmd.hpp @@ -117,7 +117,7 @@ CTOR_MEM_BEGIN_CSLAVE(Commands, Command, ICHelperUnsafe), /* --------------------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Command) // Disable copy constructor and operator + DELETECOPYCTORS(Command) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ CTOR_END_NOINITS(Commands, Command, COMMAND) // Finish global Files collector /* -- Build a command list (for conlib) ------------------------------------ */ diff --git a/src/luaevent.hpp b/src/luaevent.hpp index 915e31a..335e4df 100644 --- a/src/luaevent.hpp +++ b/src/luaevent.hpp @@ -92,7 +92,7 @@ class LuaEvts : /* -- Destructor --------------------------------------------------------- */ ~LuaEvts(void) { LuaEvtsDeInit(); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(LuaEvts) // Disable copy operator and constructor + DELETECOPYCTORS(LuaEvts) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ /* == Class type for master class (send parameters on event trigger) ======= */ templatestruct LuaEvtTypeParam @@ -117,7 +117,7 @@ templatestruct LuaEvtTypeParam /* -- Constructor (not interested) --------------------------------------- */ LuaEvtTypeParam(void) { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(LuaEvtTypeParam) // Remove Assignment operator/ctor + DELETECOPYCTORS(LuaEvtTypeParam) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ /* == Class type for master class (send no parameters on event trigger) ==== */ templatestruct LuaEvtTypeAsync // Used in async class @@ -143,7 +143,7 @@ templatestruct LuaEvtTypeAsync // Used in async class /* -- Constructor (not interested) --------------------------------------- */ LuaEvtTypeAsync(void) { } /* -- Delete defaults ---------------------------------------------------- */ - DELETECOPYCTORS(LuaEvtTypeAsync) // Remove Assignment operator/ctor + DELETECOPYCTORS(LuaEvtTypeAsync) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ /* == Class for master class =============================================== */ templateUnregister(emcCmd); } /* -- Delete defaults ---------------------------------------------------- */ - DELETECOPYCTORS(LuaEvtMaster) // Remove Assignment operator/ctor + DELETECOPYCTORS(LuaEvtMaster) // Suppress default functions for safety };/* == Routines for a collectors child class ============================== */ template // Number of references to store @@ -316,7 +316,7 @@ class LuaEvtSlave : /* -- Destructor to clean up any leftover events and references ---------- */ ~LuaEvtSlave(void) { LuaEvtDeInit(); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(LuaEvtSlave) // Disable copy constructor + DELETECOPYCTORS(LuaEvtSlave) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ } // End of public module namespace /* ------------------------------------------------------------------------- */ diff --git a/src/luafunc.hpp b/src/luafunc.hpp index 1e1e625..2c847a2 100644 --- a/src/luafunc.hpp +++ b/src/luafunc.hpp @@ -65,7 +65,7 @@ class LuaFuncBase : // Just for de-duplicating initialisers /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(LuaFuncBase) // Disable copy constructor/operator + DELETECOPYCTORS(LuaFuncBase) // Suppress default functions for safety };/* -- LuaFunc class ------------------------------------------------------ */ CTOR_MEM_BEGIN_CSLAVE(LuaFuncs, LuaFunc, ICHelperUnsafe), /* -- Base classes ------------------------------------------------------- */ @@ -301,7 +301,7 @@ CTOR_MEM_BEGIN_CSLAVE(LuaFuncs, LuaFunc, ICHelperUnsafe), LuaUtilRmRef(LuaFuncGetState(), iReference); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(LuaFunc) // Disable copy constructor/operator + DELETECOPYCTORS(LuaFunc) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ /* -- De-init state and all references ------------------------------------- */ static void LuaFuncDeInitRef(void) diff --git a/src/luaref.hpp b/src/luaref.hpp index e244005..eaa8838 100644 --- a/src/luaref.hpp +++ b/src/luaref.hpp @@ -121,7 +121,7 @@ templateclass LuaRef // Lua easy reference class LuaRefDoDeInit(*rcriIt); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(LuaRef) // Omit copy constructor for safety + DELETECOPYCTORS(LuaRef) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ } // End of public module namespace /* ------------------------------------------------------------------------- */ diff --git a/src/luavar.hpp b/src/luavar.hpp index b080fce..6986799 100644 --- a/src/luavar.hpp +++ b/src/luavar.hpp @@ -145,7 +145,7 @@ CTOR_MEM_BEGIN_CSLAVE(Variables, Variable, ICHelperUnsafe), /* --------------------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Variable) // Disable copy constructor and operator + DELETECOPYCTORS(Variable) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ CTOR_END(Variables, Variable, VARIABLE,,,, // Finish off collector class /* ------------------------------------------------------------------------- */ diff --git a/src/mask.hpp b/src/mask.hpp index 2ae182f..1a0614e 100644 --- a/src/mask.hpp +++ b/src/mask.hpp @@ -391,7 +391,7 @@ CTOR_BEGIN_DUO(Masks, Mask, CLHelperUnsafe, ICHelperUnsafe), /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Mask) // Omit copy constructor for safety + DELETECOPYCTORS(Mask) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ CTOR_END_NOINITS(Masks, Mask, MASK) // Finish collector class /* ------------------------------------------------------------------------- */ diff --git a/src/memory.hpp b/src/memory.hpp index 781174a..7ca5cef 100644 --- a/src/memory.hpp +++ b/src/memory.hpp @@ -202,12 +202,12 @@ class MemConst // Start of const MemBase Block Class MemConst(const size_t stBytes, const void*const vpSrc) : MemConst(stBytes, const_cast(vpSrc)) { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(MemConst) // Do not need defaults + DELETECOPYCTORS(MemConst) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ /* == Read and write data class ============================================ */ class MemBase : /* -- Base classes ------------------------------------------------------- */ - public MemConst // Start of MemBase Block Class + public MemConst // Start of MemBase Block Class { /* -- Copy memory --------------------------------------------- */ protected: void MemDoWrite(const size_t stPos, const void*const vpSrc, const size_t stBytes) { memcpy(MemDoRead(stPos), vpSrc, stBytes); } @@ -357,7 +357,7 @@ class MemBase : /* -- Uninitialised constructor -- pointer ------------------------------- */ MemBase(void) { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(MemBase) // Do not need defaults + DELETECOPYCTORS(MemBase) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ /* == Read, write and allocation data class ================================ */ class Memory : @@ -568,7 +568,7 @@ class Memory : /* -- Destructor (just a free() needed) ---------------------------------- */ ~Memory(void) { MemFreePtrIfSet(); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Memory) // Do not need defaults + DELETECOPYCTORS(Memory) // Suppress default functions for safety };/* -- Useful types ------------------------------------------------------- */ typedef list MemoryList; // List of memory blocks typedef vector MemoryVector; // A vector of memory classes diff --git a/src/msengine.hpp b/src/msengine.hpp index 00abf39..d2d205a 100644 --- a/src/msengine.hpp +++ b/src/msengine.hpp @@ -12,9 +12,9 @@ #define VER_AUTHOR "MS-Design" // Author of engine #define VER_MAJOR 24 // Version major (year) #define VER_MINOR 9 // Version minor (month) -#define VER_BUILD 12 // Version build (day) +#define VER_BUILD 13 // Version build (day) #define VER_REV 1 // Version rev (build#) -#define VER_STR_NQ 24,9,12,1 // Version as literal -#define VER_STR "24.9.12.1" // Version as string -#define VER_DATE "Thu Sep 12 00:17:37 2024 +0100" // Compilation date +#define VER_STR_NQ 24,9,13,1 // Version as literal +#define VER_STR "24.9.13.1" // Version as string +#define VER_DATE "Fri Sep 13 00:00:04 2024 +0100" // Compilation date /* == EoF =========================================================== EoF == */ diff --git a/src/oal.hpp b/src/oal.hpp index 0ef643a..5e7aecc 100644 --- a/src/oal.hpp +++ b/src/oal.hpp @@ -541,10 +541,10 @@ static class Oal final : /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Oal) // Do not need copy constructors + DELETECOPYCTORS(Oal) // Suppress default functions for safety /* -- Undefines ---------------------------------------------------------- */ -#undef IAL // " -#undef IALC // " +#undef IAL // Done with this macro +#undef IALC // " /* ----------------------------------------------------------------------- */ } *cOal = nullptr; // Pointer to static class /* ------------------------------------------------------------------------- */ diff --git a/src/ogl.hpp b/src/ogl.hpp index 8a9b4c6..4b31d0d 100644 --- a/src/ogl.hpp +++ b/src/ogl.hpp @@ -71,7 +71,7 @@ static class Ogl final : // OGL class for OpenGL use simplicity idFormatModes, // Pixel format modes (log detail) idOGLCodes; // OpenGL codes /* -- Macros ------------------------------------------------------------- */ - DELETECOPYCTORS(Ogl) // Do not need defaults + DELETECOPYCTORS(Ogl) // Suppress default functions for safety /* -- Defines ------------------------------------------------------------ */ #define IGLL(F,M,...) GLEX(CheckLogError, F, M, ## __VA_ARGS__) #define IGL(F,M,...) GLEX(CheckExceptError, F, M, ## __VA_ARGS__) diff --git a/src/parser.hpp b/src/parser.hpp index c5b2021..4613e8d 100644 --- a/src/parser.hpp +++ b/src/parser.hpp @@ -145,7 +145,7 @@ templateclass ParserBase : /* -- Constructor -------------------------------------------------------- */ ParserBase(void) { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(ParserBase) // Disable copy constructor/operator + DELETECOPYCTORS(ParserBase) // Suppress default functions for safety }; /* -- A Parser class where the values can be modified ------------------- */ template>struct Parser : /* -- Base classes ------------------------------------------------------- */ @@ -210,7 +210,7 @@ template>struct Parser : /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Parser) // Disable copy constructor/operator + DELETECOPYCTORS(Parser) // Suppress default functions for safety };/* -- A Parser class thats values cannot be modified at all -------------- */ template> struct ParserConst : @@ -235,7 +235,7 @@ template> /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(ParserConst) // Disable copy constructor/operator + DELETECOPYCTORS(ParserConst) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ } // End of public module namespace /* ------------------------------------------------------------------------- */ diff --git a/src/pcm.hpp b/src/pcm.hpp index 3d921fb..fa674db 100644 --- a/src/pcm.hpp +++ b/src/pcm.hpp @@ -172,7 +172,7 @@ CTOR_BEGIN_ASYNC_DUO(Pcms, Pcm, CLHelperUnsafe, ICHelperUnsafe), /* -- Destructor (override) ---------------------------------------------- */ ~Pcm(void) { AsyncCancel(); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Pcm) // Disable copy constructor and operator + DELETECOPYCTORS(Pcm) // Suppress default functions for safety };/* -- End-of-collector --------------------------------------------------- */ CTOR_END_ASYNC_NOFUNCS(Pcms, Pcm, PCM, PCM) // Finish collector class /* ------------------------------------------------------------------------- */ diff --git a/src/pcmfmt.hpp b/src/pcmfmt.hpp index 1fd80a2..1a528e5 100644 --- a/src/pcmfmt.hpp +++ b/src/pcmfmt.hpp @@ -177,7 +177,7 @@ class CodecWAV final : /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(CodecWAV) // Omit copy constructor for safety + DELETECOPYCTORS(CodecWAV) // Suppress default functions for safety };/* -- End ---------------------------------------------------------------- */ /* ========================================================================= ** ** ######################################################################### ** @@ -347,7 +347,7 @@ class CodecCAF final : /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(CodecCAF) // Omit copy constructor for safety + DELETECOPYCTORS(CodecCAF) // Suppress default functions for safety };/* -- End ---------------------------------------------------------------- */ /* ========================================================================= ** ** ######################################################################### ** @@ -423,7 +423,7 @@ class CodecOGG final : /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(CodecOGG) // Omit copy constructor for safety + DELETECOPYCTORS(CodecOGG) // Suppress default functions for safety };/* -- End ---------------------------------------------------------------- */ /* ========================================================================= ** ** ######################################################################### ** @@ -500,7 +500,7 @@ class CodecMP3 final : /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(CodecMP3) // Omit copy constructor for safety + DELETECOPYCTORS(CodecMP3) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ } // End of public module namespace /* ------------------------------------------------------------------------- */ diff --git a/src/pcmlib.hpp b/src/pcmlib.hpp index d1a959a..283d568 100644 --- a/src/pcmlib.hpp +++ b/src/pcmlib.hpp @@ -70,7 +70,7 @@ CTOR_MEM_BEGIN_CSLAVE(PcmLibs, PcmLib, ICHelperUnsafe) /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(PcmLib) // Omit copy constructor for safety + DELETECOPYCTORS(PcmLib) // Suppress default functions for safety };/* -- End of objects collector (reserve and set limit for formats) ------- */ CTOR_END(PcmLibs, PcmLib, PCMLIB, reserve(PFMT_MAX); CollectorSetLimit(PFMT_MAX),) diff --git a/src/pixbase.hpp b/src/pixbase.hpp index e0917e9..bf06aa8 100644 --- a/src/pixbase.hpp +++ b/src/pixbase.hpp @@ -481,7 +481,7 @@ class SysBase : // Safe exception handler namespace DeleteGlobalMutex(); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(SysBase) // Suppress copy constructor for safety + DELETECOPYCTORS(SysBase) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ #define MSENGINE_SYSBASE_CALLBACKS() \ void SysBase::SysBase::HandleSignalStatic(int iSignal) \ diff --git a/src/pixcon.hpp b/src/pixcon.hpp index 9411d34..34fc9a7 100644 --- a/src/pixcon.hpp +++ b/src/pixcon.hpp @@ -822,7 +822,7 @@ class SysCon : // All members initially private /* -- Destructor --------------------------------------------------------- */ DTORHELPER(~SysCon, SysConDeInit()) /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(SysCon) // Do not need defaults + DELETECOPYCTORS(SysCon) // Suppress default functions for safety /* -- Set maximum console line length ---------------------------- */ public: CVarReturn RowsModified(const size_t stRows) { // Deny if out of range. The maximum value is a SHORT from Win32 API. diff --git a/src/pixmap.hpp b/src/pixmap.hpp index f945980..e9633f4 100644 --- a/src/pixmap.hpp +++ b/src/pixmap.hpp @@ -160,6 +160,6 @@ class SysMap : /* -- Destructor --------------------------------------------------------- */ ~SysMap(void) { SysMapDeInitInternal(); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(SysMap) // Disable copy constructor and operator + DELETECOPYCTORS(SysMap) // Suppress default functions for safety };/* -- End ---------------------------------------------------------------- */ /* == EoF =========================================================== EoF == */ diff --git a/src/pixpip.hpp b/src/pixpip.hpp index 733fb13..105e5de 100644 --- a/src/pixpip.hpp +++ b/src/pixpip.hpp @@ -269,6 +269,6 @@ class SysPipe : /* -- Destructor to kill and wait for process to exit -------------------- */ ~SysPipe(void) { DeInit(); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(SysPipe) // Suppress copy constructor for safety + DELETECOPYCTORS(SysPipe) // Suppress default functions for safety };/* -- End ---------------------------------------------------------------- */ /* == EoF =========================================================== EoF == */ diff --git a/src/psplit.hpp b/src/psplit.hpp index e1d7b3e..2a4098f 100644 --- a/src/psplit.hpp +++ b/src/psplit.hpp @@ -73,7 +73,7 @@ class FileParts // Contains parts of a filename /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(FileParts) // Disable copy constructor and operator + DELETECOPYCTORS(FileParts) // Suppress default functions for safety };/* -- PathSplit class ---------------------------------------------------- */ class PathSplit : /* -- Base classes ------------------------------------------------------- */ @@ -182,7 +182,7 @@ class PathSplit : /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(PathSplit) // Disable copy constructor and operator + DELETECOPYCTORS(PathSplit) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ } // End of public module namespace /* ------------------------------------------------------------------------- */ diff --git a/src/sample.hpp b/src/sample.hpp index 3d0506e..35ca513 100644 --- a/src/sample.hpp +++ b/src/sample.hpp @@ -285,7 +285,7 @@ CTOR_MEM_BEGIN(Samples, Sample, ICHelperUnsafe, /* n/a */), /* -- Destructor --------------------------------------------------------- */ ~Sample(void) { UnloadBuffer(); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Sample) // Supress copy constructor for safety + DELETECOPYCTORS(Sample) // Suppress default functions for safety };/* -- End ---------------------------------------------------------------- */ CTOR_END_NOINITS(Samples, Sample, SAMPLE) // Finish collector class /* ========================================================================= */ diff --git a/src/shader.hpp b/src/shader.hpp index f488ec8..7cbd5dc 100644 --- a/src/shader.hpp +++ b/src/shader.hpp @@ -258,7 +258,7 @@ CTOR_BEGIN_DUO(Shaders, Shader, CLHelperUnsafe, ICHelperUnsafe), /* -- Destructor --------------------------------------------------------- */ ~Shader(void) { DeInitShaders(); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Shader) // Disable copy constructor and operator + DELETECOPYCTORS(Shader) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ CTOR_END_NOINITS(Shaders, Shader, SHADER) // Finish shaders collector /* ------------------------------------------------------------------------- */ diff --git a/src/shaders.hpp b/src/shaders.hpp index ee9d2da..e632adf 100644 --- a/src/shaders.hpp +++ b/src/shaders.hpp @@ -262,7 +262,7 @@ static struct ShaderCore final /* -- Code ------------------------------------------------------------- */ { } // No code /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(ShaderCore) // No copy constructor + DELETECOPYCTORS(ShaderCore) // Suppress default functions for safety /* -- Set rounding method for the shader --------------------------------- */ CVarReturn SetSPRoundingMethod(const size_t stMethod) { // Return if specified value is outrageous! diff --git a/src/socket.hpp b/src/socket.hpp index 60d111a..41690bb 100644 --- a/src/socket.hpp +++ b/src/socket.hpp @@ -1433,7 +1433,7 @@ CTOR_MEM_BEGIN_CSLAVE(Sockets, Socket, ICHelperUnsafe), FinishDisconnect(); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Socket) // Supress copy constructor for safety + DELETECOPYCTORS(Socket) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ static void DestroyAllSockets(void) { // No sockets? Ignore diff --git a/src/source.hpp b/src/source.hpp index 9e7cf3b..b79b9cd 100644 --- a/src/source.hpp +++ b/src/source.hpp @@ -299,7 +299,7 @@ CTOR_MEM_BEGIN_CSLAVE(Sources, Source, ICHelperSafe), if(uiId) ALL(cOal->DeleteSource(uiId), "Source failed to delete $!", uiId); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Source) // Supress copy constructor for safety + DELETECOPYCTORS(Source) // Suppress default functions for safety };/* -- End ---------------------------------------------------------------- */ CTOR_END(Sources, Source, SOURCE,,,, fGVolume(0.0f), fMVolume(0.0f), fVVolume(0.0f), fSVolume(0.0f)) diff --git a/src/sql.hpp b/src/sql.hpp index 288b103..e2fecd2 100644 --- a/src/sql.hpp +++ b/src/sql.hpp @@ -61,7 +61,7 @@ class SqlData : // Query response data item class /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(SqlData) // Remove copy assign operator/ctor + DELETECOPYCTORS(SqlData) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ MAPPACK_BUILD(SqlRecords, const string, SqlData); typedef list SqlResult; // vector of key/raw data blocks @@ -1356,7 +1356,7 @@ static struct Sql final : // Members initially public /* -- Destructor --------------------------------------------------------- */ DTORHELPER(~Sql, DeInit(); sqlite3_shutdown()) /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Sql) // Do not need defaults + DELETECOPYCTORS(Sql) // Suppress default functions for safety /* -- Set a pragma on or off (used only with cvar callbacks) ---- CVARS -- */ CVarReturn PragmaOnOff(const string &strVar, const bool bState) { Pragma(strVar, bState ? strvOn : strvOff); return ACCEPT; } diff --git a/src/sshot.hpp b/src/sshot.hpp index 25bff8d..e04bb24 100644 --- a/src/sshot.hpp +++ b/src/sshot.hpp @@ -111,7 +111,7 @@ CTOR_MEM_BEGIN(SShots, SShot, ICHelperUnsafe, /* n/a */), /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(SShot) // Supress copy constructor for safety + DELETECOPYCTORS(SShot) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ CTOR_END(SShots, SShot, SSHOT,,,, ifFormatId(IFMT_MAX)) // Initialised by cvars /* -- Set screenshot format flags ------------------------------------------ */ diff --git a/src/stat.hpp b/src/stat.hpp index 4926581..c36695c 100644 --- a/src/stat.hpp +++ b/src/stat.hpp @@ -373,7 +373,7 @@ CTOR_BEGIN_DUO(Stats, Stat, CLHelperUnsafe, ICHelperUnsafe), /* -- No code ---------------------------------------------------------- */ { } // Do nothing else /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Stat) // No copy constructors + DELETECOPYCTORS(Stat) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ CTOR_END_NOINITS(Stats, Stat, STAT) // End of stat objects collector /* ------------------------------------------------------------------------- */ diff --git a/src/stream.hpp b/src/stream.hpp index dc51d06..7b976e3 100644 --- a/src/stream.hpp +++ b/src/stream.hpp @@ -153,7 +153,6 @@ CTOR_MEM_BEGIN_ASYNC_CSLAVE(Streams, Stream, ICHelperUnsafe), case PS_WASPLAYING: case PS_STANDBY: break; } } - /* -- Play (without locks) ----------------------------------------------- */ void Play(void) { // If we already have a source? Stop and unqueue all buffers @@ -622,7 +621,7 @@ CTOR_MEM_BEGIN_ASYNC_CSLAVE(Streams, Stream, ICHelperUnsafe), cLog->LogDebugExSafe("Stream unloaded '$'!", IdentGet()); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Stream) // Supress copy constructor for safety + DELETECOPYCTORS(Stream) // Suppress default functions for safety };/* -- End ---------------------------------------------------------------- */ CTOR_END_ASYNC_NOFUNCS(Streams, Stream, STREAM, STREAM, /* -- Initialisers ------------------------------------------------------- */ diff --git a/src/syscore.hpp b/src/syscore.hpp index ce62f32..2315dea 100644 --- a/src/syscore.hpp +++ b/src/syscore.hpp @@ -99,7 +99,7 @@ class SysModuleData : // Members initially private /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(SysModuleData) // Disable copy constructor and operator + DELETECOPYCTORS(SysModuleData) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ /* == System modules ======================================================= ** ** ######################################################################### ** @@ -124,7 +124,7 @@ struct SysModules : /* -- No code ---------------------------------------------------------- */ { } /* --------------------------------------------------------------- */ public: - DELETECOPYCTORS(SysModules) // Disable copy constructor and operator + DELETECOPYCTORS(SysModules) // Suppress default functions for safety /* -- Dump module list --------------------------------------------------- */ CVarReturn DumpModuleList(const unsigned int uiShow) { // No modules? Return okay @@ -156,7 +156,7 @@ class SysVersion : { /* ----------------------------------------------------------------------- */ const SysModuleData &smdEng; // Engine executable information /* --------------------------------------------------------------- */ public: - DELETECOPYCTORS(SysVersion) // Disable copy constructor and operator + DELETECOPYCTORS(SysVersion) // Suppress default functions for safety /* -- Access to engine version data -------------------------------------- */ const char *ENGBuildType(void) const { return BUILD_TYPE_LABEL; } const char *ENGCompVer(void) const { return COMPILER_VERSION; } @@ -326,7 +326,7 @@ class SysCommon // Common system structs and funcs { return static_cast(RAMProcUse()) / 1048576; } size_t RAMProcPeak(void) const { return memData.stMProcPeak; } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(SysCommon) // Disable copy constructor and operator + DELETECOPYCTORS(SysCommon) // Suppress default functions for safety /* -- Constructor --------------------------------------------- */ protected: SysCommon(ExeData &&edExe, OSData &&osdOS, CPUData &&cpudCPU) : /* -- Initialisers ----------------------------------------------------- */ @@ -561,7 +561,7 @@ static class System final : // The main system class /* -- Restore old unexpected and termination handlers -------------------- */ DTORHELPER(~System, set_terminate(thHandler)) /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(System) // Disable copy constructor and operator + DELETECOPYCTORS(System) // Suppress default functions for safety /* -- CVar callbacks to update guest descriptor strings ------------------ */ CVarReturn SetGuestTitle(const string&, const string &strV) { strvTitle = strV; return ACCEPT; } diff --git a/src/sysmac.hpp b/src/sysmac.hpp index fbf9b4d..fe95785 100644 --- a/src/sysmac.hpp +++ b/src/sysmac.hpp @@ -50,7 +50,7 @@ class SysProcess // Need this before of System init order /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(SysProcess) // Supress copy constructor for safety + DELETECOPYCTORS(SysProcess) // Suppress default functions for safety };/* == Class ============================================================== */ class SysCore : /* -- Dependency classes ------------------------------------------------- */ @@ -723,7 +723,7 @@ class SysCore : GetProcessorData() }, bWindowInitialised(false) { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(SysCore) // Supress copy constructor for safety + DELETECOPYCTORS(SysCore) // Suppress default functions for safety }; /* ---------------------------------------------------------------------- */ } // End of module namespace /* == EoF =========================================================== EoF == */ diff --git a/src/sysnix.hpp b/src/sysnix.hpp index 3e72c40..1137ae7 100644 --- a/src/sysnix.hpp +++ b/src/sysnix.hpp @@ -66,7 +66,7 @@ class SysProcess // Need this before of System init order /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(SysProcess); // Supress copy constructor for safety + DELETECOPYCTORS(SysProcess) // Suppress default functions for safety };/* == Class ============================================================== */ class SysCore : /* -- Base classes ------------------------------------------------------- */ @@ -479,7 +479,7 @@ class SysCore : /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(SysCore); // Supress copy constructor for safety + DELETECOPYCTORS(SysCore) // Suppress default functions for safety }; /* ---------------------------------------------------------------------- */ } // End of module namespace /* == EoF =========================================================== EoF == */ diff --git a/src/syswin.hpp b/src/syswin.hpp index e8d613a..0fc5a83 100644 --- a/src/syswin.hpp +++ b/src/syswin.hpp @@ -229,7 +229,7 @@ class SysProcess // Need this before of System init order CoUninitialize(); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(SysProcess); // Supress copy constructor for safety + DELETECOPYCTORS(SysProcess) // Suppress default functions for safety };/* == Class ============================================================== */ class SysCore : /* -- Base classes ------------------------------------------------------- */ @@ -1020,7 +1020,7 @@ class SysCore : if(hIconSmall) DestroyIcon(hIconSmall); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(SysCore); // Supress copy constructor for safety + DELETECOPYCTORS(SysCore) // Suppress default functions for safety }; /* ---------------------------------------------------------------------- */ } // End of module namespace /* == EoF =========================================================== EoF == */ diff --git a/src/texture.hpp b/src/texture.hpp index 30e8370..3a35e67 100644 --- a/src/texture.hpp +++ b/src/texture.hpp @@ -92,7 +92,7 @@ class TextureBase : // All members initially private /* -- Code ------------------------------------------------------------- */ { } // No code /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(TextureBase) // No defaults + DELETECOPYCTORS(TextureBase) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ CTOR_MEM_BEGIN(Textures, Texture, ICHelperUnsafe, /* No IdentCSlave<> */), /* -- Base classes ------------------------------------------------------- */ @@ -564,13 +564,6 @@ CTOR_MEM_BEGIN(Textures, Texture, ICHelperUnsafe, /* No IdentCSlave<> */), BlitQuad(GetSubName(stSubTexId), cdTex, FboItemSetAndGetVertex(fLeft, fTop, fLeft + cdTex.DimGetWidth(), fTop + cdTex.DimGetHeight(), fAngle), FboItemGetCData()); } - /* -- Blit quad with bounds and angle ------------------------------------ */ - void BlitLTRBA(const size_t stSubTexId, const size_t stTileId, - const GLfloat fLeft, const GLfloat fTop, const GLfloat fRight, - const GLfloat fBottom, const GLfloat fAngle) - { BlitQuad(GetSubName(stSubTexId), clTiles[stSubTexId][stTileId], - FboItemSetAndGetVertex(fLeft, fTop, fRight, fBottom, fAngle), - FboItemGetCData()); } /* -- Blit quad with coords, dimensions and angle ------------------------ */ void BlitLTWHA(const size_t stSubTexId, const size_t stTileId, const GLfloat fLeft, const GLfloat fTop, const GLfloat fWidth, @@ -823,7 +816,7 @@ CTOR_MEM_BEGIN(Textures, Texture, ICHelperUnsafe, /* No IdentCSlave<> */), /* -- Destructor (Unregistration then deinitialisation) ------------------ */ ~Texture(void) { DeInit(); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Texture) // Supress copy constructor for safety + DELETECOPYCTORS(Texture) // Suppress default functions for safety };/* -- Finish the collector ----------------------------------------------- */ CTOR_END_NOINITS(Textures, Texture, TEXTURE) /* -- DeInit Textures ------------------------------------------------------ */ diff --git a/src/thread.hpp b/src/thread.hpp index fb58a2a..dfcd12a 100644 --- a/src/thread.hpp +++ b/src/thread.hpp @@ -294,7 +294,7 @@ CTOR_MEM_BEGIN_CSLAVE(Threads, Thread, ICHelperUnsafe), /* --------------------------------------------------------------------- */ { } // Do nothing else /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Thread) // Disable copy constructor and operator + DELETECOPYCTORS(Thread) // Suppress default functions for safety };/* ======================================================================= */ CTOR_END(Threads, Thread, THREAD,,,, stRunning{0}); /* -- Thread sync helper --------------------------------------------------- */ @@ -385,7 +385,7 @@ templateclass ThreadSyncHelper : private Callbacks /* --------------------------------------------------------------------- */ { } // Do nothing else /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(ThreadSyncHelper) // Omit copy constructor for safety + DELETECOPYCTORS(ThreadSyncHelper) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ static size_t ThreadGetRunning(void) { return cThreads->stRunning; } /* ------------------------------------------------------------------------- */ diff --git a/src/timer.hpp b/src/timer.hpp index 45b45fa..1e0f2fc 100644 --- a/src/timer.hpp +++ b/src/timer.hpp @@ -180,7 +180,7 @@ static class Timer final // Members initially private /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Timer) // Disable copy constructor and operator + DELETECOPYCTORS(Timer) // Suppress default functions for safety /* -- TimerSetDelay ------------------------------------------------------ */ CVarReturn TimerSetTimeOut(const unsigned int uiTimeOut) { return CVarSimpleSetIntNL(cdTimeOut, diff --git a/src/token.hpp b/src/token.hpp index c2b623e..ab92d61 100644 --- a/src/token.hpp +++ b/src/token.hpp @@ -60,11 +60,11 @@ struct TokenListNC : /* -- MOVE assignment constructor ---------------------------------------- */ TokenListNC(TokenListNC &&tlOther) : /* -- Initialisers ----------------------------------------------------- */ - CStrVector{ StdMove(tlOther) } // Move vector of C-Strings over + CStrVector{ StdMove(tlOther) } // Move vector of C-Strings over /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(TokenListNC) // Disable copy constructor/operator + DELETECOPYCTORS(TokenListNC) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ /* -- Token class with line limit ------------------------------------------ */ struct TokenList : @@ -115,7 +115,7 @@ struct TokenList : /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(TokenList) // Disable copy constructor/operator + DELETECOPYCTORS(TokenList) // Suppress default functions for safety }; /* ---------------------------------------------------------------------- */ /* == Token class ========================================================== */ struct Token : @@ -178,7 +178,7 @@ struct Token : /* -- No code ---------------------------------------------------------- */ { } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(Token) // Disable copy constructor/operator + DELETECOPYCTORS(Token) // Suppress default functions for safety };/* ----------------------------------------------------------------------- */ } // End of public module namespace /* ------------------------------------------------------------------------- */ diff --git a/src/winbase.hpp b/src/winbase.hpp index 1986367..5466a6a 100644 --- a/src/winbase.hpp +++ b/src/winbase.hpp @@ -845,7 +845,7 @@ class SysBase : // Members initially private /* -- Install unhandled exception filter --------------------------------- */ { SetUnhandledExceptionFilter(HandleExceptionStatic); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(SysBase); // Suppress copy constructor for safety + DELETECOPYCTORS(SysBase) // Suppress default functions for safety };/* ======================================================================= */ #define MSENGINE_SYSBASE_CALLBACKS() \ LONG WINAPI SysBase::SysBase::HandleExceptionStatic(LPEXCEPTION_POINTERS \ diff --git a/src/wincon.hpp b/src/wincon.hpp index 154d538..2430dd9 100644 --- a/src/wincon.hpp +++ b/src/wincon.hpp @@ -842,7 +842,7 @@ class SysCon : // Members initially private /* -- Destructor --------------------------------------------------------- */ DTORHELPER(~SysCon, SysConDeInit()); /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(SysCon); // Disable copy constructor and operator + DELETECOPYCTORS(SysCon) // Suppress default functions for safety /* -- Set maximum console line length ------------------------------------ */ CVarReturn RowsModified(const size_t stRows) { // Deny if out of range. The maximum value is a SHORT from Win32 API. diff --git a/src/winmap.hpp b/src/winmap.hpp index 86a8af5..20f907e 100644 --- a/src/winmap.hpp +++ b/src/winmap.hpp @@ -174,6 +174,6 @@ class SysMap : // Members initially private /* -- Destructor --------------------------------------------------------- */ ~SysMap(void) { SysMapDeInitInternal(); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(SysMap); // Disable copy constructor and operator + DELETECOPYCTORS(SysMap) // Suppress default functions for safety };/* -- End ---------------------------------------------------------------- */ /* == EoF =========================================================== EoF == */ diff --git a/src/winpip.hpp b/src/winpip.hpp index 18b3d91..33afaf2 100644 --- a/src/winpip.hpp +++ b/src/winpip.hpp @@ -257,6 +257,6 @@ class SysPipe : // Members initially private /* -- Destructor --------------------------------------------------------- */ ~SysPipe(void) { DeInit(); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(SysPipe); // Suppress copy constructor for safety + DELETECOPYCTORS(SysPipe) // Suppress default functions for safety };/* -- End ---------------------------------------------------------------- */ /* == EoF =========================================================== EoF == */ diff --git a/src/winreg.hpp b/src/winreg.hpp index 004e405..46769b6 100644 --- a/src/winreg.hpp +++ b/src/winreg.hpp @@ -98,6 +98,6 @@ class SysReg // Members initially private /* -- Destructor --------------------------------------------------------- */ ~SysReg(void) { if(Opened()) RegCloseKey(GetHandle()); } /* ----------------------------------------------------------------------- */ - DELETECOPYCTORS(SysReg); // Suppress copy constructor for safety + DELETECOPYCTORS(SysReg) // Suppress default functions for safety };/* -- End ---------------------------------------------------------------- */ /* == EoF =========================================================== EoF == */