diff --git a/irr/include/IOSOperator.h b/irr/include/IOSOperator.h index 1316cba69f..4a2dc69392 100644 --- a/irr/include/IOSOperator.h +++ b/irr/include/IOSOperator.h @@ -11,9 +11,6 @@ class IOSOperator : public virtual IReferenceCounted { public: - //! Get the current OS version as string. - virtual const core::stringc &getOperatingSystemVersion() const = 0; - //! Copies text to the clipboard //! \param text: text in utf-8 virtual void copyToClipboard(const c8 *text) const = 0; @@ -31,10 +28,4 @@ public: //! This is a no-op on some platforms. //! \return Returns 0 if no string is in there, otherwise an utf-8 string. virtual const c8 *getTextFromPrimarySelection() const = 0; - - //! Get the total and available system RAM - /** \param totalBytes: will contain the total system memory in Kilobytes (1024 B) - \param availableBytes: will contain the available memory in Kilobytes (1024 B) - \return True if successful, false if not */ - virtual bool getSystemMemory(u32 *totalBytes, u32 *availableBytes) const = 0; }; diff --git a/irr/include/IVideoDriver.h b/irr/include/IVideoDriver.h index 61342fbb97..5fc28fc2e1 100644 --- a/irr/include/IVideoDriver.h +++ b/irr/include/IVideoDriver.h @@ -379,32 +379,6 @@ public: /** This is glBlitFramebuffer in OpenGL. */ virtual void blitRenderTarget(IRenderTarget *from, IRenderTarget *to) = 0; - //! Sets a boolean alpha channel on the texture based on a color key. - /** This makes the texture fully transparent at the texels where - this color key can be found when using for example draw2DImage - with useAlphachannel==true. The alpha of other texels is not modified. - \param texture Texture whose alpha channel is modified. - \param color Color key color. Every texel with this color will - become fully transparent as described above. Please note that the - colors of a texture may be converted when loading it, so the - color values may not be exactly the same in the engine and for - example in picture edit programs. To avoid this problem, you - could use the makeColorKeyTexture method, which takes the - position of a pixel instead a color value. */ - virtual void makeColorKeyTexture(video::ITexture *texture, - video::SColor color) const = 0; - - //! Sets a boolean alpha channel on the texture based on the color at a position. - /** This makes the texture fully transparent at the texels where - the color key can be found when using for example draw2DImage - with useAlphachannel==true. The alpha of other texels is not modified. - \param texture Texture whose alpha channel is modified. - \param colorKeyPixelPos Position of a pixel with the color key - color. Every texel with this color will become fully transparent as - described above. */ - virtual void makeColorKeyTexture(video::ITexture *texture, - core::position2d colorKeyPixelPos) const = 0; - //! Set a render target. /** This will only work if the driver supports the EVDF_RENDER_TO_TARGET feature, which can be queried with @@ -812,10 +786,6 @@ public: f32 &start, f32 &end, f32 &density, bool &pixelFog, bool &rangeFog) = 0; - //! Get the current color format of the color buffer - /** \return Color format of the color buffer. */ - virtual ECOLOR_FORMAT getColorFormat() const = 0; - //! Get the size of the screen or render window. /** \return Size of screen or render window. */ virtual const core::dimension2d &getScreenSize() const = 0; @@ -827,14 +797,6 @@ public: \return Size of render target or screen/window */ virtual const core::dimension2d &getCurrentRenderTargetSize() const = 0; - //! Returns current frames per second value. - /** This value is updated approximately every 1.5 seconds and - is only intended to provide a rough guide to the average frame - rate. It is not suitable for use in performing timing - calculations or framerate independent movement. - \return Approximate amount of frames per second drawn. */ - virtual s32 getFPS() const = 0; - //! Return some statistics about the last frame virtual SFrameStats getFrameStats() const = 0; @@ -1006,26 +968,6 @@ public: /** \return Amount of currently available material renderers. */ virtual u32 getMaterialRendererCount() const = 0; - //! Get name of a material renderer - /** This string can, e.g., be used to test if a specific - renderer already has been registered/created, or use this - string to store data about materials: This returned name will - be also used when serializing materials. - \param idx Id of the material renderer. Can be a value of the - E_MATERIAL_TYPE enum or a value which was returned by - addMaterialRenderer(). - \return String with the name of the renderer, or 0 if not - existing */ - virtual const c8 *getMaterialRendererName(u32 idx) const = 0; - - //! Sets the name of a material renderer. - /** Will have no effect on built-in material renderers. - \param idx: Id of the material renderer. Can be a value of the - E_MATERIAL_TYPE enum or a value which was returned by - addMaterialRenderer(). - \param name: New name of the material renderer. */ - virtual void setMaterialRendererName(u32 idx, const c8 *name) = 0; - //! Swap the material renderers used for certain id's /** Swap the IMaterialRenderers responsible for rendering specific material-id's. This means every SMaterial using a MaterialType diff --git a/irr/include/IrrlichtDevice.h b/irr/include/IrrlichtDevice.h index 046ac99ab1..2d5f85bcbd 100644 --- a/irr/include/IrrlichtDevice.h +++ b/irr/include/IrrlichtDevice.h @@ -196,10 +196,6 @@ public: or similar. */ virtual bool supportsTouchEvents() const { return false; } - //! Get the current color format of the window - /** \return Color format of the window. */ - virtual video::ECOLOR_FORMAT getColorFormat() const = 0; - //! Notifies the device that it should close itself. /** IrrlichtDevice::run() will always return false after closeDevice() was called. */ virtual void closeDevice() = 0; diff --git a/irr/include/SMesh.h b/irr/include/SMesh.h index 12f13f8b79..f180922bf5 100644 --- a/irr/include/SMesh.h +++ b/irr/include/SMesh.h @@ -26,7 +26,7 @@ struct SMesh final : public IAnimatedMesh } //! clean mesh - virtual void clear() + void clear() { for (auto *buf : MeshBuffers) buf->drop(); diff --git a/irr/include/SSkinMeshBuffer.h b/irr/include/SSkinMeshBuffer.h index 6141227350..72a3d3caed 100644 --- a/irr/include/SSkinMeshBuffer.h +++ b/irr/include/SSkinMeshBuffer.h @@ -90,7 +90,7 @@ struct SSkinMeshBuffer final : public IMeshBuffer } //! Get standard vertex at given index - virtual video::S3DVertex *getVertex(u32 index) + video::S3DVertex *getVertex(u32 index) { switch (VertexType) { case video::EVT_2TCOORDS: diff --git a/irr/include/irrMath.h b/irr/include/irrMath.h index 4523a01826..e00dd2c6c0 100644 --- a/irr/include/irrMath.h +++ b/irr/include/irrMath.h @@ -312,13 +312,6 @@ typedef union f32 f; } inttofloat; -#define F32_AS_S32(f) (*((s32 *)&(f))) -#define F32_AS_U32(f) (*((u32 *)&(f))) -#define F32_AS_U32_POINTER(f) (((u32 *)&(f))) - -#define F32_VALUE_0 0x00000000 -#define F32_VALUE_1 0x3f800000 - //! code is taken from IceFPU //! Integer representation of a floating-point value. inline u32 IR(f32 x) @@ -420,12 +413,6 @@ REALINLINE f64 reciprocal(const f64 f) return 1.0 / f; } -// calculate: 1 / x, low precision allowed -REALINLINE f32 reciprocal_approxim(const f32 f) -{ - return 1.f / f; -} - REALINLINE s32 floor32(f32 x) { return (s32)floorf(x); @@ -442,16 +429,6 @@ REALINLINE s32 round32(f32 x) return (s32)round_(x); } -inline f32 f32_max3(const f32 a, const f32 b, const f32 c) -{ - return a > b ? (a > c ? a : c) : (b > c ? b : c); -} - -inline f32 f32_min3(const f32 a, const f32 b, const f32 c) -{ - return a < b ? (a < c ? a : c) : (b < c ? b : c); -} - inline f32 fract(f32 x) { return x - floorf(x); diff --git a/irr/src/CFPSCounter.cpp b/irr/src/CFPSCounter.cpp deleted file mode 100644 index b04785b797..0000000000 --- a/irr/src/CFPSCounter.cpp +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (C) 2002-2012 Nikolaus Gebhardt -// This file is part of the "Irrlicht Engine". -// For conditions of distribution and use, see copyright notice in irrlicht.h - -#include "CFPSCounter.h" -#include "irrMath.h" - -namespace video -{ - -CFPSCounter::CFPSCounter() : - FPS(0), StartTime(0), FramesCounted(0) -{ -} - -//! to be called every frame -void CFPSCounter::registerFrame(u32 now) -{ - ++FramesCounted; - - const u32 milliseconds = now - StartTime; - if (milliseconds >= 1500) { - const f32 invMilli = core::reciprocal((f32)milliseconds); - - FPS = core::ceil32((1000 * FramesCounted) * invMilli); - - FramesCounted = 0; - StartTime = now; - } -} - -} // end namespace video diff --git a/irr/src/CFPSCounter.h b/irr/src/CFPSCounter.h deleted file mode 100644 index 071c1c275f..0000000000 --- a/irr/src/CFPSCounter.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (C) 2002-2012 Nikolaus Gebhardt -// This file is part of the "Irrlicht Engine". -// For conditions of distribution and use, see copyright notice in irrlicht.h - -#pragma once - -#include "irrTypes.h" - -namespace video -{ - -class CFPSCounter -{ -public: - CFPSCounter(); - - //! returns current fps - s32 getFPS() const { return FPS; } - - //! to be called every frame - void registerFrame(u32 now); - -private: - s32 FPS; - u32 StartTime; - u32 FramesCounted; -}; - -} // end namespace video diff --git a/irr/src/CIrrDeviceSDL.cpp b/irr/src/CIrrDeviceSDL.cpp index a44213d7cc..ed7c6120fa 100644 --- a/irr/src/CIrrDeviceSDL.cpp +++ b/irr/src/CIrrDeviceSDL.cpp @@ -384,7 +384,7 @@ CIrrDeviceSDL::CIrrDeviceSDL(const SIrrlichtCreationParameters ¶m) : sdlver += SDL_GetPlatform(); } - Operator = new COSOperator(sdlver); + Operator = new COSOperator(); if (SDLDeviceInstances == 1) { os::Printer::log(sdlver.c_str(), ELL_INFORMATION); } @@ -1351,26 +1351,6 @@ bool CIrrDeviceSDL::isWindowMinimized() const return Window && (SDL_GetWindowFlags(Window) & SDL_WINDOW_MINIMIZED) != 0; } -//! returns color format of the window. -video::ECOLOR_FORMAT CIrrDeviceSDL::getColorFormat() const -{ - if (Window) { - SDL_Surface *surface = SDL_GetWindowSurface(Window); - if (surface->format->BitsPerPixel == 16) { - if (surface->format->Amask != 0) - return video::ECF_A1R5G5B5; - else - return video::ECF_R5G6B5; - } else { - if (surface->format->Amask != 0) - return video::ECF_A8R8G8B8; - else - return video::ECF_R8G8B8; - } - } else - return CIrrDeviceStub::getColorFormat(); -} - void CIrrDeviceSDL::createKeyMap() { // I don't know if this is the best method to create diff --git a/irr/src/CIrrDeviceSDL.h b/irr/src/CIrrDeviceSDL.h index 9e2cd3fd54..ddda12968a 100644 --- a/irr/src/CIrrDeviceSDL.h +++ b/irr/src/CIrrDeviceSDL.h @@ -54,9 +54,6 @@ public: //! returns if window is minimized. bool isWindowMinimized() const override; - //! returns color format of the window. - video::ECOLOR_FORMAT getColorFormat() const override; - //! notifies the device that it should close itself void closeDevice() override; diff --git a/irr/src/CIrrDeviceStub.cpp b/irr/src/CIrrDeviceStub.cpp index 0cd2c30cad..24d090ea80 100644 --- a/irr/src/CIrrDeviceStub.cpp +++ b/irr/src/CIrrDeviceStub.cpp @@ -261,12 +261,6 @@ bool CIrrDeviceStub::isFullscreen() const return CreationParams.Fullscreen; } -//! returns color format -video::ECOLOR_FORMAT CIrrDeviceStub::getColorFormat() const -{ - return video::ECF_R5G6B5; -} - //! No-op in this implementation bool CIrrDeviceStub::activateJoysticks(core::array &joystickInfo) { diff --git a/irr/src/CIrrDeviceStub.h b/irr/src/CIrrDeviceStub.h index af0ce19d5e..893c4c0800 100644 --- a/irr/src/CIrrDeviceStub.h +++ b/irr/src/CIrrDeviceStub.h @@ -101,9 +101,6 @@ public: //! Checks if the window is running in fullscreen mode. bool isFullscreen() const override; - //! get color format of the current window - video::ECOLOR_FORMAT getColorFormat() const override; - //! Activate any joysticks, and generate events for them. bool activateJoysticks(core::array &joystickInfo) override; diff --git a/irr/src/CMakeLists.txt b/irr/src/CMakeLists.txt index 247e44e595..03212d0484 100644 --- a/irr/src/CMakeLists.txt +++ b/irr/src/CMakeLists.txt @@ -341,8 +341,6 @@ set(IRRIMAGEOBJ ) add_library(IRRVIDEOOBJ OBJECT - CFPSCounter.h - CFPSCounter.cpp ${IRRDRVROBJ} ${IRRIMAGEOBJ} ) diff --git a/irr/src/CNullDriver.cpp b/irr/src/CNullDriver.cpp index dac840669d..5a54e8c7c0 100644 --- a/irr/src/CNullDriver.cpp +++ b/irr/src/CNullDriver.cpp @@ -208,7 +208,6 @@ bool CNullDriver::beginScene(u16 clearFlag, SColor clearColor, f32 clearDepth, u bool CNullDriver::endScene() { - FPSCounter.registerFrame(os::Timer::getRealTime()); expireHardwareBuffers(); updateAllOcclusionQueries(); return true; @@ -680,12 +679,6 @@ void CNullDriver::draw2DLine(const core::position2d &start, { } -//! returns color format -ECOLOR_FORMAT CNullDriver::getColorFormat() const -{ - return ECF_R5G6B5; -} - //! returns screen size const core::dimension2d &CNullDriver::getScreenSize() const { @@ -706,12 +699,6 @@ const core::dimension2d &CNullDriver::getCurrentRenderTargetSize() const return CurrentRenderTargetSize; } -// returns current frames per second value -s32 CNullDriver::getFPS() const -{ - return FPSCounter.getFPS(); -} - SFrameStats CNullDriver::getFrameStats() const { return FrameStats; @@ -725,118 +712,6 @@ const char *CNullDriver::getName() const return "Irrlicht NullDevice"; } -//! Creates a boolean alpha channel of the texture based of an color key. -void CNullDriver::makeColorKeyTexture(video::ITexture *texture, - video::SColor color) const -{ - if (!texture) - return; - - if (texture->getColorFormat() != ECF_A1R5G5B5 && - texture->getColorFormat() != ECF_A8R8G8B8) { - os::Printer::log("Error: Unsupported texture color format for making color key channel.", ELL_ERROR); - return; - } - - if (texture->getColorFormat() == ECF_A1R5G5B5) { - u16 *p = (u16 *)texture->lock(); - - if (!p) { - os::Printer::log("Could not lock texture for making color key channel.", ELL_ERROR); - return; - } - - const core::dimension2d dim = texture->getSize(); - const u32 pitch = texture->getPitch() / 2; - - // color with alpha disabled (i.e. fully transparent) - const u16 refZeroAlpha = (0x7fff & color.toA1R5G5B5()); - - const u32 pixels = pitch * dim.Height; - - for (u32 pixel = 0; pixel < pixels; ++pixel) { - // If the color matches the reference color, ignoring alphas, - // set the alpha to zero. - if (((*p) & 0x7fff) == refZeroAlpha) - (*p) = refZeroAlpha; - - ++p; - } - - texture->unlock(); - } else { - u32 *p = (u32 *)texture->lock(); - - if (!p) { - os::Printer::log("Could not lock texture for making color key channel.", ELL_ERROR); - return; - } - - core::dimension2d dim = texture->getSize(); - u32 pitch = texture->getPitch() / 4; - - // color with alpha disabled (fully transparent) - const u32 refZeroAlpha = 0x00ffffff & color.color; - - const u32 pixels = pitch * dim.Height; - for (u32 pixel = 0; pixel < pixels; ++pixel) { - // If the color matches the reference color, ignoring alphas, - // set the alpha to zero. - if (((*p) & 0x00ffffff) == refZeroAlpha) - (*p) = refZeroAlpha; - - ++p; - } - - texture->unlock(); - } - texture->regenerateMipMapLevels(); -} - -//! Creates an boolean alpha channel of the texture based of an color key position. -void CNullDriver::makeColorKeyTexture(video::ITexture *texture, - core::position2d colorKeyPixelPos) const -{ - if (!texture) - return; - - if (texture->getColorFormat() != ECF_A1R5G5B5 && - texture->getColorFormat() != ECF_A8R8G8B8) { - os::Printer::log("Error: Unsupported texture color format for making color key channel.", ELL_ERROR); - return; - } - - SColor colorKey; - - if (texture->getColorFormat() == ECF_A1R5G5B5) { - u16 *p = (u16 *)texture->lock(ETLM_READ_ONLY); - - if (!p) { - os::Printer::log("Could not lock texture for making color key channel.", ELL_ERROR); - return; - } - - u32 pitch = texture->getPitch() / 2; - - const u16 key16Bit = 0x7fff & p[colorKeyPixelPos.Y * pitch + colorKeyPixelPos.X]; - - colorKey = video::A1R5G5B5toA8R8G8B8(key16Bit); - } else { - u32 *p = (u32 *)texture->lock(ETLM_READ_ONLY); - - if (!p) { - os::Printer::log("Could not lock texture for making color key channel.", ELL_ERROR); - return; - } - - u32 pitch = texture->getPitch() / 4; - colorKey = 0x00ffffff & p[colorKeyPixelPos.Y * pitch + colorKeyPixelPos.X]; - } - - texture->unlock(); - makeColorKeyTexture(texture, colorKey); -} - SDriverLimits CNullDriver::getLimits() const { SDriverLimits ret; @@ -1427,15 +1302,6 @@ s32 CNullDriver::addMaterialRenderer(IMaterialRenderer *renderer, const char *na return MaterialRenderers.size() - 1; } -//! Sets the name of a material renderer. -void CNullDriver::setMaterialRendererName(u32 idx, const char *name) -{ - if (idx < numBuiltInMaterials || idx >= MaterialRenderers.size()) - return; - - MaterialRenderers[idx].Name = name; -} - void CNullDriver::swapMaterialRenderers(u32 idx1, u32 idx2, bool swapNames) { if (idx1 < MaterialRenderers.size() && idx2 < MaterialRenderers.size()) { @@ -1483,15 +1349,6 @@ u32 CNullDriver::getMaterialRendererCount() const return MaterialRenderers.size(); } -//! Returns name of the material renderer -const char *CNullDriver::getMaterialRendererName(u32 idx) const -{ - if (idx < MaterialRenderers.size()) - return MaterialRenderers[idx].Name.c_str(); - - return 0; -} - //! Returns pointer to the IGPUProgrammingServices interface. IGPUProgrammingServices *CNullDriver::getGPUProgrammingServices() { diff --git a/irr/src/CNullDriver.h b/irr/src/CNullDriver.h index 311b5c1254..4b5bed27fc 100644 --- a/irr/src/CNullDriver.h +++ b/irr/src/CNullDriver.h @@ -12,7 +12,6 @@ #include "IMesh.h" #include "IMeshBuffer.h" #include "IMeshSceneNode.h" -#include "CFPSCounter.h" #include "S3DVertex.h" #include "SVertexIndex.h" #include "SExposedVideoData.h" @@ -175,9 +174,6 @@ public: f32 &start, f32 &end, f32 &density, bool &pixelFog, bool &rangeFog) override; - //! get color format of the current color buffer - ECOLOR_FORMAT getColorFormat() const override; - //! get screen size const core::dimension2d &getScreenSize() const override; @@ -187,9 +183,6 @@ public: //! get render target size const core::dimension2d &getCurrentRenderTargetSize() const override; - // get current frames per second value - s32 getFPS() const override; - SFrameStats getFrameStats() const override; //! \return Returns the name of the video driver. Example: In case of the DIRECT3D8 @@ -222,13 +215,6 @@ public: ITexture *addRenderTargetTextureCubemap(const u32 sideLen, const io::path &name, const ECOLOR_FORMAT format) override; - //! Creates an 1bit alpha channel of the texture based of an color key. - void makeColorKeyTexture(video::ITexture *texture, video::SColor color) const override; - - //! Creates an 1bit alpha channel of the texture based of an color key position. - virtual void makeColorKeyTexture(video::ITexture *texture, - core::position2d colorKeyPixelPos) const override; - SDriverLimits getLimits() const override; //! Enables or disables a texture creation flag. @@ -436,8 +422,6 @@ public: //! Returns amount of currently available material renderers. u32 getMaterialRendererCount() const override; - //! Returns name of the material renderer - const char *getMaterialRendererName(u32 idx) const override; //! Adds a new material renderer to the VideoDriver, based on a high level shading language. virtual s32 addHighLevelShaderMaterial( @@ -492,9 +476,6 @@ public: //! Writes the provided image to a file. bool writeImageToFile(IImage *image, io::IWriteFile *file, u32 param = 0) override; - //! Sets the name of a material renderer. - void setMaterialRendererName(u32 idx, const char *name) override; - //! Swap the material renderers used for certain id's void swapMaterialRenderers(u32 idx1, u32 idx2, bool swapNames) override; @@ -692,7 +673,6 @@ protected: core::dimension2d ScreenSize; core::matrix4 TransformationMatrix; - CFPSCounter FPSCounter; SFrameStats FrameStats; u32 MinVertexCountForVBO; diff --git a/irr/src/COSOperator.cpp b/irr/src/COSOperator.cpp index e88dc4cfc1..e08d7176a6 100644 --- a/irr/src/COSOperator.cpp +++ b/irr/src/COSOperator.cpp @@ -25,8 +25,7 @@ #include "fast_atof.h" // constructor -COSOperator::COSOperator(const core::stringc &osVersion) : - OperatingSystem(osVersion) +COSOperator::COSOperator() {} COSOperator::~COSOperator() @@ -37,12 +36,6 @@ COSOperator::~COSOperator() #endif } -//! returns the current operating system version as string. -const core::stringc &COSOperator::getOperatingSystemVersion() const -{ - return OperatingSystem; -} - //! copies text to the clipboard void COSOperator::copyToClipboard(const c8 *text) const { @@ -97,52 +90,3 @@ const c8 *COSOperator::getTextFromPrimarySelection() const #endif } -bool COSOperator::getSystemMemory(u32 *Total, u32 *Avail) const -{ -#if defined(_IRR_WINDOWS_API_) - - MEMORYSTATUSEX MemoryStatusEx; - MemoryStatusEx.dwLength = sizeof(MEMORYSTATUSEX); - - // cannot fail - GlobalMemoryStatusEx(&MemoryStatusEx); - - if (Total) - *Total = (u32)(MemoryStatusEx.ullTotalPhys >> 10); - if (Avail) - *Avail = (u32)(MemoryStatusEx.ullAvailPhys >> 10); - return true; - -#elif defined(_IRR_POSIX_API_) && defined(_SC_PHYS_PAGES) && defined(_SC_AVPHYS_PAGES) - long ps = sysconf(_SC_PAGESIZE); - long pp = sysconf(_SC_PHYS_PAGES); - long ap = sysconf(_SC_AVPHYS_PAGES); - - if (ps == -1 || (Total && pp == -1) || (Avail && ap == -1)) - return false; - - if (Total) - *Total = (u32)((pp >> 10) * ps); - if (Avail) - *Avail = (u32)((ap >> 10) * ps); - return true; -#elif defined(_IRR_OSX_PLATFORM_) - int mib[2]; - int64_t physical_memory; - size_t length; - - // Get the Physical memory size - mib[0] = CTL_HW; - mib[1] = HW_MEMSIZE; - length = sizeof(int64_t); - sysctl(mib, 2, &physical_memory, &length, NULL, 0); - - if (Total) - *Total = (u32)(physical_memory >> 10); - if (Avail) - *Avail = (u32)(physical_memory >> 10); // we don't know better - return true; -#else - return false; -#endif -} diff --git a/irr/src/COSOperator.h b/irr/src/COSOperator.h index 745dbcb7b0..c1ef6a06a8 100644 --- a/irr/src/COSOperator.h +++ b/irr/src/COSOperator.h @@ -11,16 +11,13 @@ class COSOperator : public IOSOperator { public: // constructor - COSOperator(const core::stringc &osversion); + COSOperator(); ~COSOperator(); COSOperator(const COSOperator &) = delete; COSOperator &operator=(const COSOperator &) = delete; - //! Get the current OS version as string. - const core::stringc &getOperatingSystemVersion() const override; - //! Copies text to the clipboard //! \param text: text in utf-8 void copyToClipboard(const c8 *text) const override; @@ -39,15 +36,7 @@ public: //! \return Returns 0 if no string is in there, otherwise an utf-8 string. const c8 *getTextFromPrimarySelection() const override; - //! Get the total and available system RAM - /** \param totalBytes: will contain the total system memory in Kilobytes (1024 B) - \param availableBytes: will contain the available memory in Kilobytes (1024 B) - \return True if successful, false if not */ - bool getSystemMemory(u32 *Total, u32 *Avail) const override; - private: - core::stringc OperatingSystem; - #ifdef _IRR_WINDOWS_API_ mutable core::stringc ClipboardBuf; #endif diff --git a/irr/src/COpenGLCoreTexture.h b/irr/src/COpenGLCoreTexture.h index 04024ac19f..4cdeaa5fc2 100644 --- a/irr/src/COpenGLCoreTexture.h +++ b/irr/src/COpenGLCoreTexture.h @@ -151,7 +151,7 @@ public: OriginalColorFormat = format; if (ECF_UNKNOWN == OriginalColorFormat) - ColorFormat = getBestColorFormat(Driver->getColorFormat()); + ColorFormat = getBestColorFormat(video::ECF_A8R8G8B8); else ColorFormat = OriginalColorFormat; diff --git a/irr/src/COpenGLDriver.cpp b/irr/src/COpenGLDriver.cpp index 045e65bbc4..fc4de85f39 100644 --- a/irr/src/COpenGLDriver.cpp +++ b/irr/src/COpenGLDriver.cpp @@ -28,7 +28,7 @@ const u16 COpenGLDriver::Quad2DIndices[4] = {0, 1, 2, 3}; COpenGLDriver::COpenGLDriver(const SIrrlichtCreationParameters ¶ms, io::IFileSystem *io, IContextManager *contextManager) : CNullDriver(io, params.WindowSize), COpenGLExtensionHandler(), CacheHandler(0), CurrentRenderMode(ERM_NONE), ResetRenderStates(true), - Transformation3DChanged(true), AntiAlias(params.AntiAlias), ColorFormat(ECF_R8G8B8), FixedPipelineState(EOFPS_ENABLE), Params(params), + Transformation3DChanged(true), AntiAlias(params.AntiAlias), FixedPipelineState(EOFPS_ENABLE), Params(params), ContextManager(contextManager) {} @@ -2505,12 +2505,6 @@ E_DRIVER_TYPE COpenGLDriver::getDriverType() const return EDT_OPENGL; } -//! returns color format -ECOLOR_FORMAT COpenGLDriver::getColorFormat() const -{ - return ColorFormat; -} - //! Get a vertex shader constant index. s32 COpenGLDriver::getVertexShaderConstantID(const c8 *name) { @@ -2776,7 +2770,7 @@ IImage *COpenGLDriver::createScreenShot(video::ECOLOR_FORMAT format, video::E_RE return 0; if (format == video::ECF_UNKNOWN) - format = getColorFormat(); + format = video::ECF_R8G8B8; // TODO: Maybe we could support more formats (floating point and some of those beyond ECF_R8), didn't really try yet if (IImage::isCompressedFormat(format) || IImage::isDepthFormat(format) || IImage::isFloatingPointFormat(format) || format >= ECF_R8) diff --git a/irr/src/COpenGLDriver.h b/irr/src/COpenGLDriver.h index b7ee9f798e..e93b1dba19 100644 --- a/irr/src/COpenGLDriver.h +++ b/irr/src/COpenGLDriver.h @@ -183,9 +183,6 @@ public: //! Returns type of video driver E_DRIVER_TYPE getDriverType() const override; - //! get color format of the current color buffer - ECOLOR_FORMAT getColorFormat() const override; - //! Returns the transformation set by setTransform const core::matrix4 &getTransform(E_TRANSFORMATION_STATE state) const override; @@ -368,9 +365,6 @@ private: core::matrix4 TextureFlipMatrix; - //! Color buffer format - ECOLOR_FORMAT ColorFormat; - E_OPENGL_FIXED_PIPELINE_STATE FixedPipelineState; SIrrlichtCreationParameters Params; diff --git a/irr/src/OpenGL/Driver.cpp b/irr/src/OpenGL/Driver.cpp index e801b4e6a1..7b391df67e 100644 --- a/irr/src/OpenGL/Driver.cpp +++ b/irr/src/OpenGL/Driver.cpp @@ -152,7 +152,7 @@ COpenGL3DriverBase::COpenGL3DriverBase(const SIrrlichtCreationParameters ¶ms MaterialRenderer2DActive(0), MaterialRenderer2DTexture(0), MaterialRenderer2DNoTexture(0), CurrentRenderMode(ERM_NONE), Transformation3DChanged(true), OGLES2ShaderPath(params.OGLES2ShaderPath), - ColorFormat(ECF_R8G8B8), ContextManager(contextManager), EnableErrorTest(params.DriverDebug) + ContextManager(contextManager), EnableErrorTest(params.DriverDebug) { if (!ContextManager) return; @@ -1560,12 +1560,6 @@ E_DRIVER_TYPE COpenGL3DriverBase::getDriverType() const return EDT_OPENGL3; } -//! returns color format -ECOLOR_FORMAT COpenGL3DriverBase::getColorFormat() const -{ - return ColorFormat; -} - //! Get a vertex shader constant index. s32 COpenGL3DriverBase::getVertexShaderConstantID(const c8 *name) { diff --git a/irr/src/OpenGL/Driver.h b/irr/src/OpenGL/Driver.h index c64d2a16c7..051e0b9c48 100644 --- a/irr/src/OpenGL/Driver.h +++ b/irr/src/OpenGL/Driver.h @@ -144,9 +144,6 @@ public: //! Returns type of video driver E_DRIVER_TYPE getDriverType() const override; - //! get color format of the current color buffer - ECOLOR_FORMAT getColorFormat() const override; - //! Returns the transformation set by setTransform const core::matrix4 &getTransform(E_TRANSFORMATION_STATE state) const override; @@ -351,9 +348,6 @@ private: SMaterial Material, LastMaterial; - //! Color buffer format - ECOLOR_FORMAT ColorFormat; - IContextManager *ContextManager; void printTextureFormats();