From ac648de8023b2ef7b0a1d572c8479caff2de0e8d Mon Sep 17 00:00:00 2001 From: numzero Date: Wed, 4 Oct 2023 21:27:02 +0300 Subject: [PATCH] Strip non-leading tabs The per-file command is: perl -p -i -e 's:(([^\t ])| )\t+\s*:$2 :g' --- examples/AutomatedTest/test_array.cpp | 8 +- include/ECullingTypes.h | 6 +- include/IAnimatedMesh.h | 2 +- include/IBillboardSceneNode.h | 2 +- include/IContextManager.h | 2 +- include/ICursorControl.h | 20 +- include/IEventReceiver.h | 6 +- include/IFileArchive.h | 2 +- include/IGUIButton.h | 6 +- include/IGUIElement.h | 2 +- include/IGUIEnvironment.h | 2 +- include/IImage.h | 16 +- include/IMaterialRenderer.h | 2 +- include/IMesh.h | 2 +- include/ISceneManager.h | 4 +- include/ITexture.h | 6 +- include/IVideoDriver.h | 4 +- include/IrrlichtDevice.h | 2 +- include/Keycodes.h | 328 +++++----- include/SMaterial.h | 42 +- include/SMaterialLayer.h | 2 +- include/irrArray.h | 2 +- include/irrString.h | 2 +- include/irrTypes.h | 8 +- include/irrlicht.h | 64 +- include/irrpack.h | 2 +- include/matrix4.h | 16 +- source/Irrlicht/Android/CIrrDeviceAndroid.cpp | 408 ++++++------ source/Irrlicht/CAnimatedMeshSceneNode.cpp | 10 +- source/Irrlicht/CAnimatedMeshSceneNode.h | 4 +- source/Irrlicht/CB3DMeshFileLoader.cpp | 8 +- source/Irrlicht/CB3DMeshWriter.cpp | 8 +- source/Irrlicht/CCameraSceneNode.cpp | 2 +- source/Irrlicht/CCameraSceneNode.h | 6 +- source/Irrlicht/CEGLManager.cpp | 10 +- source/Irrlicht/CFileSystem.cpp | 2 +- source/Irrlicht/CGLXManager.cpp | 10 +- source/Irrlicht/CGLXManager.h | 2 +- source/Irrlicht/CGUIEditBox.cpp | 4 +- source/Irrlicht/CGUIFont.cpp | 12 +- source/Irrlicht/CGUISkin.cpp | 32 +- source/Irrlicht/CGUISkin.h | 12 +- source/Irrlicht/CGUITabControl.cpp | 4 +- source/Irrlicht/CImageLoaderBMP.h | 12 +- source/Irrlicht/CImageLoaderJPG.cpp | 6 +- source/Irrlicht/CImageLoaderJPG.h | 2 +- source/Irrlicht/CImageLoaderTGA.cpp | 4 +- source/Irrlicht/CImageWriterJPG.cpp | 2 +- source/Irrlicht/CIrrDeviceLinux.cpp | 66 +- source/Irrlicht/CIrrDeviceOSX.mm | 30 +- source/Irrlicht/CIrrDeviceSDL.cpp | 22 +- source/Irrlicht/CIrrDeviceWin32.cpp | 4 +- source/Irrlicht/CIrrDeviceWin32.h | 2 +- source/Irrlicht/CLogger.h | 2 +- source/Irrlicht/CMeshCache.h | 6 +- source/Irrlicht/CNullDriver.cpp | 16 +- source/Irrlicht/COGLES2Driver.cpp | 14 +- source/Irrlicht/COGLES2Driver.h | 8 +- source/Irrlicht/COGLESCoreExtensionHandler.h | 616 +++++++++--------- source/Irrlicht/COGLESDriver.cpp | 22 +- source/Irrlicht/COGLESDriver.h | 8 +- source/Irrlicht/COGLESMaterialRenderer.h | 6 +- source/Irrlicht/COpenGLCoreCacheHandler.h | 2 +- source/Irrlicht/COpenGLDriver.cpp | 40 +- source/Irrlicht/COpenGLDriver.h | 12 +- source/Irrlicht/COpenGLExtensionHandler.cpp | 4 +- source/Irrlicht/COpenGLMaterialRenderer.h | 6 +- .../COpenGLShaderMaterialRenderer.cpp | 4 +- source/Irrlicht/CSkinnedMesh.cpp | 12 +- source/Irrlicht/CWGLManager.cpp | 40 +- source/Irrlicht/CWebGL1Driver.cpp | 2 +- source/Irrlicht/CWebGLExtensionHandler.h | 64 +- source/Irrlicht/CXMeshFileLoader.cpp | 8 +- source/Irrlicht/CZipReader.cpp | 2 +- source/Irrlicht/CZipReader.h | 12 +- source/Irrlicht/Irrlicht.cpp | 2 +- source/Irrlicht/OpenGL/Driver.cpp | 14 +- source/Irrlicht/OpenGL/Driver.h | 8 +- source/Irrlicht/OpenGL3/Driver.cpp | 4 +- source/Irrlicht/S2DVertex.h | 4 +- 80 files changed, 1091 insertions(+), 1091 deletions(-) diff --git a/examples/AutomatedTest/test_array.cpp b/examples/AutomatedTest/test_array.cpp index 7b2d8228c..96a4ac8c8 100644 --- a/examples/AutomatedTest/test_array.cpp +++ b/examples/AutomatedTest/test_array.cpp @@ -7,11 +7,11 @@ using core::array; static void test_basics() { array v; - v.push_back(1); // 1 + v.push_back(1); // 1 v.push_front(2); // 2, 1 - v.insert(4, 0); // 4, 2, 1 - v.insert(3, 1); // 4, 3, 2, 1 - v.insert(0, 4); // 4, 3, 2, 1, 0 + v.insert(4, 0); // 4, 2, 1 + v.insert(3, 1); // 4, 3, 2, 1 + v.insert(0, 4); // 4, 3, 2, 1, 0 UASSERTEQ(v.size(), 5); UASSERTEQ(v[0], 4); UASSERTEQ(v[1], 3); diff --git a/include/ECullingTypes.h b/include/ECullingTypes.h index 8fde3b0d4..585642de0 100644 --- a/include/ECullingTypes.h +++ b/include/ECullingTypes.h @@ -26,10 +26,10 @@ enum E_CULLING_TYPE const c8 *const AutomaticCullingNames[] = { "false", - "box", // camera box against node box - "frustum_box", // camera frustum against node box + "box", // camera box against node box + "frustum_box", // camera frustum against node box "frustum_sphere", // camera frustum against node sphere - "occ_query", // occlusion query + "occ_query", // occlusion query 0}; } // end namespace scene diff --git a/include/IAnimatedMesh.h b/include/IAnimatedMesh.h index b1d6fa0dc..b1c87e301 100644 --- a/include/IAnimatedMesh.h +++ b/include/IAnimatedMesh.h @@ -23,7 +23,7 @@ class IAnimatedMesh : public IMesh //! Gets the frame count of the animated mesh. /** Note that the play-time is usually getFrameCount()-1 as it stops as soon as the last frame-key is reached. \return The amount of frames. If the amount is 1, - it is a static, non animated mesh. */ + it is a static, non animated mesh. */ virtual u32 getFrameCount() const = 0; //! Gets the animation speed of the animated mesh. diff --git a/include/IBillboardSceneNode.h b/include/IBillboardSceneNode.h index 4e2a1f6f2..c9655b497 100644 --- a/include/IBillboardSceneNode.h +++ b/include/IBillboardSceneNode.h @@ -83,7 +83,7 @@ class IBillboardSceneNode : public ISceneNode /** NOTE: Positions and normals of this meshbuffers are re-calculated before rendering. So this is mainly useful to access/modify the uv-coordinates. \param nr: Zero based index of the mesh buffer. - \return Pointer to the mesh buffer or 0 if there is no such mesh buffer. */ + \return Pointer to the mesh buffer or 0 if there is no such mesh buffer. */ virtual IMeshBuffer *getMeshBuffer(u32 nr) const = 0; }; diff --git a/include/IContextManager.h b/include/IContextManager.h index 85177dc43..65c04c50c 100644 --- a/include/IContextManager.h +++ b/include/IContextManager.h @@ -45,7 +45,7 @@ class IContextManager : public virtual IReferenceCounted call this function as follows: Old thread gives up context with: activateContext(irr::video::SExposedVideoData()); New thread takes over context with: activateContext(videoDriver->getExposedVideoData()); - Note that only 1 thread at a time may access an OpenGL context. */ + Note that only 1 thread at a time may access an OpenGL context. */ virtual bool activateContext(const SExposedVideoData &videoData, bool restorePrimaryOnZero = false) = 0; //! Get the address of any OpenGL procedure (including core procedures). diff --git a/include/ICursorControl.h b/include/ICursorControl.h index ef963f0d8..3d8fbefa3 100644 --- a/include/ICursorControl.h +++ b/include/ICursorControl.h @@ -20,19 +20,19 @@ class IGUISpriteBank; enum ECURSOR_ICON { // Following cursors might be system specific, or might use an Irrlicht icon-set. No guarantees so far. - ECI_NORMAL, // arrow - ECI_CROSS, // Crosshair - ECI_HAND, // Hand - ECI_HELP, // Arrow and question mark - ECI_IBEAM, // typical text-selection cursor - ECI_NO, // should not click icon - ECI_WAIT, // hourglass + ECI_NORMAL, // arrow + ECI_CROSS, // Crosshair + ECI_HAND, // Hand + ECI_HELP, // Arrow and question mark + ECI_IBEAM, // typical text-selection cursor + ECI_NO, // should not click icon + ECI_WAIT, // hourglass ECI_SIZEALL, // arrow in all directions ECI_SIZENESW, // resizes in direction north-east or south-west ECI_SIZENWSE, // resizes in direction north-west or south-east - ECI_SIZENS, // resizes in direction north or south - ECI_SIZEWE, // resizes in direction west or east - ECI_UP, // up-arrow + ECI_SIZENS, // resizes in direction north or south + ECI_SIZEWE, // resizes in direction west or east + ECI_UP, // up-arrow // Implementer note: Should we add system specific cursors, which use guaranteed the system icons, // then I would recommend using a naming scheme like ECI_W32_CROSS, ECI_X11_CROSSHAIR and adding those diff --git a/include/IEventReceiver.h b/include/IEventReceiver.h index 8fd6fc25a..29b6ae5d5 100644 --- a/include/IEventReceiver.h +++ b/include/IEventReceiver.h @@ -465,9 +465,9 @@ struct SEvent NUMBER_OF_BUTTONS = 32, AXIS_X = 0, // e.g. analog stick 1 left to right - AXIS_Y, // e.g. analog stick 1 top to bottom - AXIS_Z, // e.g. throttle, or analog 2 stick 2 left to right - AXIS_R, // e.g. rudder, or analog 2 stick 2 top to bottom + AXIS_Y, // e.g. analog stick 1 top to bottom + AXIS_Z, // e.g. throttle, or analog 2 stick 2 left to right + AXIS_R, // e.g. rudder, or analog 2 stick 2 top to bottom AXIS_U, AXIS_V, NUMBER_OF_AXES = 18 // (please tell Irrlicht maintainers if you absolutely need more axes) diff --git a/include/IFileArchive.h b/include/IFileArchive.h index 4e13b035f..ac73ff12c 100644 --- a/include/IFileArchive.h +++ b/include/IFileArchive.h @@ -18,7 +18,7 @@ namespace io enum EFileSystemType { FILESYSTEM_NATIVE = 0, // Native OS FileSystem - FILESYSTEM_VIRTUAL // Virtual FileSystem + FILESYSTEM_VIRTUAL // Virtual FileSystem }; //! Contains the different types of archives diff --git a/include/IGUIButton.h b/include/IGUIButton.h index 0e84d5d70..f1b610eda 100644 --- a/include/IGUIButton.h +++ b/include/IGUIButton.h @@ -201,7 +201,7 @@ class IGUIButton : public IGUIElement \param index: The sprite number from the current sprite bank \param color: The color of the sprite \param loop: True if the animation should loop, false if not - \param scale: True if the sprite should scale to button size, false if not */ + \param scale: True if the sprite should scale to button size, false if not */ virtual void setSprite(EGUI_BUTTON_STATE state, s32 index, video::SColor color = video::SColor(255, 255, 255, 255), bool loop = false, bool scale = false) = 0; @@ -250,11 +250,11 @@ class IGUIButton : public IGUIElement virtual bool isScalingImage() const = 0; //! Get if the shift key was pressed in last EGET_BUTTON_CLICKED event - /** Generated together with event, so info is available in the event-receiver. */ + /** Generated together with event, so info is available in the event-receiver. */ virtual bool getClickShiftState() const = 0; //! Get if the control key was pressed in last EGET_BUTTON_CLICKED event - /** Generated together with event, so info is available in the event-receiver. */ + /** Generated together with event, so info is available in the event-receiver. */ virtual bool getClickControlState() const = 0; }; diff --git a/include/IGUIElement.h b/include/IGUIElement.h index f6ccc989e..aff2412d2 100644 --- a/include/IGUIElement.h +++ b/include/IGUIElement.h @@ -707,7 +707,7 @@ class IGUIElement : virtual public IReferenceCounted, public IEventReceiver void addChildToEnd(IGUIElement *child) { if (child) { - child->grab(); // prevent destruction when removed + child->grab(); // prevent destruction when removed child->remove(); // remove from old parent child->LastParentRect = getAbsolutePosition(); child->Parent = this; diff --git a/include/IGUIEnvironment.h b/include/IGUIEnvironment.h index 772fc7a5a..755b3f900 100644 --- a/include/IGUIEnvironment.h +++ b/include/IGUIEnvironment.h @@ -403,7 +403,7 @@ class IGUIEnvironment : public virtual IReferenceCounted /** Queued elements will be removed at the end of each drawAll call. Or latest in the destructor of the GUIEnvironment. This can be used to allow an element removing itself safely in a function - iterating over gui elements, like an overloaded IGUIElement::draw or + iterating over gui elements, like an overloaded IGUIElement::draw or IGUIElement::OnPostRender function. Note that in general just calling IGUIElement::remove() is enough. Unless you create your own GUI elements removing themselves you won't need it. diff --git a/include/IImage.h b/include/IImage.h index c65eeb252..01675467b 100644 --- a/include/IImage.h +++ b/include/IImage.h @@ -188,7 +188,7 @@ class IImage : public virtual IReferenceCounted } //! Calculate mipmap size for a certain level - /** level 0 will be full image size. Every further level is half the size. */ + /** level 0 will be full image size. Every further level is half the size. */ static core::dimension2du getMipMapsSize(const core::dimension2du &sizeLevel0, u32 mipmapLevel) { core::dimension2du result(sizeLevel0); @@ -294,29 +294,29 @@ class IImage : public virtual IReferenceCounted virtual void setPixel(u32 x, u32 y, const SColor &color, bool blend = false) = 0; //! Copies this surface into another, if it has the exact same size and format. - /** NOTE: mipmaps are ignored + /** NOTE: mipmaps are ignored \return True if it was copied, false otherwise. */ virtual bool copyToNoScaling(void *target, u32 width, u32 height, ECOLOR_FORMAT format = ECF_A8R8G8B8, u32 pitch = 0) const = 0; //! Copies the image into the target, scaling the image to fit - /** NOTE: mipmaps are ignored */ + /** NOTE: mipmaps are ignored */ virtual void copyToScaling(void *target, u32 width, u32 height, ECOLOR_FORMAT format = ECF_A8R8G8B8, u32 pitch = 0) = 0; //! Copies the image into the target, scaling the image to fit - /** NOTE: mipmaps are ignored */ + /** NOTE: mipmaps are ignored */ virtual void copyToScaling(IImage *target) = 0; //! copies this surface into another - /** NOTE: mipmaps are ignored */ + /** NOTE: mipmaps are ignored */ virtual void copyTo(IImage *target, const core::position2d &pos = core::position2d(0, 0)) = 0; //! copies this surface into another - /** NOTE: mipmaps are ignored */ + /** NOTE: mipmaps are ignored */ virtual void copyTo(IImage *target, const core::position2d &pos, const core::rect &sourceRect, const core::rect *clipRect = 0) = 0; //! copies this surface into another, using the alpha mask and cliprect and a color to add with - /** NOTE: mipmaps are ignored + /** NOTE: mipmaps are ignored \param combineAlpha - When true then combine alpha channels. When false replace target image alpha with source image alpha. */ virtual void copyToWithAlpha(IImage *target, const core::position2d &pos, @@ -325,7 +325,7 @@ class IImage : public virtual IReferenceCounted bool combineAlpha = false) = 0; //! copies this surface into another, scaling it to fit, applying a box filter - /** NOTE: mipmaps are ignored */ + /** NOTE: mipmaps are ignored */ virtual void copyToScalingBoxFilter(IImage *target, s32 bias = 0, bool blend = false) = 0; //! fills the surface with given color diff --git a/include/IMaterialRenderer.h b/include/IMaterialRenderer.h index d764fea60..49b6c3cfd 100644 --- a/include/IMaterialRenderer.h +++ b/include/IMaterialRenderer.h @@ -94,7 +94,7 @@ class IMaterialRenderer : public virtual IReferenceCounted //! Access the callback provided by the users when creating shader materials /** \returns Returns either the users provided callback or 0 when no such - callback exists. Non-shader materials will always return 0. */ + callback exists. Non-shader materials will always return 0. */ virtual IShaderConstantSetCallBack *getShaderConstantSetCallBack() const { return 0; } }; diff --git a/include/IMesh.h b/include/IMesh.h index 87873c6b6..846cd1f0c 100644 --- a/include/IMesh.h +++ b/include/IMesh.h @@ -15,7 +15,7 @@ namespace scene { //! Possible types of meshes. // Note: Was previously only used in IAnimatedMesh so it still has the "animated" in the name. -// But can now be used for all mesh-types as we need those casts as well. +// But can now be used for all mesh-types as we need those casts as well. enum E_ANIMATED_MESH_TYPE { //! Unknown animated mesh type. diff --git a/include/ISceneManager.h b/include/ISceneManager.h index a5b21d618..facb7143d 100644 --- a/include/ISceneManager.h +++ b/include/ISceneManager.h @@ -313,7 +313,7 @@ class ISceneManager : public virtual IReferenceCounted * To load and display a mesh quickly, just do this: * \code * SceneManager->addAnimatedMeshSceneNode( - * SceneManager->getMesh("yourmesh.3ds")); + * SceneManager->getMesh("yourmesh.3ds")); * \endcode * If you would like to implement and add your own file format loader to Irrlicht, * see addExternalMeshLoader(). @@ -569,7 +569,7 @@ class ISceneManager : public virtual IReferenceCounted //! Get interface to the parameters set in this scene. /** String parameters can be used by plugins and mesh loaders. - See COLLADA_CREATE_SCENE_INSTANCES and DMF_USE_MATERIALS_DIRS */ + See COLLADA_CREATE_SCENE_INSTANCES and DMF_USE_MATERIALS_DIRS */ virtual io::IAttributes *getParameters() = 0; //! Get current render pass. diff --git a/include/ITexture.h b/include/ITexture.h index fba8fbfb4..852ceb61f 100644 --- a/include/ITexture.h +++ b/include/ITexture.h @@ -67,7 +67,7 @@ enum E_TEXTURE_CREATION_FLAG /** Discard any alpha layer and use non-alpha color format. Warning: This may lead to getting 24-bit texture formats which are often badly supported by drivers. So it's generally - not recommended to enable this flag. */ + not recommended to enable this flag. */ ETCF_NO_ALPHA_CHANNEL = 0x00000020, //! Allow the Driver to use Non-Power-2-Textures @@ -211,7 +211,7 @@ class ITexture : public virtual IReferenceCounted //! Unlock function. Must be called after a lock() to the texture. /** One should avoid to call unlock more than once before another lock. The last locked mip level will be unlocked. - You may want to call regenerateMipMapLevels() after this when you changed any data. */ + You may want to call regenerateMipMapLevels() after this when you changed any data. */ virtual void unlock() = 0; //! Regenerates the mip map levels of the texture. @@ -253,7 +253,7 @@ class ITexture : public virtual IReferenceCounted //! Get the original color format /** When create textures from image data we will often use different color formats. For example depending on driver TextureCreationFlag's. - This can give you the original format which the image used to create the texture had */ + This can give you the original format which the image used to create the texture had */ ECOLOR_FORMAT getOriginalColorFormat() const { return OriginalColorFormat; }; //! Get pitch of the main texture (in bytes). diff --git a/include/IVideoDriver.h b/include/IVideoDriver.h index 3a6574c63..e8cef5ac1 100644 --- a/include/IVideoDriver.h +++ b/include/IVideoDriver.h @@ -311,7 +311,7 @@ class IVideoDriver : public virtual IReferenceCounted \param format Desired color format of the texture. Please note that the driver may choose to create the texture in another color format. - \return Pointer to the newly created texture. */ + \return Pointer to the newly created texture. */ virtual ITexture *addTextureCubemap(const irr::u32 sideLen, const io::path &name, ECOLOR_FORMAT format = ECF_A8R8G8B8) = 0; //! Adds a new render target texture to the texture cache. @@ -1197,7 +1197,7 @@ class IVideoDriver : public virtual IReferenceCounted void *dP, ECOLOR_FORMAT dF) const = 0; //! Check if the driver supports creating textures with the given color format - /** \return True if the format is available, false if not. */ + /** \return True if the format is available, false if not. */ virtual bool queryTextureFormat(ECOLOR_FORMAT format) const = 0; //! Used by some SceneNodes to check if a material should be rendered in the transparent render pass diff --git a/include/IrrlichtDevice.h b/include/IrrlichtDevice.h index d1d44e8d0..954752b7b 100644 --- a/include/IrrlichtDevice.h +++ b/include/IrrlichtDevice.h @@ -226,7 +226,7 @@ class IrrlichtDevice : public virtual IReferenceCounted virtual void setResizable(bool resize = false) = 0; //! Resize the render window. - /** This will only work in windowed mode and is not yet supported on all systems. + /** This will only work in windowed mode and is not yet supported on all systems. It does set the drawing/clientDC size of the window, the window decorations are added to that. You get the current window size with IVideoDriver::getScreenSize() (might be unified in future) */ diff --git a/include/Keycodes.h b/include/Keycodes.h index cdda9d0c6..72702e078 100644 --- a/include/Keycodes.h +++ b/include/Keycodes.h @@ -10,174 +10,174 @@ namespace irr enum EKEY_CODE { KEY_UNKNOWN = 0x0, - KEY_LBUTTON = 0x01, // Left mouse button - KEY_RBUTTON = 0x02, // Right mouse button - KEY_CANCEL = 0x03, // Control-break processing - KEY_MBUTTON = 0x04, // Middle mouse button (three-button mouse) - KEY_XBUTTON1 = 0x05, // Windows 2000/XP: X1 mouse button - KEY_XBUTTON2 = 0x06, // Windows 2000/XP: X2 mouse button - KEY_BACK = 0x08, // BACKSPACE key - KEY_TAB = 0x09, // TAB key - KEY_CLEAR = 0x0C, // CLEAR key - KEY_RETURN = 0x0D, // ENTER key - KEY_SHIFT = 0x10, // SHIFT key - KEY_CONTROL = 0x11, // CTRL key - KEY_MENU = 0x12, // ALT key - KEY_PAUSE = 0x13, // PAUSE key - KEY_CAPITAL = 0x14, // CAPS LOCK key - KEY_KANA = 0x15, // IME Kana mode - KEY_HANGUEL = 0x15, // IME Hanguel mode (maintained for compatibility use KEY_HANGUL) - KEY_HANGUL = 0x15, // IME Hangul mode - KEY_JUNJA = 0x17, // IME Junja mode - KEY_FINAL = 0x18, // IME final mode - KEY_HANJA = 0x19, // IME Hanja mode - KEY_KANJI = 0x19, // IME Kanji mode - KEY_ESCAPE = 0x1B, // ESC key - KEY_CONVERT = 0x1C, // IME convert - KEY_NONCONVERT = 0x1D, // IME nonconvert - KEY_ACCEPT = 0x1E, // IME accept - KEY_MODECHANGE = 0x1F, // IME mode change request - KEY_SPACE = 0x20, // SPACEBAR - KEY_PRIOR = 0x21, // PAGE UP key - KEY_NEXT = 0x22, // PAGE DOWN key - KEY_END = 0x23, // END key - KEY_HOME = 0x24, // HOME key - KEY_LEFT = 0x25, // LEFT ARROW key - KEY_UP = 0x26, // UP ARROW key - KEY_RIGHT = 0x27, // RIGHT ARROW key - KEY_DOWN = 0x28, // DOWN ARROW key - KEY_SELECT = 0x29, // SELECT key - KEY_PRINT = 0x2A, // PRINT key - KEY_EXECUT = 0x2B, // EXECUTE key - KEY_SNAPSHOT = 0x2C, // PRINT SCREEN key - KEY_INSERT = 0x2D, // INS key - KEY_DELETE = 0x2E, // DEL key - KEY_HELP = 0x2F, // HELP key - KEY_KEY_0 = 0x30, // 0 key - KEY_KEY_1 = 0x31, // 1 key - KEY_KEY_2 = 0x32, // 2 key - KEY_KEY_3 = 0x33, // 3 key - KEY_KEY_4 = 0x34, // 4 key - KEY_KEY_5 = 0x35, // 5 key - KEY_KEY_6 = 0x36, // 6 key - KEY_KEY_7 = 0x37, // 7 key - KEY_KEY_8 = 0x38, // 8 key - KEY_KEY_9 = 0x39, // 9 key - KEY_KEY_A = 0x41, // A key - KEY_KEY_B = 0x42, // B key - KEY_KEY_C = 0x43, // C key - KEY_KEY_D = 0x44, // D key - KEY_KEY_E = 0x45, // E key - KEY_KEY_F = 0x46, // F key - KEY_KEY_G = 0x47, // G key - KEY_KEY_H = 0x48, // H key - KEY_KEY_I = 0x49, // I key - KEY_KEY_J = 0x4A, // J key - KEY_KEY_K = 0x4B, // K key - KEY_KEY_L = 0x4C, // L key - KEY_KEY_M = 0x4D, // M key - KEY_KEY_N = 0x4E, // N key - KEY_KEY_O = 0x4F, // O key - KEY_KEY_P = 0x50, // P key - KEY_KEY_Q = 0x51, // Q key - KEY_KEY_R = 0x52, // R key - KEY_KEY_S = 0x53, // S key - KEY_KEY_T = 0x54, // T key - KEY_KEY_U = 0x55, // U key - KEY_KEY_V = 0x56, // V key - KEY_KEY_W = 0x57, // W key - KEY_KEY_X = 0x58, // X key - KEY_KEY_Y = 0x59, // Y key - KEY_KEY_Z = 0x5A, // Z key - KEY_LWIN = 0x5B, // Left Windows key (Microsoft Natural keyboard) - KEY_RWIN = 0x5C, // Right Windows key (Natural keyboard) - KEY_APPS = 0x5D, // Applications key (Natural keyboard) - KEY_SLEEP = 0x5F, // Computer Sleep key - KEY_NUMPAD0 = 0x60, // Numeric keypad 0 key - KEY_NUMPAD1 = 0x61, // Numeric keypad 1 key - KEY_NUMPAD2 = 0x62, // Numeric keypad 2 key - KEY_NUMPAD3 = 0x63, // Numeric keypad 3 key - KEY_NUMPAD4 = 0x64, // Numeric keypad 4 key - KEY_NUMPAD5 = 0x65, // Numeric keypad 5 key - KEY_NUMPAD6 = 0x66, // Numeric keypad 6 key - KEY_NUMPAD7 = 0x67, // Numeric keypad 7 key - KEY_NUMPAD8 = 0x68, // Numeric keypad 8 key - KEY_NUMPAD9 = 0x69, // Numeric keypad 9 key - KEY_MULTIPLY = 0x6A, // Multiply key - KEY_ADD = 0x6B, // Add key - KEY_SEPARATOR = 0x6C, // Separator key - KEY_SUBTRACT = 0x6D, // Subtract key - KEY_DECIMAL = 0x6E, // Decimal key - KEY_DIVIDE = 0x6F, // Divide key - KEY_F1 = 0x70, // F1 key - KEY_F2 = 0x71, // F2 key - KEY_F3 = 0x72, // F3 key - KEY_F4 = 0x73, // F4 key - KEY_F5 = 0x74, // F5 key - KEY_F6 = 0x75, // F6 key - KEY_F7 = 0x76, // F7 key - KEY_F8 = 0x77, // F8 key - KEY_F9 = 0x78, // F9 key - KEY_F10 = 0x79, // F10 key - KEY_F11 = 0x7A, // F11 key - KEY_F12 = 0x7B, // F12 key - KEY_F13 = 0x7C, // F13 key - KEY_F14 = 0x7D, // F14 key - KEY_F15 = 0x7E, // F15 key - KEY_F16 = 0x7F, // F16 key - KEY_F17 = 0x80, // F17 key - KEY_F18 = 0x81, // F18 key - KEY_F19 = 0x82, // F19 key - KEY_F20 = 0x83, // F20 key - KEY_F21 = 0x84, // F21 key - KEY_F22 = 0x85, // F22 key - KEY_F23 = 0x86, // F23 key - KEY_F24 = 0x87, // F24 key - KEY_NUMLOCK = 0x90, // NUM LOCK key - KEY_SCROLL = 0x91, // SCROLL LOCK key - KEY_LSHIFT = 0xA0, // Left SHIFT key - KEY_RSHIFT = 0xA1, // Right SHIFT key - KEY_LCONTROL = 0xA2, // Left CONTROL key - KEY_RCONTROL = 0xA3, // Right CONTROL key - KEY_LMENU = 0xA4, // Left MENU key - KEY_RMENU = 0xA5, // Right MENU key - KEY_BROWSER_BACK = 0xA6, // Browser Back key - KEY_BROWSER_FORWARD = 0xA7, // Browser Forward key - KEY_BROWSER_REFRESH = 0xA8, // Browser Refresh key - KEY_BROWSER_STOP = 0xA9, // Browser Stop key - KEY_BROWSER_SEARCH = 0xAA, // Browser Search key + KEY_LBUTTON = 0x01, // Left mouse button + KEY_RBUTTON = 0x02, // Right mouse button + KEY_CANCEL = 0x03, // Control-break processing + KEY_MBUTTON = 0x04, // Middle mouse button (three-button mouse) + KEY_XBUTTON1 = 0x05, // Windows 2000/XP: X1 mouse button + KEY_XBUTTON2 = 0x06, // Windows 2000/XP: X2 mouse button + KEY_BACK = 0x08, // BACKSPACE key + KEY_TAB = 0x09, // TAB key + KEY_CLEAR = 0x0C, // CLEAR key + KEY_RETURN = 0x0D, // ENTER key + KEY_SHIFT = 0x10, // SHIFT key + KEY_CONTROL = 0x11, // CTRL key + KEY_MENU = 0x12, // ALT key + KEY_PAUSE = 0x13, // PAUSE key + KEY_CAPITAL = 0x14, // CAPS LOCK key + KEY_KANA = 0x15, // IME Kana mode + KEY_HANGUEL = 0x15, // IME Hanguel mode (maintained for compatibility use KEY_HANGUL) + KEY_HANGUL = 0x15, // IME Hangul mode + KEY_JUNJA = 0x17, // IME Junja mode + KEY_FINAL = 0x18, // IME final mode + KEY_HANJA = 0x19, // IME Hanja mode + KEY_KANJI = 0x19, // IME Kanji mode + KEY_ESCAPE = 0x1B, // ESC key + KEY_CONVERT = 0x1C, // IME convert + KEY_NONCONVERT = 0x1D, // IME nonconvert + KEY_ACCEPT = 0x1E, // IME accept + KEY_MODECHANGE = 0x1F, // IME mode change request + KEY_SPACE = 0x20, // SPACEBAR + KEY_PRIOR = 0x21, // PAGE UP key + KEY_NEXT = 0x22, // PAGE DOWN key + KEY_END = 0x23, // END key + KEY_HOME = 0x24, // HOME key + KEY_LEFT = 0x25, // LEFT ARROW key + KEY_UP = 0x26, // UP ARROW key + KEY_RIGHT = 0x27, // RIGHT ARROW key + KEY_DOWN = 0x28, // DOWN ARROW key + KEY_SELECT = 0x29, // SELECT key + KEY_PRINT = 0x2A, // PRINT key + KEY_EXECUT = 0x2B, // EXECUTE key + KEY_SNAPSHOT = 0x2C, // PRINT SCREEN key + KEY_INSERT = 0x2D, // INS key + KEY_DELETE = 0x2E, // DEL key + KEY_HELP = 0x2F, // HELP key + KEY_KEY_0 = 0x30, // 0 key + KEY_KEY_1 = 0x31, // 1 key + KEY_KEY_2 = 0x32, // 2 key + KEY_KEY_3 = 0x33, // 3 key + KEY_KEY_4 = 0x34, // 4 key + KEY_KEY_5 = 0x35, // 5 key + KEY_KEY_6 = 0x36, // 6 key + KEY_KEY_7 = 0x37, // 7 key + KEY_KEY_8 = 0x38, // 8 key + KEY_KEY_9 = 0x39, // 9 key + KEY_KEY_A = 0x41, // A key + KEY_KEY_B = 0x42, // B key + KEY_KEY_C = 0x43, // C key + KEY_KEY_D = 0x44, // D key + KEY_KEY_E = 0x45, // E key + KEY_KEY_F = 0x46, // F key + KEY_KEY_G = 0x47, // G key + KEY_KEY_H = 0x48, // H key + KEY_KEY_I = 0x49, // I key + KEY_KEY_J = 0x4A, // J key + KEY_KEY_K = 0x4B, // K key + KEY_KEY_L = 0x4C, // L key + KEY_KEY_M = 0x4D, // M key + KEY_KEY_N = 0x4E, // N key + KEY_KEY_O = 0x4F, // O key + KEY_KEY_P = 0x50, // P key + KEY_KEY_Q = 0x51, // Q key + KEY_KEY_R = 0x52, // R key + KEY_KEY_S = 0x53, // S key + KEY_KEY_T = 0x54, // T key + KEY_KEY_U = 0x55, // U key + KEY_KEY_V = 0x56, // V key + KEY_KEY_W = 0x57, // W key + KEY_KEY_X = 0x58, // X key + KEY_KEY_Y = 0x59, // Y key + KEY_KEY_Z = 0x5A, // Z key + KEY_LWIN = 0x5B, // Left Windows key (Microsoft Natural keyboard) + KEY_RWIN = 0x5C, // Right Windows key (Natural keyboard) + KEY_APPS = 0x5D, // Applications key (Natural keyboard) + KEY_SLEEP = 0x5F, // Computer Sleep key + KEY_NUMPAD0 = 0x60, // Numeric keypad 0 key + KEY_NUMPAD1 = 0x61, // Numeric keypad 1 key + KEY_NUMPAD2 = 0x62, // Numeric keypad 2 key + KEY_NUMPAD3 = 0x63, // Numeric keypad 3 key + KEY_NUMPAD4 = 0x64, // Numeric keypad 4 key + KEY_NUMPAD5 = 0x65, // Numeric keypad 5 key + KEY_NUMPAD6 = 0x66, // Numeric keypad 6 key + KEY_NUMPAD7 = 0x67, // Numeric keypad 7 key + KEY_NUMPAD8 = 0x68, // Numeric keypad 8 key + KEY_NUMPAD9 = 0x69, // Numeric keypad 9 key + KEY_MULTIPLY = 0x6A, // Multiply key + KEY_ADD = 0x6B, // Add key + KEY_SEPARATOR = 0x6C, // Separator key + KEY_SUBTRACT = 0x6D, // Subtract key + KEY_DECIMAL = 0x6E, // Decimal key + KEY_DIVIDE = 0x6F, // Divide key + KEY_F1 = 0x70, // F1 key + KEY_F2 = 0x71, // F2 key + KEY_F3 = 0x72, // F3 key + KEY_F4 = 0x73, // F4 key + KEY_F5 = 0x74, // F5 key + KEY_F6 = 0x75, // F6 key + KEY_F7 = 0x76, // F7 key + KEY_F8 = 0x77, // F8 key + KEY_F9 = 0x78, // F9 key + KEY_F10 = 0x79, // F10 key + KEY_F11 = 0x7A, // F11 key + KEY_F12 = 0x7B, // F12 key + KEY_F13 = 0x7C, // F13 key + KEY_F14 = 0x7D, // F14 key + KEY_F15 = 0x7E, // F15 key + KEY_F16 = 0x7F, // F16 key + KEY_F17 = 0x80, // F17 key + KEY_F18 = 0x81, // F18 key + KEY_F19 = 0x82, // F19 key + KEY_F20 = 0x83, // F20 key + KEY_F21 = 0x84, // F21 key + KEY_F22 = 0x85, // F22 key + KEY_F23 = 0x86, // F23 key + KEY_F24 = 0x87, // F24 key + KEY_NUMLOCK = 0x90, // NUM LOCK key + KEY_SCROLL = 0x91, // SCROLL LOCK key + KEY_LSHIFT = 0xA0, // Left SHIFT key + KEY_RSHIFT = 0xA1, // Right SHIFT key + KEY_LCONTROL = 0xA2, // Left CONTROL key + KEY_RCONTROL = 0xA3, // Right CONTROL key + KEY_LMENU = 0xA4, // Left MENU key + KEY_RMENU = 0xA5, // Right MENU key + KEY_BROWSER_BACK = 0xA6, // Browser Back key + KEY_BROWSER_FORWARD = 0xA7, // Browser Forward key + KEY_BROWSER_REFRESH = 0xA8, // Browser Refresh key + KEY_BROWSER_STOP = 0xA9, // Browser Stop key + KEY_BROWSER_SEARCH = 0xAA, // Browser Search key KEY_BROWSER_FAVORITES = 0xAB, // Browser Favorites key - KEY_BROWSER_HOME = 0xAC, // Browser Start and Home key - KEY_VOLUME_MUTE = 0xAD, // Volume Mute key - KEY_VOLUME_DOWN = 0xAE, // Volume Down key - KEY_VOLUME_UP = 0xAF, // Volume Up key + KEY_BROWSER_HOME = 0xAC, // Browser Start and Home key + KEY_VOLUME_MUTE = 0xAD, // Volume Mute key + KEY_VOLUME_DOWN = 0xAE, // Volume Down key + KEY_VOLUME_UP = 0xAF, // Volume Up key KEY_MEDIA_NEXT_TRACK = 0xB0, // Next Track key KEY_MEDIA_PREV_TRACK = 0xB1, // Previous Track key - KEY_MEDIA_STOP = 0xB2, // Stop Media key + KEY_MEDIA_STOP = 0xB2, // Stop Media key KEY_MEDIA_PLAY_PAUSE = 0xB3, // Play/Pause Media key - KEY_OEM_1 = 0xBA, // for US ";:" - KEY_PLUS = 0xBB, // Plus Key "+" - KEY_COMMA = 0xBC, // Comma Key "," - KEY_MINUS = 0xBD, // Minus Key "-" - KEY_PERIOD = 0xBE, // Period Key "." - KEY_OEM_2 = 0xBF, // for US "/?" - KEY_OEM_3 = 0xC0, // for US "`~" - KEY_OEM_4 = 0xDB, // for US "[{" - KEY_OEM_5 = 0xDC, // for US "\|" - KEY_OEM_6 = 0xDD, // for US "]}" - KEY_OEM_7 = 0xDE, // for US "'"" - KEY_OEM_8 = 0xDF, // None - KEY_OEM_AX = 0xE1, // for Japan "AX" - KEY_OEM_102 = 0xE2, // "<>" or "\|" - KEY_ATTN = 0xF6, // Attn key - KEY_CRSEL = 0xF7, // CrSel key - KEY_EXSEL = 0xF8, // ExSel key - KEY_EREOF = 0xF9, // Erase EOF key - KEY_PLAY = 0xFA, // Play key - KEY_ZOOM = 0xFB, // Zoom key - KEY_PA1 = 0xFD, // PA1 key - KEY_OEM_CLEAR = 0xFE, // Clear key - KEY_NONE = 0xFF, // usually no key mapping, but some laptops use it for fn key + KEY_OEM_1 = 0xBA, // for US ";:" + KEY_PLUS = 0xBB, // Plus Key "+" + KEY_COMMA = 0xBC, // Comma Key "," + KEY_MINUS = 0xBD, // Minus Key "-" + KEY_PERIOD = 0xBE, // Period Key "." + KEY_OEM_2 = 0xBF, // for US "/?" + KEY_OEM_3 = 0xC0, // for US "`~" + KEY_OEM_4 = 0xDB, // for US "[{" + KEY_OEM_5 = 0xDC, // for US "\|" + KEY_OEM_6 = 0xDD, // for US "]}" + KEY_OEM_7 = 0xDE, // for US "'"" + KEY_OEM_8 = 0xDF, // None + KEY_OEM_AX = 0xE1, // for Japan "AX" + KEY_OEM_102 = 0xE2, // "<>" or "\|" + KEY_ATTN = 0xF6, // Attn key + KEY_CRSEL = 0xF7, // CrSel key + KEY_EXSEL = 0xF8, // ExSel key + KEY_EREOF = 0xF9, // Erase EOF key + KEY_PLAY = 0xFA, // Play key + KEY_ZOOM = 0xFB, // Zoom key + KEY_PA1 = 0xFD, // PA1 key + KEY_OEM_CLEAR = 0xFE, // Clear key + KEY_NONE = 0xFF, // usually no key mapping, but some laptops use it for fn key KEY_KEY_CODES_COUNT = 0x100 // this is not a key, but the amount of keycodes there are. }; diff --git a/include/SMaterial.h b/include/SMaterial.h index de9d567a9..f313b0050 100644 --- a/include/SMaterial.h +++ b/include/SMaterial.h @@ -24,32 +24,32 @@ class ITexture; //! BlendFunc = source * sourceFactor + dest * destFactor enum E_BLEND_FACTOR { - EBF_ZERO = 0, //!< src & dest (0, 0, 0, 0) - EBF_ONE, //!< src & dest (1, 1, 1, 1) - EBF_DST_COLOR, //!< src (destR, destG, destB, destA) - EBF_ONE_MINUS_DST_COLOR, //!< src (1-destR, 1-destG, 1-destB, 1-destA) - EBF_SRC_COLOR, //!< dest (srcR, srcG, srcB, srcA) - EBF_ONE_MINUS_SRC_COLOR, //!< dest (1-srcR, 1-srcG, 1-srcB, 1-srcA) - EBF_SRC_ALPHA, //!< src & dest (srcA, srcA, srcA, srcA) - EBF_ONE_MINUS_SRC_ALPHA, //!< src & dest (1-srcA, 1-srcA, 1-srcA, 1-srcA) - EBF_DST_ALPHA, //!< src & dest (destA, destA, destA, destA) - EBF_ONE_MINUS_DST_ALPHA, //!< src & dest (1-destA, 1-destA, 1-destA, 1-destA) - EBF_SRC_ALPHA_SATURATE //!< src (min(srcA, 1-destA), idem, ...) + EBF_ZERO = 0, //!< src & dest (0, 0, 0, 0) + EBF_ONE, //!< src & dest (1, 1, 1, 1) + EBF_DST_COLOR, //!< src (destR, destG, destB, destA) + EBF_ONE_MINUS_DST_COLOR, //!< src (1-destR, 1-destG, 1-destB, 1-destA) + EBF_SRC_COLOR, //!< dest (srcR, srcG, srcB, srcA) + EBF_ONE_MINUS_SRC_COLOR, //!< dest (1-srcR, 1-srcG, 1-srcB, 1-srcA) + EBF_SRC_ALPHA, //!< src & dest (srcA, srcA, srcA, srcA) + EBF_ONE_MINUS_SRC_ALPHA, //!< src & dest (1-srcA, 1-srcA, 1-srcA, 1-srcA) + EBF_DST_ALPHA, //!< src & dest (destA, destA, destA, destA) + EBF_ONE_MINUS_DST_ALPHA, //!< src & dest (1-destA, 1-destA, 1-destA, 1-destA) + EBF_SRC_ALPHA_SATURATE //!< src (min(srcA, 1-destA), idem, ...) }; //! Values defining the blend operation enum E_BLEND_OPERATION { - EBO_NONE = 0, //!< No blending happens - EBO_ADD, //!< Default blending adds the color values - EBO_SUBTRACT, //!< This mode subtracts the color values + EBO_NONE = 0, //!< No blending happens + EBO_ADD, //!< Default blending adds the color values + EBO_SUBTRACT, //!< This mode subtracts the color values EBO_REVSUBTRACT, //!< This modes subtracts destination from source - EBO_MIN, //!< Choose minimum value of each color channel - EBO_MAX, //!< Choose maximum value of each color channel - EBO_MIN_FACTOR, //!< Choose minimum value of each color channel after applying blend factors, not widely supported - EBO_MAX_FACTOR, //!< Choose maximum value of each color channel after applying blend factors, not widely supported - EBO_MIN_ALPHA, //!< Choose minimum value of each color channel based on alpha value, not widely supported - EBO_MAX_ALPHA //!< Choose maximum value of each color channel based on alpha value, not widely supported + EBO_MIN, //!< Choose minimum value of each color channel + EBO_MAX, //!< Choose maximum value of each color channel + EBO_MIN_FACTOR, //!< Choose minimum value of each color channel after applying blend factors, not widely supported + EBO_MAX_FACTOR, //!< Choose maximum value of each color channel after applying blend factors, not widely supported + EBO_MIN_ALPHA, //!< Choose minimum value of each color channel based on alpha value, not widely supported + EBO_MAX_ALPHA //!< Choose maximum value of each color channel based on alpha value, not widely supported }; //! MaterialTypeParam: e.g. DirectX: D3DTOP_MODULATE, D3DTOP_MODULATE2X, D3DTOP_MODULATE4X @@ -383,7 +383,7 @@ class SMaterial On D3D9 you can pass a range between -1 and 1. But you should likely divide it by the range of the depthbuffer. Like dividing by 65535.0 for a 16 bit depthbuffer. Thought it still might produce too large of a bias. Some article (https://aras-p.info/blog/2008/06/12/depth-bias-and-the-power-of-deceiving-yourself/) - recommends multiplying by 2.0*4.8e-7 (and strangely on both 16 bit and 24 bit). */ + recommends multiplying by 2.0*4.8e-7 (and strangely on both 16 bit and 24 bit). */ f32 PolygonOffsetDepthBias; //! Variable Z-Buffer offset based on the slope of the polygon. diff --git a/include/SMaterialLayer.h b/include/SMaterialLayer.h index 6fdad4bde..22acab6a8 100644 --- a/include/SMaterialLayer.h +++ b/include/SMaterialLayer.h @@ -155,7 +155,7 @@ class SMaterialLayer //! Sets the texture transformation matrix to mat /** NOTE: Pipelines can ignore this matrix when the - texture is 0. + texture is 0. \param mat New texture matrix for this layer. */ void setTextureMatrix(const core::matrix4 &mat) { diff --git a/include/irrArray.h b/include/irrArray.h index bf222a042..af13f5ed3 100644 --- a/include/irrArray.h +++ b/include/irrArray.h @@ -135,7 +135,7 @@ class array //! Compare if given data block is identical to the data in our array /** Like operator ==, but without the need to create the array \param otherData Address to data against which we compare, must contain size elements - \param size Amount of elements in otherData */ + \param size Amount of elements in otherData */ bool equals(const T *otherData, u32 size) const { if (m_data.size() != size) diff --git a/include/irrString.h b/include/irrString.h index 68b7a8692..e3c22f7d9 100644 --- a/include/irrString.h +++ b/include/irrString.h @@ -761,7 +761,7 @@ class string \param ignoreEmptyTokens Flag to avoid empty substrings in the result container. If two delimiters occur without a character in between or an empty substring would be placed in the result. Or if a delimiter is the last - character an empty substring would be added at the end. If this flag is set, + character an empty substring would be added at the end. If this flag is set, only non-empty strings are stored. \param keepSeparators Flag which allows to add the separator to the result string. If this flag is true, the concatenation of the diff --git a/include/irrTypes.h b/include/irrTypes.h index d67e157b1..00f9e831b 100644 --- a/include/irrTypes.h +++ b/include/irrTypes.h @@ -87,10 +87,10 @@ typedef char fschar_t; //! Defines a deprecated macro which generates a warning at compile time /** The usage is simple -For typedef: typedef _IRR_DEPRECATED_ int test1; -For classes/structs: class _IRR_DEPRECATED_ test2 { ... }; -For methods: class test3 { _IRR_DEPRECATED_ virtual void foo() {} }; -For functions: template _IRR_DEPRECATED_ void test4(void) {} +For typedef: typedef _IRR_DEPRECATED_ int test1; +For classes/structs: class _IRR_DEPRECATED_ test2 { ... }; +For methods: class test3 { _IRR_DEPRECATED_ virtual void foo() {} }; +For functions: template _IRR_DEPRECATED_ void test4(void) {} **/ #if defined(IGNORE_DEPRECATED_WARNING) #define _IRR_DEPRECATED_ diff --git a/include/irrlicht.h b/include/irrlicht.h index 7797b1669..402b1596f 100644 --- a/include/irrlicht.h +++ b/include/irrlicht.h @@ -174,40 +174,40 @@ * * int main() * { - * // start up the engine - * IrrlichtDevice *device = createDevice(video::EDT_OPENGL, - * core::dimension2d(640,480)); + * // start up the engine + * IrrlichtDevice *device = createDevice(video::EDT_OPENGL, + * core::dimension2d(640,480)); * - * video::IVideoDriver* driver = device->getVideoDriver(); - * scene::ISceneManager* scenemgr = device->getSceneManager(); + * video::IVideoDriver* driver = device->getVideoDriver(); + * scene::ISceneManager* scenemgr = device->getSceneManager(); * - * device->setWindowCaption(L"Hello World!"); + * device->setWindowCaption(L"Hello World!"); * - * // load and show quake2 .md2 model - * scene::ISceneNode* node = scenemgr->addAnimatedMeshSceneNode( - * scenemgr->getMesh("quake2model.md2")); + * // load and show quake2 .md2 model + * scene::ISceneNode* node = scenemgr->addAnimatedMeshSceneNode( + * scenemgr->getMesh("quake2model.md2")); * - * // if everything worked, add a texture and disable lighting - * if (node) - * { - * node->setMaterialTexture(0, driver->getTexture("texture.bmp")); - * node->setMaterialFlag(video::EMF_LIGHTING, false); - * } + * // if everything worked, add a texture and disable lighting + * if (node) + * { + * node->setMaterialTexture(0, driver->getTexture("texture.bmp")); + * node->setMaterialFlag(video::EMF_LIGHTING, false); + * } * - * // add a first person shooter style user controlled camera - * scenemgr->addCameraSceneNodeFPS(); + * // add a first person shooter style user controlled camera + * scenemgr->addCameraSceneNodeFPS(); * - * // draw everything - * while(device->run() && driver) - * { - * driver->beginScene(video::ECBF_COLOR | video::ECBF_DEPTH, video::SColor(255,0,0,255)); - * scenemgr->drawAll(); - * driver->endScene(); - * } + * // draw everything + * while(device->run() && driver) + * { + * driver->beginScene(video::ECBF_COLOR | video::ECBF_DEPTH, video::SColor(255,0,0,255)); + * scenemgr->drawAll(); + * driver->endScene(); + * } * - * // delete device - * device->drop(); - * return 0; + * // delete device + * device->drop(); + * return 0; * } * \endcode * @@ -217,12 +217,12 @@ * somewhere before the while loop: * * \code - * // add .pk3 archive to the file system - * device->getFileSystem()->addZipFileArchive("quake3map.pk3"); + * // add .pk3 archive to the file system + * device->getFileSystem()->addZipFileArchive("quake3map.pk3"); * - * // load .bsp file and show it using an octree - * scenemgr->addOctreeSceneNode( - * scenemgr->getMesh("quake3map.bsp")); + * // load .bsp file and show it using an octree + * scenemgr->addOctreeSceneNode( + * scenemgr->getMesh("quake3map.bsp")); * \endcode * * As you can see, the engine uses namespaces. Everything in the engine is diff --git a/include/irrpack.h b/include/irrpack.h index 5887cda63..76ef31da9 100644 --- a/include/irrpack.h +++ b/include/irrpack.h @@ -6,7 +6,7 @@ // and add to each structure the PACK_STRUCT define just like this: // struct mystruct // { -// ... +// ... // } PACK_STRUCT; // Always include the irrunpack.h file right after the last type declared // like this, and do not put any other types with different alignment diff --git a/include/matrix4.h b/include/matrix4.h index 181af34cb..d168b4bd7 100644 --- a/include/matrix4.h +++ b/include/matrix4.h @@ -1653,9 +1653,9 @@ template inline CMatrix4 &CMatrix4::buildProjectionMatrixOrthoLH( f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar, bool zClipFromZero) { - _IRR_DEBUG_BREAK_IF(widthOfViewVolume == 0.f); // divide by zero + _IRR_DEBUG_BREAK_IF(widthOfViewVolume == 0.f); // divide by zero _IRR_DEBUG_BREAK_IF(heightOfViewVolume == 0.f); // divide by zero - _IRR_DEBUG_BREAK_IF(zNear == zFar); // divide by zero + _IRR_DEBUG_BREAK_IF(zNear == zFar); // divide by zero M[0] = (T)(2 / widthOfViewVolume); M[1] = 0; M[2] = 0; @@ -1695,9 +1695,9 @@ template inline CMatrix4 &CMatrix4::buildProjectionMatrixOrthoRH( f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar, bool zClipFromZero) { - _IRR_DEBUG_BREAK_IF(widthOfViewVolume == 0.f); // divide by zero + _IRR_DEBUG_BREAK_IF(widthOfViewVolume == 0.f); // divide by zero _IRR_DEBUG_BREAK_IF(heightOfViewVolume == 0.f); // divide by zero - _IRR_DEBUG_BREAK_IF(zNear == zFar); // divide by zero + _IRR_DEBUG_BREAK_IF(zNear == zFar); // divide by zero M[0] = (T)(2 / widthOfViewVolume); M[1] = 0; M[2] = 0; @@ -1737,9 +1737,9 @@ template inline CMatrix4 &CMatrix4::buildProjectionMatrixPerspectiveRH( f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar, bool zClipFromZero) { - _IRR_DEBUG_BREAK_IF(widthOfViewVolume == 0.f); // divide by zero + _IRR_DEBUG_BREAK_IF(widthOfViewVolume == 0.f); // divide by zero _IRR_DEBUG_BREAK_IF(heightOfViewVolume == 0.f); // divide by zero - _IRR_DEBUG_BREAK_IF(zNear == zFar); // divide by zero + _IRR_DEBUG_BREAK_IF(zNear == zFar); // divide by zero M[0] = (T)(2 * zNear / widthOfViewVolume); M[1] = 0; M[2] = 0; @@ -1780,9 +1780,9 @@ template inline CMatrix4 &CMatrix4::buildProjectionMatrixPerspectiveLH( f32 widthOfViewVolume, f32 heightOfViewVolume, f32 zNear, f32 zFar, bool zClipFromZero) { - _IRR_DEBUG_BREAK_IF(widthOfViewVolume == 0.f); // divide by zero + _IRR_DEBUG_BREAK_IF(widthOfViewVolume == 0.f); // divide by zero _IRR_DEBUG_BREAK_IF(heightOfViewVolume == 0.f); // divide by zero - _IRR_DEBUG_BREAK_IF(zNear == zFar); // divide by zero + _IRR_DEBUG_BREAK_IF(zNear == zFar); // divide by zero M[0] = (T)(2 * zNear / widthOfViewVolume); M[1] = 0; M[2] = 0; diff --git a/source/Irrlicht/Android/CIrrDeviceAndroid.cpp b/source/Irrlicht/Android/CIrrDeviceAndroid.cpp index d740fd076..4a207a1db 100644 --- a/source/Irrlicht/Android/CIrrDeviceAndroid.cpp +++ b/source/Irrlicht/Android/CIrrDeviceAndroid.cpp @@ -515,102 +515,102 @@ void CIrrDeviceAndroid::createKeyMap() { KeyMap.set_used(223); - KeyMap[0] = KEY_UNKNOWN; // AKEYCODE_UNKNOWN - KeyMap[1] = KEY_LBUTTON; // AKEYCODE_SOFT_LEFT - KeyMap[2] = KEY_RBUTTON; // AKEYCODE_SOFT_RIGHT - KeyMap[3] = KEY_HOME; // AKEYCODE_HOME - KeyMap[4] = KEY_CANCEL; // AKEYCODE_BACK - KeyMap[5] = KEY_UNKNOWN; // AKEYCODE_CALL - KeyMap[6] = KEY_UNKNOWN; // AKEYCODE_ENDCALL - KeyMap[7] = KEY_KEY_0; // AKEYCODE_0 - KeyMap[8] = KEY_KEY_1; // AKEYCODE_1 - KeyMap[9] = KEY_KEY_2; // AKEYCODE_2 - KeyMap[10] = KEY_KEY_3; // AKEYCODE_3 - KeyMap[11] = KEY_KEY_4; // AKEYCODE_4 - KeyMap[12] = KEY_KEY_5; // AKEYCODE_5 - KeyMap[13] = KEY_KEY_6; // AKEYCODE_6 - KeyMap[14] = KEY_KEY_7; // AKEYCODE_7 - KeyMap[15] = KEY_KEY_8; // AKEYCODE_8 - KeyMap[16] = KEY_KEY_9; // AKEYCODE_9 - KeyMap[17] = KEY_UNKNOWN; // AKEYCODE_STAR - KeyMap[18] = KEY_UNKNOWN; // AKEYCODE_POUND - KeyMap[19] = KEY_UP; // AKEYCODE_DPAD_UP - KeyMap[20] = KEY_DOWN; // AKEYCODE_DPAD_DOWN - KeyMap[21] = KEY_LEFT; // AKEYCODE_DPAD_LEFT - KeyMap[22] = KEY_RIGHT; // AKEYCODE_DPAD_RIGHT - KeyMap[23] = KEY_SELECT; // AKEYCODE_DPAD_CENTER - KeyMap[24] = KEY_VOLUME_DOWN; // AKEYCODE_VOLUME_UP - KeyMap[25] = KEY_VOLUME_UP; // AKEYCODE_VOLUME_DOWN - KeyMap[26] = KEY_UNKNOWN; // AKEYCODE_POWER - KeyMap[27] = KEY_UNKNOWN; // AKEYCODE_CAMERA - KeyMap[28] = KEY_CLEAR; // AKEYCODE_CLEAR - KeyMap[29] = KEY_KEY_A; // AKEYCODE_A - KeyMap[30] = KEY_KEY_B; // AKEYCODE_B - KeyMap[31] = KEY_KEY_C; // AKEYCODE_C - KeyMap[32] = KEY_KEY_D; // AKEYCODE_D - KeyMap[33] = KEY_KEY_E; // AKEYCODE_E - KeyMap[34] = KEY_KEY_F; // AKEYCODE_F - KeyMap[35] = KEY_KEY_G; // AKEYCODE_G - KeyMap[36] = KEY_KEY_H; // AKEYCODE_H - KeyMap[37] = KEY_KEY_I; // AKEYCODE_I - KeyMap[38] = KEY_KEY_J; // AKEYCODE_J - KeyMap[39] = KEY_KEY_K; // AKEYCODE_K - KeyMap[40] = KEY_KEY_L; // AKEYCODE_L - KeyMap[41] = KEY_KEY_M; // AKEYCODE_M - KeyMap[42] = KEY_KEY_N; // AKEYCODE_N - KeyMap[43] = KEY_KEY_O; // AKEYCODE_O - KeyMap[44] = KEY_KEY_P; // AKEYCODE_P - KeyMap[45] = KEY_KEY_Q; // AKEYCODE_Q - KeyMap[46] = KEY_KEY_R; // AKEYCODE_R - KeyMap[47] = KEY_KEY_S; // AKEYCODE_S - KeyMap[48] = KEY_KEY_T; // AKEYCODE_T - KeyMap[49] = KEY_KEY_U; // AKEYCODE_U - KeyMap[50] = KEY_KEY_V; // AKEYCODE_V - KeyMap[51] = KEY_KEY_W; // AKEYCODE_W - KeyMap[52] = KEY_KEY_X; // AKEYCODE_X - KeyMap[53] = KEY_KEY_Y; // AKEYCODE_Y - KeyMap[54] = KEY_KEY_Z; // AKEYCODE_Z - KeyMap[55] = KEY_COMMA; // AKEYCODE_COMMA - KeyMap[56] = KEY_PERIOD; // AKEYCODE_PERIOD - KeyMap[57] = KEY_MENU; // AKEYCODE_ALT_LEFT - KeyMap[58] = KEY_MENU; // AKEYCODE_ALT_RIGHT - KeyMap[59] = KEY_LSHIFT; // AKEYCODE_SHIFT_LEFT - KeyMap[60] = KEY_RSHIFT; // AKEYCODE_SHIFT_RIGHT - KeyMap[61] = KEY_TAB; // AKEYCODE_TAB - KeyMap[62] = KEY_SPACE; // AKEYCODE_SPACE - KeyMap[63] = KEY_UNKNOWN; // AKEYCODE_SYM - KeyMap[64] = KEY_UNKNOWN; // AKEYCODE_EXPLORER - KeyMap[65] = KEY_UNKNOWN; // AKEYCODE_ENVELOPE - KeyMap[66] = KEY_RETURN; // AKEYCODE_ENTER - KeyMap[67] = KEY_BACK; // AKEYCODE_DEL - KeyMap[68] = KEY_OEM_3; // AKEYCODE_GRAVE - KeyMap[69] = KEY_MINUS; // AKEYCODE_MINUS - KeyMap[70] = KEY_UNKNOWN; // AKEYCODE_EQUALS - KeyMap[71] = KEY_UNKNOWN; // AKEYCODE_LEFT_BRACKET - KeyMap[72] = KEY_UNKNOWN; // AKEYCODE_RIGHT_BRACKET - KeyMap[73] = KEY_UNKNOWN; // AKEYCODE_BACKSLASH - KeyMap[74] = KEY_UNKNOWN; // AKEYCODE_SEMICOLON - KeyMap[75] = KEY_UNKNOWN; // AKEYCODE_APOSTROPHE - KeyMap[76] = KEY_UNKNOWN; // AKEYCODE_SLASH - KeyMap[77] = KEY_UNKNOWN; // AKEYCODE_AT - KeyMap[78] = KEY_UNKNOWN; // AKEYCODE_NUM - KeyMap[79] = KEY_UNKNOWN; // AKEYCODE_HEADSETHOOK - KeyMap[80] = KEY_UNKNOWN; // AKEYCODE_FOCUS (*Camera* focus) - KeyMap[81] = KEY_PLUS; // AKEYCODE_PLUS - KeyMap[82] = KEY_MENU; // AKEYCODE_MENU - KeyMap[83] = KEY_UNKNOWN; // AKEYCODE_NOTIFICATION - KeyMap[84] = KEY_UNKNOWN; // AKEYCODE_SEARCH + KeyMap[0] = KEY_UNKNOWN; // AKEYCODE_UNKNOWN + KeyMap[1] = KEY_LBUTTON; // AKEYCODE_SOFT_LEFT + KeyMap[2] = KEY_RBUTTON; // AKEYCODE_SOFT_RIGHT + KeyMap[3] = KEY_HOME; // AKEYCODE_HOME + KeyMap[4] = KEY_CANCEL; // AKEYCODE_BACK + KeyMap[5] = KEY_UNKNOWN; // AKEYCODE_CALL + KeyMap[6] = KEY_UNKNOWN; // AKEYCODE_ENDCALL + KeyMap[7] = KEY_KEY_0; // AKEYCODE_0 + KeyMap[8] = KEY_KEY_1; // AKEYCODE_1 + KeyMap[9] = KEY_KEY_2; // AKEYCODE_2 + KeyMap[10] = KEY_KEY_3; // AKEYCODE_3 + KeyMap[11] = KEY_KEY_4; // AKEYCODE_4 + KeyMap[12] = KEY_KEY_5; // AKEYCODE_5 + KeyMap[13] = KEY_KEY_6; // AKEYCODE_6 + KeyMap[14] = KEY_KEY_7; // AKEYCODE_7 + KeyMap[15] = KEY_KEY_8; // AKEYCODE_8 + KeyMap[16] = KEY_KEY_9; // AKEYCODE_9 + KeyMap[17] = KEY_UNKNOWN; // AKEYCODE_STAR + KeyMap[18] = KEY_UNKNOWN; // AKEYCODE_POUND + KeyMap[19] = KEY_UP; // AKEYCODE_DPAD_UP + KeyMap[20] = KEY_DOWN; // AKEYCODE_DPAD_DOWN + KeyMap[21] = KEY_LEFT; // AKEYCODE_DPAD_LEFT + KeyMap[22] = KEY_RIGHT; // AKEYCODE_DPAD_RIGHT + KeyMap[23] = KEY_SELECT; // AKEYCODE_DPAD_CENTER + KeyMap[24] = KEY_VOLUME_DOWN; // AKEYCODE_VOLUME_UP + KeyMap[25] = KEY_VOLUME_UP; // AKEYCODE_VOLUME_DOWN + KeyMap[26] = KEY_UNKNOWN; // AKEYCODE_POWER + KeyMap[27] = KEY_UNKNOWN; // AKEYCODE_CAMERA + KeyMap[28] = KEY_CLEAR; // AKEYCODE_CLEAR + KeyMap[29] = KEY_KEY_A; // AKEYCODE_A + KeyMap[30] = KEY_KEY_B; // AKEYCODE_B + KeyMap[31] = KEY_KEY_C; // AKEYCODE_C + KeyMap[32] = KEY_KEY_D; // AKEYCODE_D + KeyMap[33] = KEY_KEY_E; // AKEYCODE_E + KeyMap[34] = KEY_KEY_F; // AKEYCODE_F + KeyMap[35] = KEY_KEY_G; // AKEYCODE_G + KeyMap[36] = KEY_KEY_H; // AKEYCODE_H + KeyMap[37] = KEY_KEY_I; // AKEYCODE_I + KeyMap[38] = KEY_KEY_J; // AKEYCODE_J + KeyMap[39] = KEY_KEY_K; // AKEYCODE_K + KeyMap[40] = KEY_KEY_L; // AKEYCODE_L + KeyMap[41] = KEY_KEY_M; // AKEYCODE_M + KeyMap[42] = KEY_KEY_N; // AKEYCODE_N + KeyMap[43] = KEY_KEY_O; // AKEYCODE_O + KeyMap[44] = KEY_KEY_P; // AKEYCODE_P + KeyMap[45] = KEY_KEY_Q; // AKEYCODE_Q + KeyMap[46] = KEY_KEY_R; // AKEYCODE_R + KeyMap[47] = KEY_KEY_S; // AKEYCODE_S + KeyMap[48] = KEY_KEY_T; // AKEYCODE_T + KeyMap[49] = KEY_KEY_U; // AKEYCODE_U + KeyMap[50] = KEY_KEY_V; // AKEYCODE_V + KeyMap[51] = KEY_KEY_W; // AKEYCODE_W + KeyMap[52] = KEY_KEY_X; // AKEYCODE_X + KeyMap[53] = KEY_KEY_Y; // AKEYCODE_Y + KeyMap[54] = KEY_KEY_Z; // AKEYCODE_Z + KeyMap[55] = KEY_COMMA; // AKEYCODE_COMMA + KeyMap[56] = KEY_PERIOD; // AKEYCODE_PERIOD + KeyMap[57] = KEY_MENU; // AKEYCODE_ALT_LEFT + KeyMap[58] = KEY_MENU; // AKEYCODE_ALT_RIGHT + KeyMap[59] = KEY_LSHIFT; // AKEYCODE_SHIFT_LEFT + KeyMap[60] = KEY_RSHIFT; // AKEYCODE_SHIFT_RIGHT + KeyMap[61] = KEY_TAB; // AKEYCODE_TAB + KeyMap[62] = KEY_SPACE; // AKEYCODE_SPACE + KeyMap[63] = KEY_UNKNOWN; // AKEYCODE_SYM + KeyMap[64] = KEY_UNKNOWN; // AKEYCODE_EXPLORER + KeyMap[65] = KEY_UNKNOWN; // AKEYCODE_ENVELOPE + KeyMap[66] = KEY_RETURN; // AKEYCODE_ENTER + KeyMap[67] = KEY_BACK; // AKEYCODE_DEL + KeyMap[68] = KEY_OEM_3; // AKEYCODE_GRAVE + KeyMap[69] = KEY_MINUS; // AKEYCODE_MINUS + KeyMap[70] = KEY_UNKNOWN; // AKEYCODE_EQUALS + KeyMap[71] = KEY_UNKNOWN; // AKEYCODE_LEFT_BRACKET + KeyMap[72] = KEY_UNKNOWN; // AKEYCODE_RIGHT_BRACKET + KeyMap[73] = KEY_UNKNOWN; // AKEYCODE_BACKSLASH + KeyMap[74] = KEY_UNKNOWN; // AKEYCODE_SEMICOLON + KeyMap[75] = KEY_UNKNOWN; // AKEYCODE_APOSTROPHE + KeyMap[76] = KEY_UNKNOWN; // AKEYCODE_SLASH + KeyMap[77] = KEY_UNKNOWN; // AKEYCODE_AT + KeyMap[78] = KEY_UNKNOWN; // AKEYCODE_NUM + KeyMap[79] = KEY_UNKNOWN; // AKEYCODE_HEADSETHOOK + KeyMap[80] = KEY_UNKNOWN; // AKEYCODE_FOCUS (*Camera* focus) + KeyMap[81] = KEY_PLUS; // AKEYCODE_PLUS + KeyMap[82] = KEY_MENU; // AKEYCODE_MENU + KeyMap[83] = KEY_UNKNOWN; // AKEYCODE_NOTIFICATION + KeyMap[84] = KEY_UNKNOWN; // AKEYCODE_SEARCH KeyMap[85] = KEY_MEDIA_PLAY_PAUSE; // AKEYCODE_MEDIA_PLAY_PAUSE - KeyMap[86] = KEY_MEDIA_STOP; // AKEYCODE_MEDIA_STOP + KeyMap[86] = KEY_MEDIA_STOP; // AKEYCODE_MEDIA_STOP KeyMap[87] = KEY_MEDIA_NEXT_TRACK; // AKEYCODE_MEDIA_NEXT KeyMap[88] = KEY_MEDIA_PREV_TRACK; // AKEYCODE_MEDIA_PREVIOUS - KeyMap[89] = KEY_UNKNOWN; // AKEYCODE_MEDIA_REWIND - KeyMap[90] = KEY_UNKNOWN; // AKEYCODE_MEDIA_FAST_FORWARD - KeyMap[91] = KEY_VOLUME_MUTE; // AKEYCODE_MUTE - KeyMap[92] = KEY_PRIOR; // AKEYCODE_PAGE_UP - KeyMap[93] = KEY_NEXT; // AKEYCODE_PAGE_DOWN - KeyMap[94] = KEY_UNKNOWN; // AKEYCODE_PICTSYMBOLS - KeyMap[95] = KEY_UNKNOWN; // AKEYCODE_SWITCH_CHARSET + KeyMap[89] = KEY_UNKNOWN; // AKEYCODE_MEDIA_REWIND + KeyMap[90] = KEY_UNKNOWN; // AKEYCODE_MEDIA_FAST_FORWARD + KeyMap[91] = KEY_VOLUME_MUTE; // AKEYCODE_MUTE + KeyMap[92] = KEY_PRIOR; // AKEYCODE_PAGE_UP + KeyMap[93] = KEY_NEXT; // AKEYCODE_PAGE_DOWN + KeyMap[94] = KEY_UNKNOWN; // AKEYCODE_PICTSYMBOLS + KeyMap[95] = KEY_UNKNOWN; // AKEYCODE_SWITCH_CHARSET // following look like controller inputs KeyMap[96] = KEY_UNKNOWN; // AKEYCODE_BUTTON_A @@ -629,118 +629,118 @@ void CIrrDeviceAndroid::createKeyMap() KeyMap[109] = KEY_UNKNOWN; // AKEYCODE_BUTTON_SELECT KeyMap[110] = KEY_UNKNOWN; // AKEYCODE_BUTTON_MODE - KeyMap[111] = KEY_ESCAPE; // AKEYCODE_ESCAPE - KeyMap[112] = KEY_DELETE; // AKEYCODE_FORWARD_DEL - KeyMap[113] = KEY_CONTROL; // AKEYCODE_CTRL_LEFT - KeyMap[114] = KEY_CONTROL; // AKEYCODE_CTRL_RIGHT - KeyMap[115] = KEY_CAPITAL; // AKEYCODE_CAPS_LOCK - KeyMap[116] = KEY_SCROLL; // AKEYCODE_SCROLL_LOCK - KeyMap[117] = KEY_UNKNOWN; // AKEYCODE_META_LEFT - KeyMap[118] = KEY_UNKNOWN; // AKEYCODE_META_RIGHT - KeyMap[119] = KEY_UNKNOWN; // AKEYCODE_FUNCTION - KeyMap[120] = KEY_SNAPSHOT; // AKEYCODE_SYSRQ - KeyMap[121] = KEY_PAUSE; // AKEYCODE_BREAK - KeyMap[122] = KEY_HOME; // AKEYCODE_MOVE_HOME - KeyMap[123] = KEY_END; // AKEYCODE_MOVE_END - KeyMap[124] = KEY_INSERT; // AKEYCODE_INSERT - KeyMap[125] = KEY_UNKNOWN; // AKEYCODE_FORWARD - KeyMap[126] = KEY_PLAY; // AKEYCODE_MEDIA_PLAY + KeyMap[111] = KEY_ESCAPE; // AKEYCODE_ESCAPE + KeyMap[112] = KEY_DELETE; // AKEYCODE_FORWARD_DEL + KeyMap[113] = KEY_CONTROL; // AKEYCODE_CTRL_LEFT + KeyMap[114] = KEY_CONTROL; // AKEYCODE_CTRL_RIGHT + KeyMap[115] = KEY_CAPITAL; // AKEYCODE_CAPS_LOCK + KeyMap[116] = KEY_SCROLL; // AKEYCODE_SCROLL_LOCK + KeyMap[117] = KEY_UNKNOWN; // AKEYCODE_META_LEFT + KeyMap[118] = KEY_UNKNOWN; // AKEYCODE_META_RIGHT + KeyMap[119] = KEY_UNKNOWN; // AKEYCODE_FUNCTION + KeyMap[120] = KEY_SNAPSHOT; // AKEYCODE_SYSRQ + KeyMap[121] = KEY_PAUSE; // AKEYCODE_BREAK + KeyMap[122] = KEY_HOME; // AKEYCODE_MOVE_HOME + KeyMap[123] = KEY_END; // AKEYCODE_MOVE_END + KeyMap[124] = KEY_INSERT; // AKEYCODE_INSERT + KeyMap[125] = KEY_UNKNOWN; // AKEYCODE_FORWARD + KeyMap[126] = KEY_PLAY; // AKEYCODE_MEDIA_PLAY KeyMap[127] = KEY_MEDIA_PLAY_PAUSE; // AKEYCODE_MEDIA_PAUSE - KeyMap[128] = KEY_UNKNOWN; // AKEYCODE_MEDIA_CLOSE - KeyMap[129] = KEY_UNKNOWN; // AKEYCODE_MEDIA_EJECT - KeyMap[130] = KEY_UNKNOWN; // AKEYCODE_MEDIA_RECORD - KeyMap[131] = KEY_F1; // AKEYCODE_F1 - KeyMap[132] = KEY_F2; // AKEYCODE_F2 - KeyMap[133] = KEY_F3; // AKEYCODE_F3 - KeyMap[134] = KEY_F4; // AKEYCODE_F4 - KeyMap[135] = KEY_F5; // AKEYCODE_F5 - KeyMap[136] = KEY_F6; // AKEYCODE_F6 - KeyMap[137] = KEY_F7; // AKEYCODE_F7 - KeyMap[138] = KEY_F8; // AKEYCODE_F8 - KeyMap[139] = KEY_F9; // AKEYCODE_F9 - KeyMap[140] = KEY_F10; // AKEYCODE_F10 - KeyMap[141] = KEY_F11; // AKEYCODE_F11 - KeyMap[142] = KEY_F12; // AKEYCODE_F12 - KeyMap[143] = KEY_NUMLOCK; // AKEYCODE_NUM_LOCK - KeyMap[144] = KEY_NUMPAD0; // AKEYCODE_NUMPAD_0 - KeyMap[145] = KEY_NUMPAD1; // AKEYCODE_NUMPAD_1 - KeyMap[146] = KEY_NUMPAD2; // AKEYCODE_NUMPAD_2 - KeyMap[147] = KEY_NUMPAD3; // AKEYCODE_NUMPAD_3 - KeyMap[148] = KEY_NUMPAD4; // AKEYCODE_NUMPAD_4 - KeyMap[149] = KEY_NUMPAD5; // AKEYCODE_NUMPAD_5 - KeyMap[150] = KEY_NUMPAD6; // AKEYCODE_NUMPAD_6 - KeyMap[151] = KEY_NUMPAD7; // AKEYCODE_NUMPAD_7 - KeyMap[152] = KEY_NUMPAD8; // AKEYCODE_NUMPAD_8 - KeyMap[153] = KEY_NUMPAD9; // AKEYCODE_NUMPAD_9 - KeyMap[154] = KEY_DIVIDE; // AKEYCODE_NUMPAD_DIVIDE - KeyMap[155] = KEY_MULTIPLY; // AKEYCODE_NUMPAD_MULTIPLY - KeyMap[156] = KEY_SUBTRACT; // AKEYCODE_NUMPAD_SUBTRACT - KeyMap[157] = KEY_ADD; // AKEYCODE_NUMPAD_ADD - KeyMap[158] = KEY_UNKNOWN; // AKEYCODE_NUMPAD_DOT - KeyMap[159] = KEY_COMMA; // AKEYCODE_NUMPAD_COMMA - KeyMap[160] = KEY_RETURN; // AKEYCODE_NUMPAD_ENTER - KeyMap[161] = KEY_UNKNOWN; // AKEYCODE_NUMPAD_EQUALS - KeyMap[162] = KEY_UNKNOWN; // AKEYCODE_NUMPAD_LEFT_PAREN - KeyMap[163] = KEY_UNKNOWN; // AKEYCODE_NUMPAD_RIGHT_PAREN - KeyMap[164] = KEY_VOLUME_MUTE; // AKEYCODE_VOLUME_MUTE - KeyMap[165] = KEY_UNKNOWN; // AKEYCODE_INFO - KeyMap[166] = KEY_UNKNOWN; // AKEYCODE_CHANNEL_UP - KeyMap[167] = KEY_UNKNOWN; // AKEYCODE_CHANNEL_DOWN - KeyMap[168] = KEY_ZOOM; // AKEYCODE_ZOOM_IN - KeyMap[169] = KEY_UNKNOWN; // AKEYCODE_ZOOM_OUT - KeyMap[170] = KEY_UNKNOWN; // AKEYCODE_TV - KeyMap[171] = KEY_UNKNOWN; // AKEYCODE_WINDOW - KeyMap[172] = KEY_UNKNOWN; // AKEYCODE_GUIDE - KeyMap[173] = KEY_UNKNOWN; // AKEYCODE_DVR - KeyMap[174] = KEY_UNKNOWN; // AKEYCODE_BOOKMARK - KeyMap[175] = KEY_UNKNOWN; // AKEYCODE_CAPTIONS - KeyMap[176] = KEY_UNKNOWN; // AKEYCODE_SETTINGS - KeyMap[177] = KEY_UNKNOWN; // AKEYCODE_TV_POWER - KeyMap[178] = KEY_UNKNOWN; // AKEYCODE_TV_INPUT - KeyMap[179] = KEY_UNKNOWN; // AKEYCODE_STB_POWER - KeyMap[180] = KEY_UNKNOWN; // AKEYCODE_STB_INPUT - KeyMap[181] = KEY_UNKNOWN; // AKEYCODE_AVR_POWER - KeyMap[182] = KEY_UNKNOWN; // AKEYCODE_AVR_INPUT - KeyMap[183] = KEY_UNKNOWN; // AKEYCODE_PROG_RED - KeyMap[184] = KEY_UNKNOWN; // AKEYCODE_PROG_GREEN - KeyMap[185] = KEY_UNKNOWN; // AKEYCODE_PROG_YELLOW - KeyMap[186] = KEY_UNKNOWN; // AKEYCODE_PROG_BLUE - KeyMap[187] = KEY_UNKNOWN; // AKEYCODE_APP_SWITCH - KeyMap[188] = KEY_UNKNOWN; // AKEYCODE_BUTTON_1 - KeyMap[189] = KEY_UNKNOWN; // AKEYCODE_BUTTON_2 - KeyMap[190] = KEY_UNKNOWN; // AKEYCODE_BUTTON_3 - KeyMap[191] = KEY_UNKNOWN; // AKEYCODE_BUTTON_4 - KeyMap[192] = KEY_UNKNOWN; // AKEYCODE_BUTTON_5 - KeyMap[193] = KEY_UNKNOWN; // AKEYCODE_BUTTON_6 - KeyMap[194] = KEY_UNKNOWN; // AKEYCODE_BUTTON_7 - KeyMap[195] = KEY_UNKNOWN; // AKEYCODE_BUTTON_8 - KeyMap[196] = KEY_UNKNOWN; // AKEYCODE_BUTTON_9 - KeyMap[197] = KEY_UNKNOWN; // AKEYCODE_BUTTON_10 - KeyMap[198] = KEY_UNKNOWN; // AKEYCODE_BUTTON_11 - KeyMap[199] = KEY_UNKNOWN; // AKEYCODE_BUTTON_12 - KeyMap[200] = KEY_UNKNOWN; // AKEYCODE_BUTTON_13 - KeyMap[201] = KEY_UNKNOWN; // AKEYCODE_BUTTON_14 - KeyMap[202] = KEY_UNKNOWN; // AKEYCODE_BUTTON_15 - KeyMap[203] = KEY_UNKNOWN; // AKEYCODE_BUTTON_16 - KeyMap[204] = KEY_UNKNOWN; // AKEYCODE_LANGUAGE_SWITCH - KeyMap[205] = KEY_UNKNOWN; // AKEYCODE_MANNER_MODE - KeyMap[206] = KEY_UNKNOWN; // AKEYCODE_3D_MODE - KeyMap[207] = KEY_UNKNOWN; // AKEYCODE_CONTACTS - KeyMap[208] = KEY_UNKNOWN; // AKEYCODE_CALENDAR - KeyMap[209] = KEY_UNKNOWN; // AKEYCODE_MUSIC - KeyMap[210] = KEY_UNKNOWN; // AKEYCODE_CALCULATOR - KeyMap[211] = KEY_UNKNOWN; // AKEYCODE_ZENKAKU_HANKAKU - KeyMap[212] = KEY_UNKNOWN; // AKEYCODE_EISU - KeyMap[213] = KEY_UNKNOWN; // AKEYCODE_MUHENKAN - KeyMap[214] = KEY_UNKNOWN; // AKEYCODE_HENKAN - KeyMap[215] = KEY_UNKNOWN; // AKEYCODE_KATAKANA_HIRAGANA - KeyMap[216] = KEY_UNKNOWN; // AKEYCODE_YEN - KeyMap[217] = KEY_UNKNOWN; // AKEYCODE_RO - KeyMap[218] = KEY_UNKNOWN; // AKEYCODE_KANA - KeyMap[219] = KEY_UNKNOWN; // AKEYCODE_ASSIST - KeyMap[220] = KEY_UNKNOWN; // AKEYCODE_BRIGHTNESS_DOWN - KeyMap[221] = KEY_UNKNOWN; // AKEYCODE_BRIGHTNESS_UP , - KeyMap[222] = KEY_UNKNOWN; // AKEYCODE_MEDIA_AUDIO_TRACK + KeyMap[128] = KEY_UNKNOWN; // AKEYCODE_MEDIA_CLOSE + KeyMap[129] = KEY_UNKNOWN; // AKEYCODE_MEDIA_EJECT + KeyMap[130] = KEY_UNKNOWN; // AKEYCODE_MEDIA_RECORD + KeyMap[131] = KEY_F1; // AKEYCODE_F1 + KeyMap[132] = KEY_F2; // AKEYCODE_F2 + KeyMap[133] = KEY_F3; // AKEYCODE_F3 + KeyMap[134] = KEY_F4; // AKEYCODE_F4 + KeyMap[135] = KEY_F5; // AKEYCODE_F5 + KeyMap[136] = KEY_F6; // AKEYCODE_F6 + KeyMap[137] = KEY_F7; // AKEYCODE_F7 + KeyMap[138] = KEY_F8; // AKEYCODE_F8 + KeyMap[139] = KEY_F9; // AKEYCODE_F9 + KeyMap[140] = KEY_F10; // AKEYCODE_F10 + KeyMap[141] = KEY_F11; // AKEYCODE_F11 + KeyMap[142] = KEY_F12; // AKEYCODE_F12 + KeyMap[143] = KEY_NUMLOCK; // AKEYCODE_NUM_LOCK + KeyMap[144] = KEY_NUMPAD0; // AKEYCODE_NUMPAD_0 + KeyMap[145] = KEY_NUMPAD1; // AKEYCODE_NUMPAD_1 + KeyMap[146] = KEY_NUMPAD2; // AKEYCODE_NUMPAD_2 + KeyMap[147] = KEY_NUMPAD3; // AKEYCODE_NUMPAD_3 + KeyMap[148] = KEY_NUMPAD4; // AKEYCODE_NUMPAD_4 + KeyMap[149] = KEY_NUMPAD5; // AKEYCODE_NUMPAD_5 + KeyMap[150] = KEY_NUMPAD6; // AKEYCODE_NUMPAD_6 + KeyMap[151] = KEY_NUMPAD7; // AKEYCODE_NUMPAD_7 + KeyMap[152] = KEY_NUMPAD8; // AKEYCODE_NUMPAD_8 + KeyMap[153] = KEY_NUMPAD9; // AKEYCODE_NUMPAD_9 + KeyMap[154] = KEY_DIVIDE; // AKEYCODE_NUMPAD_DIVIDE + KeyMap[155] = KEY_MULTIPLY; // AKEYCODE_NUMPAD_MULTIPLY + KeyMap[156] = KEY_SUBTRACT; // AKEYCODE_NUMPAD_SUBTRACT + KeyMap[157] = KEY_ADD; // AKEYCODE_NUMPAD_ADD + KeyMap[158] = KEY_UNKNOWN; // AKEYCODE_NUMPAD_DOT + KeyMap[159] = KEY_COMMA; // AKEYCODE_NUMPAD_COMMA + KeyMap[160] = KEY_RETURN; // AKEYCODE_NUMPAD_ENTER + KeyMap[161] = KEY_UNKNOWN; // AKEYCODE_NUMPAD_EQUALS + KeyMap[162] = KEY_UNKNOWN; // AKEYCODE_NUMPAD_LEFT_PAREN + KeyMap[163] = KEY_UNKNOWN; // AKEYCODE_NUMPAD_RIGHT_PAREN + KeyMap[164] = KEY_VOLUME_MUTE; // AKEYCODE_VOLUME_MUTE + KeyMap[165] = KEY_UNKNOWN; // AKEYCODE_INFO + KeyMap[166] = KEY_UNKNOWN; // AKEYCODE_CHANNEL_UP + KeyMap[167] = KEY_UNKNOWN; // AKEYCODE_CHANNEL_DOWN + KeyMap[168] = KEY_ZOOM; // AKEYCODE_ZOOM_IN + KeyMap[169] = KEY_UNKNOWN; // AKEYCODE_ZOOM_OUT + KeyMap[170] = KEY_UNKNOWN; // AKEYCODE_TV + KeyMap[171] = KEY_UNKNOWN; // AKEYCODE_WINDOW + KeyMap[172] = KEY_UNKNOWN; // AKEYCODE_GUIDE + KeyMap[173] = KEY_UNKNOWN; // AKEYCODE_DVR + KeyMap[174] = KEY_UNKNOWN; // AKEYCODE_BOOKMARK + KeyMap[175] = KEY_UNKNOWN; // AKEYCODE_CAPTIONS + KeyMap[176] = KEY_UNKNOWN; // AKEYCODE_SETTINGS + KeyMap[177] = KEY_UNKNOWN; // AKEYCODE_TV_POWER + KeyMap[178] = KEY_UNKNOWN; // AKEYCODE_TV_INPUT + KeyMap[179] = KEY_UNKNOWN; // AKEYCODE_STB_POWER + KeyMap[180] = KEY_UNKNOWN; // AKEYCODE_STB_INPUT + KeyMap[181] = KEY_UNKNOWN; // AKEYCODE_AVR_POWER + KeyMap[182] = KEY_UNKNOWN; // AKEYCODE_AVR_INPUT + KeyMap[183] = KEY_UNKNOWN; // AKEYCODE_PROG_RED + KeyMap[184] = KEY_UNKNOWN; // AKEYCODE_PROG_GREEN + KeyMap[185] = KEY_UNKNOWN; // AKEYCODE_PROG_YELLOW + KeyMap[186] = KEY_UNKNOWN; // AKEYCODE_PROG_BLUE + KeyMap[187] = KEY_UNKNOWN; // AKEYCODE_APP_SWITCH + KeyMap[188] = KEY_UNKNOWN; // AKEYCODE_BUTTON_1 + KeyMap[189] = KEY_UNKNOWN; // AKEYCODE_BUTTON_2 + KeyMap[190] = KEY_UNKNOWN; // AKEYCODE_BUTTON_3 + KeyMap[191] = KEY_UNKNOWN; // AKEYCODE_BUTTON_4 + KeyMap[192] = KEY_UNKNOWN; // AKEYCODE_BUTTON_5 + KeyMap[193] = KEY_UNKNOWN; // AKEYCODE_BUTTON_6 + KeyMap[194] = KEY_UNKNOWN; // AKEYCODE_BUTTON_7 + KeyMap[195] = KEY_UNKNOWN; // AKEYCODE_BUTTON_8 + KeyMap[196] = KEY_UNKNOWN; // AKEYCODE_BUTTON_9 + KeyMap[197] = KEY_UNKNOWN; // AKEYCODE_BUTTON_10 + KeyMap[198] = KEY_UNKNOWN; // AKEYCODE_BUTTON_11 + KeyMap[199] = KEY_UNKNOWN; // AKEYCODE_BUTTON_12 + KeyMap[200] = KEY_UNKNOWN; // AKEYCODE_BUTTON_13 + KeyMap[201] = KEY_UNKNOWN; // AKEYCODE_BUTTON_14 + KeyMap[202] = KEY_UNKNOWN; // AKEYCODE_BUTTON_15 + KeyMap[203] = KEY_UNKNOWN; // AKEYCODE_BUTTON_16 + KeyMap[204] = KEY_UNKNOWN; // AKEYCODE_LANGUAGE_SWITCH + KeyMap[205] = KEY_UNKNOWN; // AKEYCODE_MANNER_MODE + KeyMap[206] = KEY_UNKNOWN; // AKEYCODE_3D_MODE + KeyMap[207] = KEY_UNKNOWN; // AKEYCODE_CONTACTS + KeyMap[208] = KEY_UNKNOWN; // AKEYCODE_CALENDAR + KeyMap[209] = KEY_UNKNOWN; // AKEYCODE_MUSIC + KeyMap[210] = KEY_UNKNOWN; // AKEYCODE_CALCULATOR + KeyMap[211] = KEY_UNKNOWN; // AKEYCODE_ZENKAKU_HANKAKU + KeyMap[212] = KEY_UNKNOWN; // AKEYCODE_EISU + KeyMap[213] = KEY_UNKNOWN; // AKEYCODE_MUHENKAN + KeyMap[214] = KEY_UNKNOWN; // AKEYCODE_HENKAN + KeyMap[215] = KEY_UNKNOWN; // AKEYCODE_KATAKANA_HIRAGANA + KeyMap[216] = KEY_UNKNOWN; // AKEYCODE_YEN + KeyMap[217] = KEY_UNKNOWN; // AKEYCODE_RO + KeyMap[218] = KEY_UNKNOWN; // AKEYCODE_KANA + KeyMap[219] = KEY_UNKNOWN; // AKEYCODE_ASSIST + KeyMap[220] = KEY_UNKNOWN; // AKEYCODE_BRIGHTNESS_DOWN + KeyMap[221] = KEY_UNKNOWN; // AKEYCODE_BRIGHTNESS_UP , + KeyMap[222] = KEY_UNKNOWN; // AKEYCODE_MEDIA_AUDIO_TRACK } bool CIrrDeviceAndroid::activateAccelerometer(float updateInterval) diff --git a/source/Irrlicht/CAnimatedMeshSceneNode.cpp b/source/Irrlicht/CAnimatedMeshSceneNode.cpp index 4bb441f24..55d026203 100644 --- a/source/Irrlicht/CAnimatedMeshSceneNode.cpp +++ b/source/Irrlicht/CAnimatedMeshSceneNode.cpp @@ -605,7 +605,7 @@ void CAnimatedMeshSceneNode::animateJoints(bool CalculateAbsolutePositions) skinnedMesh->recoverJointsFromMesh(JointChildSceneNodes); //----------------------------------------- - // Transition + // Transition //----------------------------------------- if (Transiting != 0.f) { @@ -642,10 +642,10 @@ void CAnimatedMeshSceneNode::animateJoints(bool CalculateAbsolutePositions) //------Scale------ // JointChildSceneNodes[n]->setScale( - // core::lerp( - // PretransitingSave[n].getScale(), - // JointChildSceneNodes[n]->getScale(), - // TransitingBlend)); + // core::lerp( + // PretransitingSave[n].getScale(), + // JointChildSceneNodes[n]->getScale(), + // TransitingBlend)); } } diff --git a/source/Irrlicht/CAnimatedMeshSceneNode.h b/source/Irrlicht/CAnimatedMeshSceneNode.h index 5d912c7f6..bee6bca61 100644 --- a/source/Irrlicht/CAnimatedMeshSceneNode.h +++ b/source/Irrlicht/CAnimatedMeshSceneNode.h @@ -154,8 +154,8 @@ class CAnimatedMeshSceneNode : public IAnimatedMeshSceneNode f32 CurrentFrameNr; u32 LastTimeMs; - u32 TransitionTime; // Transition time in millisecs - f32 Transiting; // is mesh transiting (plus cache of TransitionTime) + u32 TransitionTime; // Transition time in millisecs + f32 Transiting; // is mesh transiting (plus cache of TransitionTime) f32 TransitingBlend; // 0-1, calculated on buildFrameNr // 0-unused, 1-get joints only, 2-set joints only, 3-move and set diff --git a/source/Irrlicht/CB3DMeshFileLoader.cpp b/source/Irrlicht/CB3DMeshFileLoader.cpp index 239cd98c8..c5945d043 100644 --- a/source/Irrlicht/CB3DMeshFileLoader.cpp +++ b/source/Irrlicht/CB3DMeshFileLoader.cpp @@ -295,7 +295,7 @@ bool CB3DMeshFileLoader::readChunkMESH(CSkinnedMesh::SJoint *inJoint) float x,y,z ;always present float nx,ny,nz ;vertex normal: present if (flags&1) float red,green,blue,alpha ;vertex color: present if (flags&2) - float tex_coords[tex_coord_sets][tex_coord_set_size] ;tex coords + float tex_coords[tex_coord_sets][tex_coord_set_size] ;tex coords } */ bool CB3DMeshFileLoader::readChunkVRTS(CSkinnedMesh::SJoint *inJoint) @@ -696,9 +696,9 @@ bool CB3DMeshFileLoader::readChunkANIM() os::Printer::log(logStr.c_str(), ELL_DEBUG); #endif - s32 animFlags; // not stored\used + s32 animFlags; // not stored\used s32 animFrames; // not stored\used - f32 animFPS; // not stored\used + f32 animFPS; // not stored\used B3DFile->read(&animFlags, sizeof(s32)); B3DFile->read(&animFrames, sizeof(s32)); @@ -870,7 +870,7 @@ bool CB3DMeshFileLoader::readChunkBRUS() if (B3dMaterial.Textures[0]->Flags & 0x2) { // (Alpha mapped) B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL; B3dMaterial.Material.ZWriteEnable = video::EZW_OFF; - } else if (B3dMaterial.Textures[0]->Flags & 0x4) //(Masked) + } else if (B3dMaterial.Textures[0]->Flags & 0x4) //(Masked) B3dMaterial.Material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF; // TODO: create color key texture else if (B3dMaterial.alpha == 1.f) B3dMaterial.Material.MaterialType = video::EMT_SOLID; diff --git a/source/Irrlicht/CB3DMeshWriter.cpp b/source/Irrlicht/CB3DMeshWriter.cpp index dff2f5716..97eafda69 100644 --- a/source/Irrlicht/CB3DMeshWriter.cpp +++ b/source/Irrlicht/CB3DMeshWriter.cpp @@ -278,7 +278,7 @@ bool CB3DMeshWriter::writeMesh(io::IWriteFile *file, IMesh *const mesh, s32 flag } writeSizeFrom(file, nodeSizeAdress + 4, nodeSizeAdress); // Node chunk size - writeSizeFrom(file, 8, 4); // BB3D chunk size + writeSizeFrom(file, 8, 4); // BB3D chunk size return true; } @@ -335,7 +335,7 @@ void CB3DMeshWriter::writeJointChunk(io::IWriteFile *file, ISkinnedMesh *mesh, I if (joint->PositionKeys.size()) { file->write("KEYS", 4); u32 keysSize = 4 * joint->PositionKeys.size() * 4; // X, Y and Z pos + frame - keysSize += 4; // Flag to define the type of the key + keysSize += 4; // Flag to define the type of the key file->write(&keysSize, 4); u32 flag = 1; // 1 = flag for position keys @@ -353,7 +353,7 @@ void CB3DMeshWriter::writeJointChunk(io::IWriteFile *file, ISkinnedMesh *mesh, I if (joint->RotationKeys.size()) { file->write("KEYS", 4); u32 keysSize = 4 * joint->RotationKeys.size() * 5; // W, X, Y and Z rot + frame - keysSize += 4; // Flag + keysSize += 4; // Flag file->write(&keysSize, 4); u32 flag = 4; @@ -374,7 +374,7 @@ void CB3DMeshWriter::writeJointChunk(io::IWriteFile *file, ISkinnedMesh *mesh, I if (joint->ScaleKeys.size()) { file->write("KEYS", 4); u32 keysSize = 4 * joint->ScaleKeys.size() * 4; // X, Y and Z scale + frame - keysSize += 4; // Flag + keysSize += 4; // Flag file->write(&keysSize, 4); u32 flag = 2; diff --git a/source/Irrlicht/CCameraSceneNode.cpp b/source/Irrlicht/CCameraSceneNode.cpp index e480a1142..aebdc7649 100644 --- a/source/Irrlicht/CCameraSceneNode.cpp +++ b/source/Irrlicht/CCameraSceneNode.cpp @@ -26,7 +26,7 @@ CCameraSceneNode::CCameraSceneNode(ISceneNode *parent, ISceneManager *mgr, s32 i // set default projection Fovy = core::PI / 2.5f; // Field of view, in radians. - Aspect = 4.0f / 3.0f; // Aspect ratio. + Aspect = 4.0f / 3.0f; // Aspect ratio. const video::IVideoDriver *const d = mgr ? mgr->getVideoDriver() : 0; if (d) { diff --git a/source/Irrlicht/CCameraSceneNode.h b/source/Irrlicht/CCameraSceneNode.h index ad21a9650..b1a7c0bf4 100644 --- a/source/Irrlicht/CCameraSceneNode.h +++ b/source/Irrlicht/CCameraSceneNode.h @@ -149,10 +149,10 @@ class CCameraSceneNode : public ICameraSceneNode core::vector3df Target; core::vector3df UpVector; - f32 Fovy; // Field of view, in radians. + f32 Fovy; // Field of view, in radians. f32 Aspect; // Aspect ratio. - f32 ZNear; // value of the near view-plane. - f32 ZFar; // Z-value of the far view-plane. + f32 ZNear; // value of the near view-plane. + f32 ZFar; // Z-value of the far view-plane. SViewFrustum ViewArea; core::matrix4 Affector; diff --git a/source/Irrlicht/CEGLManager.cpp b/source/Irrlicht/CEGLManager.cpp index ae4ce711a..1a5b8f289 100644 --- a/source/Irrlicht/CEGLManager.cpp +++ b/source/Irrlicht/CEGLManager.cpp @@ -213,7 +213,7 @@ EGLConfig CEGLManager::chooseConfig(EConfigStyle confStyle) // while (!eglChooseConfig(EglDisplay, Attribs, &configResult, 1, &numConfigs) || !numConfigs) { switch (steps) { - case 5: // samples + case 5: // samples if (Attribs[19] > 2) // Params.AntiAlias --Attribs[19]; else { @@ -222,7 +222,7 @@ EGLConfig CEGLManager::chooseConfig(EConfigStyle confStyle) --steps; } break; - case 4: // alpha + case 4: // alpha if (Attribs[7]) { // Params.WithAlphaChannel Attribs[7] = 0; @@ -234,7 +234,7 @@ EGLConfig CEGLManager::chooseConfig(EConfigStyle confStyle) } else --steps; break; - case 3: // stencil + case 3: // stencil if (Attribs[15]) { // Params.Stencilbuffer Attribs[15] = 0; @@ -246,13 +246,13 @@ EGLConfig CEGLManager::chooseConfig(EConfigStyle confStyle) } else --steps; break; - case 2: // depth size + case 2: // depth size if (Attribs[13] > 16) { // Params.ZBufferBits Attribs[13] -= 8; } else --steps; break; - case 1: // buffer size + case 1: // buffer size if (Attribs[9] > 16) { // Params.Bits Attribs[9] -= 8; } else diff --git a/source/Irrlicht/CFileSystem.cpp b/source/Irrlicht/CFileSystem.cpp index e41d88b39..3b3f434ad 100644 --- a/source/Irrlicht/CFileSystem.cpp +++ b/source/Irrlicht/CFileSystem.cpp @@ -21,7 +21,7 @@ #if defined(_IRR_WINDOWS_API_) #include // for _chdir -#include // for _access +#include // for _access #include #elif (defined(_IRR_POSIX_API_) || defined(_IRR_OSX_PLATFORM_) || defined(_IRR_ANDROID_PLATFORM_)) #include diff --git a/source/Irrlicht/CGLXManager.cpp b/source/Irrlicht/CGLXManager.cpp index f93f1b7e8..3c51a8d18 100644 --- a/source/Irrlicht/CGLXManager.cpp +++ b/source/Irrlicht/CGLXManager.cpp @@ -87,9 +87,9 @@ CGLXManager::CGLXManager(const SIrrlichtCreationParameters ¶ms, const SExpos Params.AntiAlias, // 18,19 #endif // #ifdef GL_ARB_framebuffer_sRGB - // GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB, Params.HandleSRGB, + // GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB, Params.HandleSRGB, // #elif defined(GL_EXT_framebuffer_sRGB) - // GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT, Params.HandleSRGB, + // GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT, Params.HandleSRGB, // #endif GLX_STEREO, Params.Stereobuffer ? True : False, @@ -213,11 +213,11 @@ CGLXManager::CGLXManager(const SIrrlichtCreationParameters ¶ms, const SExpos // either present or not. As a no-op we use // GLX_USE_GL, which is silently ignored by glXChooseVisual Params.Doublebuffer ? GLX_DOUBLEBUFFER : GLX_USE_GL, // 14 - Params.Stereobuffer ? GLX_STEREO : GLX_USE_GL, // 15 + Params.Stereobuffer ? GLX_STEREO : GLX_USE_GL, // 15 // #ifdef GL_ARB_framebuffer_sRGB - // Params.HandleSRGB?GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB:GLX_USE_GL, + // Params.HandleSRGB?GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB:GLX_USE_GL, // #elif defined(GL_EXT_framebuffer_sRGB) - // Params.HandleSRGB?GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT:GLX_USE_GL, + // Params.HandleSRGB?GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT:GLX_USE_GL, // #endif None}; diff --git a/source/Irrlicht/CGLXManager.h b/source/Irrlicht/CGLXManager.h index e39a07678..aa6cabcd3 100644 --- a/source/Irrlicht/CGLXManager.h +++ b/source/Irrlicht/CGLXManager.h @@ -68,7 +68,7 @@ class CGLXManager : public IContextManager SExposedVideoData CurrentContext; XVisualInfo *VisualInfo; void *glxFBConfig; // GLXFBConfig - XID GlxWin; // GLXWindow + XID GlxWin; // GLXWindow }; } } diff --git a/source/Irrlicht/CGUIEditBox.cpp b/source/Irrlicht/CGUIEditBox.cpp index e81b565ee..c40224788 100644 --- a/source/Irrlicht/CGUIEditBox.cpp +++ b/source/Irrlicht/CGUIEditBox.cpp @@ -1358,7 +1358,7 @@ void CGUIEditBox::calculateScrollPos() irr::u32 cursorWidth = font->getDimension(CursorChar.c_str()).Width; core::stringw *txtLine = hasBrokenText ? &BrokenText[cursLine] : &Text; s32 cPos = hasBrokenText ? CursorPos - BrokenTextPositions[cursLine] : CursorPos; // column - s32 cStart = font->getDimension(txtLine->subString(0, cPos).c_str()).Width; // pixels from text-start + s32 cStart = font->getDimension(txtLine->subString(0, cPos).c_str()).Width; // pixels from text-start s32 cEnd = cStart + cursorWidth; s32 txtWidth = font->getDimension(txtLine->c_str()).Width; @@ -1376,7 +1376,7 @@ void CGUIEditBox::calculateScrollPos() setTextRect(cursLine); // TODO: should show more characters to the left when we're scrolling left - // and the cursor reaches the border. + // and the cursor reaches the border. } else if (CurrentTextRect.UpperLeftCorner.X + cEnd > FrameRect.LowerRightCorner.X) { // cursor to the right of the clipping area HScrollPos += (CurrentTextRect.UpperLeftCorner.X + cEnd) - FrameRect.LowerRightCorner.X; diff --git a/source/Irrlicht/CGUIFont.cpp b/source/Irrlicht/CGUIFont.cpp index f742170a8..504f7dd9d 100644 --- a/source/Irrlicht/CGUIFont.cpp +++ b/source/Irrlicht/CGUIFont.cpp @@ -110,14 +110,14 @@ bool CGUIFont::load(io::IXMLReader* xml, const io::path& directory) SGUISprite s; core::rect rectangle; - a.underhang = xml->getAttributeValueAsInt(L"u"); - a.overhang = xml->getAttributeValueAsInt(L"o"); - a.spriteno = SpriteBank->getSprites().size(); - s32 texno = xml->getAttributeValueAsInt(L"i"); + a.underhang = xml->getAttributeValueAsInt(L"u"); + a.overhang = xml->getAttributeValueAsInt(L"o"); + a.spriteno = SpriteBank->getSprites().size(); + s32 texno = xml->getAttributeValueAsInt(L"i"); // parse rectangle - core::stringc rectstr = xml->getAttributeValue(L"r"); - wchar_t ch = xml->getAttributeValue(L"c")[0]; + core::stringc rectstr = xml->getAttributeValue(L"r"); + wchar_t ch = xml->getAttributeValue(L"c")[0]; const c8 *c = rectstr.c_str(); s32 val; diff --git a/source/Irrlicht/CGUISkin.cpp b/source/Irrlicht/CGUISkin.cpp index 849760925..e30384078 100644 --- a/source/Irrlicht/CGUISkin.cpp +++ b/source/Irrlicht/CGUISkin.cpp @@ -66,8 +66,8 @@ CGUISkin::CGUISkin(EGUI_SKIN_TYPE type, video::IVideoDriver *driver) : } else { // 0x80a6a8af Colors[EGDC_3D_DARK_SHADOW] = 0x60767982; - // Colors[EGDC_3D_FACE] = 0xc0c9ccd4; // tab background - Colors[EGDC_3D_FACE] = 0xc0cbd2d9; // tab background + // Colors[EGDC_3D_FACE] = 0xc0c9ccd4; // tab background + Colors[EGDC_3D_FACE] = 0xc0cbd2d9; // tab background Colors[EGDC_3D_SHADOW] = 0x50e4e8f1; // tab background, and left-top highlight Colors[EGDC_3D_HIGH_LIGHT] = 0x40c7ccdc; Colors[EGDC_3D_LIGHT] = 0x802e313a; @@ -282,7 +282,7 @@ void CGUISkin::setDefaultText(EGUI_DEFAULT_TEXT which, const wchar_t *newText) } //! draws a standard 3d button pane -/** Used for drawing for example buttons in normal state. +/** Used for drawing for example buttons in normal state. It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details. \param rect: Defining area where to draw. @@ -332,7 +332,7 @@ void CGUISkin::draw3DButtonPaneStandard(IGUIElement *element, } //! draws a pressed 3d button pane -/** Used for drawing for example buttons in pressed state. +/** Used for drawing for example buttons in pressed state. It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details. \param rect: Defining area where to draw. @@ -379,7 +379,7 @@ implementations to find out how to draw the part exactly. \param flat: Specifies if the sunken pane should be flat or displayed as sunken deep into the ground. \param rect: Defining area where to draw. -\param clip: Clip area. */ +\param clip: Clip area. */ void CGUISkin::draw3DSunkenPane(IGUIElement *element, video::SColor bgcolor, bool flat, bool fillBackGround, const core::rect &r, @@ -562,7 +562,7 @@ core::rect CGUISkin::draw3DWindowBackground(IGUIElement *element, } else { // draw title bar // if (!UseGradient) - // Driver->draw2DRectangle(titleBarColor, rect, clip); + // Driver->draw2DRectangle(titleBarColor, rect, clip); // else if (Type == EGST_BURNING_SKIN) { const video::SColor c = titleBarColor.getInterpolated(video::SColor(titleBarColor.getAlpha(), 255, 255, 255), 0.8f); @@ -578,14 +578,14 @@ core::rect CGUISkin::draw3DWindowBackground(IGUIElement *element, } //! draws a standard 3d menu pane -/** Used for drawing for menus and context menus. +/** Used for drawing for menus and context menus. It uses the colors EGDC_3D_DARK_SHADOW, EGDC_3D_HIGH_LIGHT, EGDC_3D_SHADOW and EGDC_3D_FACE for this. See EGUI_DEFAULT_COLOR for details. \param element: Pointer to the element which wishes to draw this. This parameter is usually not used by ISkin, but can be used for example by more complex implementations to find out how to draw the part exactly. \param rect: Defining area where to draw. -\param clip: Clip area. */ +\param clip: Clip area. */ void CGUISkin::draw3DMenuPane(IGUIElement *element, const core::rect &r, const core::rect *clip) { @@ -655,12 +655,12 @@ void CGUISkin::draw3DMenuPane(IGUIElement *element, } //! draws a standard 3d tool bar -/** Used for drawing for toolbars and menus. +/** Used for drawing for toolbars and menus. \param element: Pointer to the element which wishes to draw this. This parameter is usually not used by ISkin, but can be used for example by more complex implementations to find out how to draw the part exactly. \param rect: Defining area where to draw. -\param clip: Clip area. */ +\param clip: Clip area. */ void CGUISkin::draw3DToolBar(IGUIElement *element, const core::rect &r, const core::rect *clip) @@ -695,13 +695,13 @@ void CGUISkin::draw3DToolBar(IGUIElement *element, } //! draws a tab button -/** Used for drawing for tab buttons on top of tabs. +/** Used for drawing for tab buttons on top of tabs. \param element: Pointer to the element which wishes to draw this. This parameter is usually not used by ISkin, but can be used for example by more complex implementations to find out how to draw the part exactly. \param active: Specifies if the tab is currently active. \param rect: Defining area where to draw. -\param clip: Clip area. */ +\param clip: Clip area. */ void CGUISkin::draw3DTabButton(IGUIElement *element, bool active, const core::rect &frameRect, const core::rect *clip, EGUI_ALIGNMENT alignment) { @@ -772,13 +772,13 @@ void CGUISkin::draw3DTabButton(IGUIElement *element, bool active, } //! draws a tab control body -/** \param element: Pointer to the element which wishes to draw this. This parameter +/** \param element: Pointer to the element which wishes to draw this. This parameter is usually not used by ISkin, but can be used for example by more complex implementations to find out how to draw the part exactly. \param border: Specifies if the border should be drawn. \param background: Specifies if the background should be drawn. \param rect: Defining area where to draw. -\param clip: Clip area. */ +\param clip: Clip area. */ void CGUISkin::draw3DTabBody(IGUIElement *element, bool border, bool background, const core::rect &rect, const core::rect *clip, s32 tabHeight, EGUI_ALIGNMENT alignment) { @@ -852,7 +852,7 @@ void CGUISkin::draw3DTabBody(IGUIElement *element, bool border, bool background, } //! draws an icon, usually from the skin's sprite bank -/** \param parent: Pointer to the element which wishes to draw this icon. +/** \param parent: Pointer to the element which wishes to draw this icon. This parameter is usually not used by IGUISkin, but can be used for example by more complex implementations to find out how to draw the part exactly. \param icon: Specifies the icon to be drawn. @@ -860,7 +860,7 @@ by more complex implementations to find out how to draw the part exactly. \param starttime: The time at the start of the animation \param currenttime: The present time, used to calculate the frame number \param loop: Whether the animation should loop or not -\param clip: Clip area. */ +\param clip: Clip area. */ void CGUISkin::drawIcon(IGUIElement *element, EGUI_DEFAULT_ICON icon, const core::position2di position, u32 starttime, u32 currenttime, diff --git a/source/Irrlicht/CGUISkin.h b/source/Irrlicht/CGUISkin.h index 130e5fada..000f62d22 100644 --- a/source/Irrlicht/CGUISkin.h +++ b/source/Irrlicht/CGUISkin.h @@ -104,7 +104,7 @@ class CGUISkin : public IGUISkin \param flat: Specifies if the sunken pane should be flat or displayed as sunken deep into the ground. \param rect: Defining area where to draw. - \param clip: Clip area. */ + \param clip: Clip area. */ virtual void draw3DSunkenPane(IGUIElement *element, video::SColor bgcolor, bool flat, bool fillBackGround, @@ -139,7 +139,7 @@ class CGUISkin : public IGUISkin is usually not used by ISkin, but can be used for example by more complex implementations to find out how to draw the part exactly. \param rect: Defining area where to draw. - \param clip: Clip area. */ + \param clip: Clip area. */ virtual void draw3DMenuPane(IGUIElement *element, const core::rect &rect, const core::rect *clip = 0) override; @@ -150,7 +150,7 @@ class CGUISkin : public IGUISkin is usually not used by ISkin, but can be used for example by more complex implementations to find out how to draw the part exactly. \param rect: Defining area where to draw. - \param clip: Clip area. */ + \param clip: Clip area. */ virtual void draw3DToolBar(IGUIElement *element, const core::rect &rect, const core::rect *clip = 0) override; @@ -162,7 +162,7 @@ class CGUISkin : public IGUISkin implementations to find out how to draw the part exactly. \param active: Specifies if the tab is currently active. \param rect: Defining area where to draw. - \param clip: Clip area. */ + \param clip: Clip area. */ virtual void draw3DTabButton(IGUIElement *element, bool active, const core::rect &rect, const core::rect *clip = 0, EGUI_ALIGNMENT alignment = EGUIA_UPPERLEFT) override; @@ -174,7 +174,7 @@ class CGUISkin : public IGUISkin \param border: Specifies if the border should be drawn. \param background: Specifies if the background should be drawn. \param rect: Defining area where to draw. - \param clip: Clip area. */ + \param clip: Clip area. */ virtual void draw3DTabBody(IGUIElement *element, bool border, bool background, const core::rect &rect, const core::rect *clip = 0, s32 tabHeight = -1, EGUI_ALIGNMENT alignment = EGUIA_UPPERLEFT) override; @@ -188,7 +188,7 @@ class CGUISkin : public IGUISkin \param starttime: The time at the start of the animation \param currenttime: The present time, used to calculate the frame number \param loop: Whether the animation should loop or not - \param clip: Clip area. */ + \param clip: Clip area. */ virtual void drawIcon(IGUIElement *element, EGUI_DEFAULT_ICON icon, const core::position2di position, u32 starttime = 0, u32 currenttime = 0, diff --git a/source/Irrlicht/CGUITabControl.cpp b/source/Irrlicht/CGUITabControl.cpp index 3e02773db..e69490621 100644 --- a/source/Irrlicht/CGUITabControl.cpp +++ b/source/Irrlicht/CGUITabControl.cpp @@ -370,8 +370,8 @@ bool CGUITabControl::OnEvent(const SEvent &event) case EET_MOUSE_INPUT_EVENT: switch (event.MouseInput.Event) { // case EMIE_LMOUSE_PRESSED_DOWN: - // // todo: dragging tabs around - // return true; + // // todo: dragging tabs around + // return true; case EMIE_LMOUSE_LEFT_UP: { s32 idx = getTabAt(event.MouseInput.X, event.MouseInput.Y); if (idx >= 0) { diff --git a/source/Irrlicht/CImageLoaderBMP.h b/source/Irrlicht/CImageLoaderBMP.h index e7ef8ed2b..be8ee8656 100644 --- a/source/Irrlicht/CImageLoaderBMP.h +++ b/source/Irrlicht/CImageLoaderBMP.h @@ -16,12 +16,12 @@ namespace video struct SBMPHeader { - u16 Id; // BM - Windows 3.1x, 95, NT, 98, 2000, ME, XP - // BA - OS/2 Bitmap Array - // CI - OS/2 Color Icon - // CP - OS/2 Color Pointer - // IC - OS/2 Icon - // PT - OS/2 Pointer + u16 Id; // BM - Windows 3.1x, 95, NT, 98, 2000, ME, XP + // BA - OS/2 Bitmap Array + // CI - OS/2 Color Icon + // CP - OS/2 Color Pointer + // IC - OS/2 Icon + // PT - OS/2 Pointer u32 FileSize; u32 Reserved; u32 BitmapDataOffset; diff --git a/source/Irrlicht/CImageLoaderJPG.cpp b/source/Irrlicht/CImageLoaderJPG.cpp index e64c458e7..80b573bf0 100644 --- a/source/Irrlicht/CImageLoaderJPG.cpp +++ b/source/Irrlicht/CImageLoaderJPG.cpp @@ -235,9 +235,9 @@ IImage *CImageLoaderJPG::loadImage(io::IReadFile *file) const if (data) { for (u32 i = 0, j = 0; i < size; i += 3, j += 4) { // Also works without K, but has more contrast with K multiplied in - // data[i+0] = output[j+2]; - // data[i+1] = output[j+1]; - // data[i+2] = output[j+0]; + // data[i+0] = output[j+2]; + // data[i+1] = output[j+1]; + // data[i+2] = output[j+0]; data[i + 0] = (char)(output[j + 2] * (output[j + 3] / 255.f)); data[i + 1] = (char)(output[j + 1] * (output[j + 3] / 255.f)); data[i + 2] = (char)(output[j + 0] * (output[j + 3] / 255.f)); diff --git a/source/Irrlicht/CImageLoaderJPG.h b/source/Irrlicht/CImageLoaderJPG.h index 77c8a967d..5fd534d98 100644 --- a/source/Irrlicht/CImageLoaderJPG.h +++ b/source/Irrlicht/CImageLoaderJPG.h @@ -6,7 +6,7 @@ #include "IImageLoader.h" -#include // required for jpeglib.h +#include // required for jpeglib.h #include // use system lib #include diff --git a/source/Irrlicht/CImageLoaderTGA.cpp b/source/Irrlicht/CImageLoaderTGA.cpp index 68512f119..d3292ec08 100644 --- a/source/Irrlicht/CImageLoaderTGA.cpp +++ b/source/Irrlicht/CImageLoaderTGA.cpp @@ -149,9 +149,9 @@ IImage *CImageLoaderTGA::loadImage(io::IReadFile *file) const u8 *data = 0; - if (header.ImageType == 1 || // Uncompressed, color-mapped images. + if (header.ImageType == 1 || // Uncompressed, color-mapped images. header.ImageType == 2 || // Uncompressed, RGB images - header.ImageType == 3 // Uncompressed, black and white images + header.ImageType == 3 // Uncompressed, black and white images ) { const s32 imageSize = header.ImageHeight * header.ImageWidth * (header.PixelDepth / 8); data = new u8[imageSize]; diff --git a/source/Irrlicht/CImageWriterJPG.cpp b/source/Irrlicht/CImageWriterJPG.cpp index 5552c35ab..bf735854e 100644 --- a/source/Irrlicht/CImageWriterJPG.cpp +++ b/source/Irrlicht/CImageWriterJPG.cpp @@ -27,7 +27,7 @@ typedef struct { struct jpeg_destination_mgr pub; /* public fields */ - io::IWriteFile *file; /* target file */ + io::IWriteFile *file; /* target file */ JOCTET buffer[OUTPUT_BUF_SIZE]; /* image buffer */ } mem_destination_mgr; diff --git a/source/Irrlicht/CIrrDeviceLinux.cpp b/source/Irrlicht/CIrrDeviceLinux.cpp index a2cf4bb06..8b5fdbd5c 100644 --- a/source/Irrlicht/CIrrDeviceLinux.cpp +++ b/source/Irrlicht/CIrrDeviceLinux.cpp @@ -341,7 +341,7 @@ void CIrrDeviceLinux::setupTopLevelXorgWindow() void IrrPrintXGrabError(int grabResult, const c8 *grabCommand) { if (grabResult == GrabSuccess) { - // os::Printer::log(grabCommand, "GrabSuccess", ELL_INFORMATION); + // os::Printer::log(grabCommand, "GrabSuccess", ELL_INFORMATION); return; } @@ -407,7 +407,7 @@ bool CIrrDeviceLinux::createWindow() // create visual with standard X methods os::Printer::log("Using plain X visual"); XVisualInfo visTempl; // Template to hold requested values - int visNumber; // Return value of available visuals + int visNumber; // Return value of available visuals visTempl.screen = Screennr; // ARGB visuals should be avoided for usual applications @@ -1438,18 +1438,18 @@ void CIrrDeviceLinux::createKeyMap() KeyMap.push_back(SKeyMap(XK_quotedbl, 0)); //? KeyMap.push_back(SKeyMap(XK_section, 0)); //? KeyMap.push_back(SKeyMap(XK_numbersign, KEY_OEM_2)); - KeyMap.push_back(SKeyMap(XK_dollar, 0)); //? - KeyMap.push_back(SKeyMap(XK_percent, 0)); //? + KeyMap.push_back(SKeyMap(XK_dollar, 0)); //? + KeyMap.push_back(SKeyMap(XK_percent, 0)); //? KeyMap.push_back(SKeyMap(XK_ampersand, 0)); //? KeyMap.push_back(SKeyMap(XK_apostrophe, KEY_OEM_7)); - KeyMap.push_back(SKeyMap(XK_parenleft, 0)); //? - KeyMap.push_back(SKeyMap(XK_parenright, 0)); //? - KeyMap.push_back(SKeyMap(XK_asterisk, 0)); //? - KeyMap.push_back(SKeyMap(XK_plus, KEY_PLUS)); //? - KeyMap.push_back(SKeyMap(XK_comma, KEY_COMMA)); //? - KeyMap.push_back(SKeyMap(XK_minus, KEY_MINUS)); //? + KeyMap.push_back(SKeyMap(XK_parenleft, 0)); //? + KeyMap.push_back(SKeyMap(XK_parenright, 0)); //? + KeyMap.push_back(SKeyMap(XK_asterisk, 0)); //? + KeyMap.push_back(SKeyMap(XK_plus, KEY_PLUS)); //? + KeyMap.push_back(SKeyMap(XK_comma, KEY_COMMA)); //? + KeyMap.push_back(SKeyMap(XK_minus, KEY_MINUS)); //? KeyMap.push_back(SKeyMap(XK_period, KEY_PERIOD)); //? - KeyMap.push_back(SKeyMap(XK_slash, KEY_OEM_2)); //? + KeyMap.push_back(SKeyMap(XK_slash, KEY_OEM_2)); //? KeyMap.push_back(SKeyMap(XK_0, KEY_KEY_0)); KeyMap.push_back(SKeyMap(XK_1, KEY_KEY_1)); KeyMap.push_back(SKeyMap(XK_2, KEY_KEY_2)); @@ -1464,11 +1464,11 @@ void CIrrDeviceLinux::createKeyMap() KeyMap.push_back(SKeyMap(XK_semicolon, KEY_OEM_1)); KeyMap.push_back(SKeyMap(XK_less, KEY_OEM_102)); KeyMap.push_back(SKeyMap(XK_equal, KEY_PLUS)); - KeyMap.push_back(SKeyMap(XK_greater, 0)); //? - KeyMap.push_back(SKeyMap(XK_question, 0)); //? + KeyMap.push_back(SKeyMap(XK_greater, 0)); //? + KeyMap.push_back(SKeyMap(XK_question, 0)); //? KeyMap.push_back(SKeyMap(XK_at, KEY_KEY_2)); //? - KeyMap.push_back(SKeyMap(XK_mu, 0)); //? - KeyMap.push_back(SKeyMap(XK_EuroSign, 0)); //? + KeyMap.push_back(SKeyMap(XK_mu, 0)); //? + KeyMap.push_back(SKeyMap(XK_EuroSign, 0)); //? KeyMap.push_back(SKeyMap(XK_A, KEY_KEY_A)); KeyMap.push_back(SKeyMap(XK_B, KEY_KEY_B)); KeyMap.push_back(SKeyMap(XK_C, KEY_KEY_C)); @@ -1500,7 +1500,7 @@ void CIrrDeviceLinux::createKeyMap() KeyMap.push_back(SKeyMap(XK_bracketright, KEY_OEM_6)); KeyMap.push_back(SKeyMap(XK_asciicircum, KEY_OEM_5)); KeyMap.push_back(SKeyMap(XK_dead_circumflex, KEY_OEM_5)); - KeyMap.push_back(SKeyMap(XK_degree, 0)); //? + KeyMap.push_back(SKeyMap(XK_degree, 0)); //? KeyMap.push_back(SKeyMap(XK_underscore, KEY_MINUS)); //? KeyMap.push_back(SKeyMap(XK_grave, KEY_OEM_3)); KeyMap.push_back(SKeyMap(XK_dead_grave, KEY_OEM_3)); @@ -1636,8 +1636,8 @@ void CIrrDeviceLinux::pollJoysticks() struct joystick js; if (read(info.fd, &js, sizeof(js)) == sizeof(js)) { info.persistentData.JoystickEvent.ButtonStates = js.b1 | (js.b2 << 1); /* should be a two-bit field */ - info.persistentData.JoystickEvent.Axis[0] = js.x; /* X axis */ - info.persistentData.JoystickEvent.Axis[1] = js.y; /* Y axis */ + info.persistentData.JoystickEvent.Axis[0] = js.x; /* X axis */ + info.persistentData.JoystickEvent.Axis[1] = js.y; /* Y axis */ } #else struct js_event event; @@ -1720,16 +1720,16 @@ const c8 *CIrrDeviceLinux::getTextFromSelection(Atom selection, core::stringc &t unsigned long numItems, bytesLeft, dummy; unsigned char *data = nullptr; XGetWindowProperty(XDisplay, XWindow, - property_set, // property name - 0, // offset - 0, // length (we only check for data, so 0) - 0, // Delete 0==false + property_set, // property name + 0, // offset + 0, // length (we only check for data, so 0) + 0, // Delete 0==false AnyPropertyType, // AnyPropertyType or property identifier - &type, // return type - &format, // return format - &numItems, // number items - &bytesLeft, // remaining bytes for partial reads - &data); // data + &type, // return type + &format, // return format + &numItems, // number items + &bytesLeft, // remaining bytes for partial reads + &data); // data if (data) { XFree(data); data = nullptr; @@ -1827,7 +1827,7 @@ void CIrrDeviceLinux::copyToPrimarySelection(const c8 *text) const Bool PredicateIsEventType(Display *display, XEvent *event, XPointer arg) { if (event && event->type == *(int *)arg) { - // os::Printer::log("remove event", core::stringc((int)arg).c_str(), ELL_INFORMATION); + // os::Printer::log("remove event", core::stringc((int)arg).c_str(), ELL_INFORMATION); return True; } return False; @@ -1935,11 +1935,11 @@ void CIrrDeviceLinux::initXInput2() Cursor CIrrDeviceLinux::TextureToMonochromeCursor(irr::video::ITexture *tex, const core::rect &sourceRect, const core::position2d &hotspot) { XImage *sourceImage = XCreateImage(XDisplay, VisualInfo->visual, - 1, // depth, + 1, // depth, ZPixmap, // XYBitmap (depth=1), ZPixmap(depth=x) 0, 0, sourceRect.getWidth(), sourceRect.getHeight(), 32, // bitmap_pad, - 0 // bytes_per_line (0 means continuous in memory) + 0 // bytes_per_line (0 means continuous in memory) ); sourceImage->data = new char[sourceImage->height * sourceImage->bytes_per_line]; XImage *maskImage = XCreateImage(XDisplay, VisualInfo->visual, @@ -1947,7 +1947,7 @@ Cursor CIrrDeviceLinux::TextureToMonochromeCursor(irr::video::ITexture *tex, con ZPixmap, 0, 0, sourceRect.getWidth(), sourceRect.getHeight(), 32, // bitmap_pad, - 0 // bytes_per_line + 0 // bytes_per_line ); maskImage->data = new char[maskImage->height * maskImage->bytes_per_line]; @@ -2144,10 +2144,10 @@ void CIrrDeviceLinux::CCursorControl::initCursors() Cursors.push_back(CursorX11(XCreateFontCursor(Device->XDisplay, XC_question_arrow))); Cursors.push_back(CursorX11(XCreateFontCursor(Device->XDisplay, XC_xterm))); Cursors.push_back(CursorX11(XCreateFontCursor(Device->XDisplay, XC_X_cursor))); // (or XC_pirate?) - Cursors.push_back(CursorX11(XCreateFontCursor(Device->XDisplay, XC_watch))); // (or XC_clock?) + Cursors.push_back(CursorX11(XCreateFontCursor(Device->XDisplay, XC_watch))); // (or XC_clock?) Cursors.push_back(CursorX11(XCreateFontCursor(Device->XDisplay, XC_fleur))); Cursors.push_back(CursorX11(XCreateFontCursor(Device->XDisplay, XC_top_right_corner))); // NESW not available in X11 - Cursors.push_back(CursorX11(XCreateFontCursor(Device->XDisplay, XC_top_left_corner))); // NWSE not available in X11 + Cursors.push_back(CursorX11(XCreateFontCursor(Device->XDisplay, XC_top_left_corner))); // NWSE not available in X11 Cursors.push_back(CursorX11(XCreateFontCursor(Device->XDisplay, XC_sb_v_double_arrow))); Cursors.push_back(CursorX11(XCreateFontCursor(Device->XDisplay, XC_sb_h_double_arrow))); Cursors.push_back(CursorX11(XCreateFontCursor(Device->XDisplay, XC_sb_up_arrow))); // (or XC_center_ptr?) diff --git a/source/Irrlicht/CIrrDeviceOSX.mm b/source/Irrlicht/CIrrDeviceOSX.mm index 54edf116b..788d47159 100644 --- a/source/Irrlicht/CIrrDeviceOSX.mm +++ b/source/Irrlicht/CIrrDeviceOSX.mm @@ -39,8 +39,8 @@ struct JoystickComponent { IOHIDElementCookie cookie; // unique value which identifies element, will NOT change - long min; // reported min value possible - long max; // reported max value possible + long min; // reported min value possible + long max; // reported max value possible long minRead; // min read value long maxRead; // max read value @@ -67,7 +67,7 @@ IOHIDDeviceInterface **interface; bool removed; char joystickName[256]; - long usage; // usage page from IOUSBHID Parser.h which defines general usage + long usage; // usage page from IOUSBHID Parser.h which defines general usage long usagePage; // usage within above page from IOUSBHID Parser.h which defines specific usage JoystickInfo() : @@ -275,18 +275,18 @@ static void getJoystickDeviceInfo(io_object_t hidDevice, CFMutableDictionaryRef /* * Summary: - * Virtual keycodes + * Virtual keycodes * * Discussion: - * These constants are the virtual keycodes defined originally in - * Inside Mac Volume V, pg. V-191. They identify physical keys on a - * keyboard. Those constants with "ANSI" in the name are labeled - * according to the key position on an ANSI-standard US keyboard. - * For example, kVK_ANSI_A indicates the virtual keycode for the key - * with the letter 'A' in the US keyboard layout. Other keyboard - * layouts may have the 'A' key label on a different physical key; - * in this case, pressing 'A' will generate a different virtual - * keycode. + * These constants are the virtual keycodes defined originally in + * Inside Mac Volume V, pg. V-191. They identify physical keys on a + * keyboard. Those constants with "ANSI" in the name are labeled + * according to the key position on an ANSI-standard US keyboard. + * For example, kVK_ANSI_A indicates the virtual keycode for the key + * with the letter 'A' in the US keyboard layout. Other keyboard + * layouts may have the 'A' key label on a different physical key; + * in this case, pressing 'A' will generate a different virtual + * keycode. */ enum { @@ -1365,9 +1365,9 @@ static void joystickRemovalCallback(void *target, ++jindex; // if (info.hatComp.size()) - // returnInfo.PovHat = SJoystickInfo::POV_HAT_PRESENT; + // returnInfo.PovHat = SJoystickInfo::POV_HAT_PRESENT; // else - // returnInfo.PovHat = SJoystickInfo::POV_HAT_ABSENT; + // returnInfo.PovHat = SJoystickInfo::POV_HAT_ABSENT; joystickInfo.push_back(returnInfo); } diff --git a/source/Irrlicht/CIrrDeviceSDL.cpp b/source/Irrlicht/CIrrDeviceSDL.cpp index 7866d5b6b..8a7949a52 100644 --- a/source/Irrlicht/CIrrDeviceSDL.cpp +++ b/source/Irrlicht/CIrrDeviceSDL.cpp @@ -517,7 +517,7 @@ bool CIrrDeviceSDL::run() SDL_Event SDL_event; while (!Close && SDL_PollEvent(&SDL_event)) { - // os::Printer::log("event: ", core::stringc((int)SDL_event.type).c_str(), ELL_INFORMATION); // just for debugging + // os::Printer::log("event: ", core::stringc((int)SDL_event.type).c_str(), ELL_INFORMATION); // just for debugging switch (SDL_event.type) { case SDL_MOUSEMOTION: { @@ -1128,7 +1128,7 @@ void CIrrDeviceSDL::createKeyMap() KeyMap.push_back(SKeyMap(SDLK_KP_9, KEY_NUMPAD9)); KeyMap.push_back(SKeyMap(SDLK_KP_MULTIPLY, KEY_MULTIPLY)); KeyMap.push_back(SKeyMap(SDLK_KP_PLUS, KEY_ADD)); - // KeyMap.push_back(SKeyMap(SDLK_KP_, KEY_SEPARATOR)); + // KeyMap.push_back(SKeyMap(SDLK_KP_, KEY_SEPARATOR)); KeyMap.push_back(SKeyMap(SDLK_KP_MINUS, KEY_SUBTRACT)); KeyMap.push_back(SKeyMap(SDLK_KP_PERIOD, KEY_DECIMAL)); KeyMap.push_back(SKeyMap(SDLK_KP_DIVIDE, KEY_DIVIDE)); @@ -1173,19 +1173,19 @@ void CIrrDeviceSDL::CCursorControl::initCursors() { Cursors.reserve(gui::ECI_COUNT); - Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_ARROW)); // ECI_NORMAL + Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_ARROW)); // ECI_NORMAL Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_CROSSHAIR)); // ECI_CROSS - Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_HAND)); // ECI_HAND - Cursors.emplace_back(nullptr); // ECI_HELP - Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_IBEAM)); // ECI_IBEAM - Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_NO)); // ECI_NO - Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_WAIT)); // ECI_WAIT + Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_HAND)); // ECI_HAND + Cursors.emplace_back(nullptr); // ECI_HELP + Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_IBEAM)); // ECI_IBEAM + Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_NO)); // ECI_NO + Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_WAIT)); // ECI_WAIT Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZEALL)); // ECI_SIZEALL Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENESW)); // ECI_SIZENESW Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENWSE)); // ECI_SIZENWSE - Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENS)); // ECI_SIZENS - Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZEWE)); // ECI_SIZEWE - Cursors.emplace_back(nullptr); // ECI_UP + Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENS)); // ECI_SIZENS + Cursors.emplace_back(SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZEWE)); // ECI_SIZEWE + Cursors.emplace_back(nullptr); // ECI_UP } } // end namespace irr diff --git a/source/Irrlicht/CIrrDeviceWin32.cpp b/source/Irrlicht/CIrrDeviceWin32.cpp index 5b8dde763..7986a467a 100644 --- a/source/Irrlicht/CIrrDeviceWin32.cpp +++ b/source/Irrlicht/CIrrDeviceWin32.cpp @@ -799,8 +799,8 @@ CIrrDeviceWin32::CIrrDeviceWin32(const SIrrlichtCreationParameters ¶ms) : } CreationParams.WindowId = HWnd; - // CreationParams.WindowSize.Width = realWidth; - // CreationParams.WindowSize.Height = realHeight; + // CreationParams.WindowSize.Width = realWidth; + // CreationParams.WindowSize.Height = realHeight; ShowWindow(HWnd, SW_SHOWNORMAL); UpdateWindow(HWnd); diff --git a/source/Irrlicht/CIrrDeviceWin32.h b/source/Irrlicht/CIrrDeviceWin32.h index 3ac36fd24..946a7804a 100644 --- a/source/Irrlicht/CIrrDeviceWin32.h +++ b/source/Irrlicht/CIrrDeviceWin32.h @@ -136,7 +136,7 @@ class CIrrDeviceWin32 : public CIrrDeviceStub } #endif if ((visible && info.flags == CURSOR_SHOWING) || // visible - (!visible && info.flags == 0)) // hidden + (!visible && info.flags == 0)) // hidden { break; } diff --git a/source/Irrlicht/CLogger.h b/source/Irrlicht/CLogger.h index 8b1ca0481..00f05acc0 100644 --- a/source/Irrlicht/CLogger.h +++ b/source/Irrlicht/CLogger.h @@ -21,7 +21,7 @@ class CLogger : public ILogger //! Returns the current set log level. ELOG_LEVEL getLogLevel() const override; - //! Sets a new log level. void setLogLevel(ELOG_LEVEL ll) override; + //! Sets a new log level. void setLogLevel(ELOG_LEVEL ll) override; void setLogLevel(ELOG_LEVEL ll) override; //! Prints out a text into the log diff --git a/source/Irrlicht/CMeshCache.h b/source/Irrlicht/CMeshCache.h index 1c2b52686..bb23e5f09 100644 --- a/source/Irrlicht/CMeshCache.h +++ b/source/Irrlicht/CMeshCache.h @@ -20,7 +20,7 @@ class CMeshCache : public IMeshCache //! Adds a mesh to the internal list of loaded meshes. /** Usually, ISceneManager::getMesh() is called to load a mesh from file. That method searches the list of loaded meshes if a mesh has already been loaded and - returns a pointer to if it is in that list and already in memory. Otherwise it loads + returns a pointer to if it is in that list and already in memory. Otherwise it loads the mesh. With IMeshCache::addMesh(), it is possible to pretend that a mesh already has been loaded. This method can be used for example by mesh loaders who need to load more than one mesh with one call. They can add additional meshes with this @@ -57,12 +57,12 @@ class CMeshCache : public IMeshCache //! Get the name of a loaded mesh, based on its index. /** \param index: Index of the mesh, number between 0 and getMeshCount()-1. - \return The name if mesh was found and has a name, else the path is empty. */ + \return The name if mesh was found and has a name, else the path is empty. */ const io::SNamedPath &getMeshName(u32 index) const override; //! Get the name of a loaded mesh, if there is any. /** \param mesh Pointer to mesh to query. - \return The name if mesh was found and has a name, else the path is empty. */ + \return The name if mesh was found and has a name, else the path is empty. */ const io::SNamedPath &getMeshName(const IMesh *const mesh) const override; //! Renames a loaded mesh. diff --git a/source/Irrlicht/CNullDriver.cpp b/source/Irrlicht/CNullDriver.cpp index 7b630dbf2..698cfe319 100644 --- a/source/Irrlicht/CNullDriver.cpp +++ b/source/Irrlicht/CNullDriver.cpp @@ -54,16 +54,16 @@ CNullDriver::CNullDriver(io::IFileSystem *io, const core::dimension2d &scre DriverAttributes->addInt("MaxTextures", MATERIAL_MAX_TEXTURES); DriverAttributes->addInt("MaxSupportedTextures", MATERIAL_MAX_TEXTURES); DriverAttributes->addInt("MaxAnisotropy", 1); - // DriverAttributes->addInt("MaxUserClipPlanes", 0); - // DriverAttributes->addInt("MaxAuxBuffers", 0); + // DriverAttributes->addInt("MaxUserClipPlanes", 0); + // DriverAttributes->addInt("MaxAuxBuffers", 0); DriverAttributes->addInt("MaxMultipleRenderTargets", 1); DriverAttributes->addInt("MaxIndices", -1); DriverAttributes->addInt("MaxTextureSize", -1); - // DriverAttributes->addInt("MaxGeometryVerticesOut", 0); - // DriverAttributes->addFloat("MaxTextureLODBias", 0.f); + // DriverAttributes->addInt("MaxGeometryVerticesOut", 0); + // DriverAttributes->addFloat("MaxTextureLODBias", 0.f); DriverAttributes->addInt("Version", 1); - // DriverAttributes->addInt("ShaderLanguageVersion", 0); - // DriverAttributes->addInt("AntiAlias", 0); + // DriverAttributes->addInt("ShaderLanguageVersion", 0); + // DriverAttributes->addInt("AntiAlias", 0); setFog(); @@ -1867,10 +1867,10 @@ core::dimension2du CNullDriver::getMaxTextureSize() const bool CNullDriver::needsTransparentRenderPass(const irr::video::SMaterial &material) const { // TODO: I suspect it would be nice if the material had an enum for further control. - // Especially it probably makes sense to allow disabling transparent render pass as soon as material.ZWriteEnable is on. + // Especially it probably makes sense to allow disabling transparent render pass as soon as material.ZWriteEnable is on. // But then we might want an enum for the renderpass in material instead of just a transparency flag in material - and that's more work. // Or we could at least set return false when material.ZWriteEnable is EZW_ON? Still considering that... - // Be careful - this function is deeply connected to getWriteZBuffer as transparent render passes are usually about rendering with + // Be careful - this function is deeply connected to getWriteZBuffer as transparent render passes are usually about rendering with // zwrite disabled and getWriteZBuffer calls this function. video::IMaterialRenderer *rnd = getMaterialRenderer(material.MaterialType); diff --git a/source/Irrlicht/COGLES2Driver.cpp b/source/Irrlicht/COGLES2Driver.cpp index 3e5032ce2..4a18b9030 100644 --- a/source/Irrlicht/COGLES2Driver.cpp +++ b/source/Irrlicht/COGLES2Driver.cpp @@ -99,11 +99,11 @@ bool COGLES2Driver::genericDriverInit(const core::dimension2d &screenSize, DriverAttributes->setAttribute("MaxTextures", (s32)Feature.MaxTextureUnits); DriverAttributes->setAttribute("MaxSupportedTextures", (s32)Feature.MaxTextureUnits); - // DriverAttributes->setAttribute("MaxLights", MaxLights); + // DriverAttributes->setAttribute("MaxLights", MaxLights); DriverAttributes->setAttribute("MaxAnisotropy", MaxAnisotropy); - // DriverAttributes->setAttribute("MaxUserClipPlanes", MaxUserClipPlanes); - // DriverAttributes->setAttribute("MaxAuxBuffers", MaxAuxBuffers); - // DriverAttributes->setAttribute("MaxMultipleRenderTargets", MaxMultipleRenderTargets); + // DriverAttributes->setAttribute("MaxUserClipPlanes", MaxUserClipPlanes); + // DriverAttributes->setAttribute("MaxAuxBuffers", MaxAuxBuffers); + // DriverAttributes->setAttribute("MaxMultipleRenderTargets", MaxMultipleRenderTargets); DriverAttributes->setAttribute("MaxIndices", (s32)MaxIndices); DriverAttributes->setAttribute("MaxTextureSize", (s32)MaxTextureSize); DriverAttributes->setAttribute("MaxTextureLODBias", MaxTextureLODBias); @@ -1602,7 +1602,7 @@ void COGLES2Driver::setTextureRenderStates(const SMaterial &material, bool reset E_TEXTURE_MIN_FILTER minFilter = material.TextureLayers[i].MinFilter; glTexParameteri(tmpTextureType, GL_TEXTURE_MIN_FILTER, minFilter == ETMINF_NEAREST_MIPMAP_NEAREST ? GL_NEAREST_MIPMAP_NEAREST : minFilter == ETMINF_LINEAR_MIPMAP_NEAREST ? GL_LINEAR_MIPMAP_NEAREST - : minFilter == ETMINF_NEAREST_MIPMAP_LINEAR ? GL_NEAREST_MIPMAP_LINEAR + : minFilter == ETMINF_NEAREST_MIPMAP_LINEAR ? GL_NEAREST_MIPMAP_LINEAR : (assert(minFilter == ETMINF_LINEAR_MIPMAP_LINEAR), GL_LINEAR_MIPMAP_LINEAR)); tmpTexture->getStatesCache().MinFilter = minFilter; @@ -2157,8 +2157,8 @@ IImage *COGLES2Driver::createScreenShot(video::ECOLOR_FORMAT format, video::E_RE GLint internalformat = GL_RGBA; GLint type = GL_UNSIGNED_BYTE; { - // glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_FORMAT, &internalformat); - // glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_TYPE, &type); + // glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_FORMAT, &internalformat); + // glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_TYPE, &type); // there's a format we don't support ATM if (GL_UNSIGNED_SHORT_4_4_4_4 == type) { internalformat = GL_RGBA; diff --git a/source/Irrlicht/COGLES2Driver.h b/source/Irrlicht/COGLES2Driver.h index b130bc3f0..a858276cf 100644 --- a/source/Irrlicht/COGLES2Driver.h +++ b/source/Irrlicht/COGLES2Driver.h @@ -53,7 +53,7 @@ class COGLES2Driver : public CNullDriver, public IMaterialRendererServices, publ } u32 vbo_verticesID; // tmp - u32 vbo_indicesID; // tmp + u32 vbo_indicesID; // tmp u32 vbo_verticesSize; // tmp u32 vbo_indicesSize; // tmp @@ -141,7 +141,7 @@ class COGLES2Driver : public CNullDriver, public IMaterialRendererServices, publ SColor color = SColor(255, 255, 255, 255)) override; //! Draws a pixel - // virtual void drawPixel(u32 x, u32 y, const SColor & color); + // virtual void drawPixel(u32 x, u32 y, const SColor & color); //! Returns the name of the video driver. const wchar_t *getName() const override; @@ -381,8 +381,8 @@ class COGLES2Driver : public CNullDriver, public IMaterialRendererServices, publ enum E_RENDER_MODE { ERM_NONE = 0, // no render state has been set yet. - ERM_2D, // 2d drawing rendermode - ERM_3D // 3d rendering mode + ERM_2D, // 2d drawing rendermode + ERM_3D // 3d rendering mode }; E_RENDER_MODE CurrentRenderMode; diff --git a/source/Irrlicht/COGLESCoreExtensionHandler.h b/source/Irrlicht/COGLESCoreExtensionHandler.h index 4fecc9354..609ff99fd 100644 --- a/source/Irrlicht/COGLESCoreExtensionHandler.h +++ b/source/Irrlicht/COGLESCoreExtensionHandler.h @@ -25,315 +25,315 @@ class COGLESCoreExtensionHandler { // If you update this enum also update the corresponding OGLESFeatureStrings string-array // Last updated was up to (including) extension number 290 (GL_EXT_clip_control) - IRR_GLX_ARB_context_flush_control, // 191 - IRR_GL_AMD_compressed_3DC_texture, // 39 - IRR_GL_AMD_compressed_ATC_texture, // 40 - IRR_GL_AMD_performance_monitor, // 50 - IRR_GL_AMD_program_binary_Z400, // 48 - IRR_GL_ANDROID_extension_pack_es31a, // 187 - IRR_GL_ANGLE_depth_texture, // 138 - IRR_GL_ANGLE_framebuffer_blit, // 83 - IRR_GL_ANGLE_framebuffer_multisample, // 84 - IRR_GL_ANGLE_instanced_arrays, // 109 - IRR_GL_ANGLE_pack_reverse_row_order, // 110 - IRR_GL_ANGLE_program_binary, // 139 - IRR_GL_ANGLE_texture_compression_dxt1, // 111 - IRR_GL_ANGLE_texture_compression_dxt3, // 111 - IRR_GL_ANGLE_texture_compression_dxt5, // 111 - IRR_GL_ANGLE_texture_usage, // 112 - IRR_GL_ANGLE_translated_shader_source, // 113 - IRR_GL_APPLE_clip_distance, // 193 - IRR_GL_APPLE_color_buffer_packed_float, // 194 - IRR_GL_APPLE_copy_texture_levels, // 123 - IRR_GL_APPLE_framebuffer_multisample, // 78 - IRR_GL_APPLE_rgb_422, // 76 - IRR_GL_APPLE_sync, // 124 - IRR_GL_APPLE_texture_2D_limited_npot, // 59 - IRR_GL_APPLE_texture_format_BGRA8888, // 79 - IRR_GL_APPLE_texture_max_level, // 80 - IRR_GL_APPLE_texture_packed_float, // 195 - IRR_ARB_texture_env_combine, // ogl, IMG simulator - IRR_ARB_texture_env_dot3, // ogl, IMG simulator - IRR_GL_ARM_mali_program_binary, // 120 - IRR_GL_ARM_mali_shader_binary, // 81 - IRR_GL_ARM_rgba8, // 82 - IRR_GL_ARM_shader_framebuffer_fetch, // 165 - IRR_GL_ARM_shader_framebuffer_fetch_depth_stencil, // 166 - IRR_GL_DMP_program_binary, // 192 - IRR_GL_DMP_shader_binary, // 88 - IRR_GL_EXT_EGL_image_array, // 278 - IRR_GL_EXT_YUV_target, // 222 - IRR_GL_EXT_base_instance, // 203 - IRR_GL_EXT_blend_func_extended, // 247 - IRR_GL_EXT_blend_minmax, // 65 - IRR_GL_EXT_buffer_storage, // 239 - IRR_GL_EXT_clear_texture, // 269 - IRR_GL_EXT_clip_control, // 290 - IRR_GL_EXT_clip_cull_distance, // 257 - IRR_GL_EXT_color_buffer_float, // 137 - IRR_GL_EXT_color_buffer_half_float, // 97 - IRR_GL_EXT_compressed_ETC1_RGB8_sub_texture, // 188 - IRR_GL_EXT_conservative_depth, // 268 - IRR_GL_EXT_copy_image, // 175 - IRR_GL_EXT_debug_label, // 98 - IRR_GL_EXT_debug_marker, // 99 - IRR_GL_EXT_discard_framebuffer, // 64 - IRR_GL_EXT_disjoint_timer_query, // 150 - IRR_GL_EXT_draw_buffers, // 151 - IRR_GL_EXT_draw_buffers_indexed, // 176 - IRR_GL_EXT_draw_elements_base_vertex, // 204 - IRR_GL_EXT_draw_instanced, // 157 - IRR_GL_EXT_draw_transform_feedback, // 272 - IRR_GL_EXT_external_buffer, // 284 - IRR_GL_EXT_float_blend, // 225 - IRR_GL_EXT_frag_depth, // 86 - IRR_GL_EXT_geometry_point_size, // 177 - IRR_GL_EXT_geometry_shader, // 177 - IRR_GL_EXT_gpu_shader5, // 178 - IRR_GL_EXT_instanced_arrays, // 156 - IRR_GL_EXT_map_buffer_range, // 121 - IRR_GL_EXT_memory_object, // 280 - IRR_GL_EXT_memory_object_fd, // 281 - IRR_GL_EXT_memory_object_win32, // 282 - IRR_GL_EXT_multi_draw_arrays, // 69 - IRR_GL_EXT_multi_draw_indirect, // 205 - IRR_GL_EXT_multisample_compatibility, // 248 - IRR_GL_EXT_multisampled_render_to_texture, // 106 - IRR_GL_EXT_multisampled_render_to_texture2, // 275 - IRR_GL_EXT_multiview_draw_buffers, // 125 - IRR_GL_EXT_occlusion_query_boolean, // 100 - IRR_GL_EXT_polygon_offset_clamp, // 252 - IRR_GL_EXT_post_depth_coverage, // 225 - IRR_GL_EXT_primitive_bounding_box, // 186 - IRR_GL_EXT_protected_textures, // 256 - IRR_GL_EXT_pvrtc_sRGB, // 155 - IRR_GL_EXT_raster_multisample, // 226 - IRR_GL_EXT_read_format_bgra, // 66 - IRR_GL_EXT_render_snorm, // 206 - IRR_GL_EXT_robustness, // 107 - IRR_GL_EXT_sRGB, // 105 - IRR_GL_EXT_sRGB_write_control, // 153 - IRR_GL_EXT_semaphore, // 280 - IRR_GL_EXT_semaphore_fd, // 281 - IRR_GL_EXT_semaphore_win32, // 282 - IRR_GL_EXT_separate_shader_objects, // 101 - IRR_GL_EXT_shader_framebuffer_fetch, // 122 - IRR_GL_EXT_shader_group_vote, // 254 - IRR_GL_EXT_shader_implicit_conversions, // 179 - IRR_GL_EXT_shader_integer_mix, // 161 - IRR_GL_EXT_shader_io_blocks, // 180 - IRR_GL_EXT_shader_non_constant_global_initializers, // 264 - IRR_GL_EXT_shader_pixel_local_storage, // 167 - IRR_GL_EXT_shader_pixel_local_storage2, // 253 - IRR_GL_EXT_shader_texture_lod, // 77 - IRR_GL_EXT_shadow_samplers, // 102 - IRR_GL_EXT_sparse_texture, // 240 - IRR_GL_EXT_sparse_texture2, // 259 - IRR_GL_EXT_tessellation_point_size, // 181 - IRR_GL_EXT_tessellation_shader, // 181 - IRR_GL_EXT_texture_border_clamp, // 182 - IRR_GL_EXT_texture_buffer, // 183 - IRR_GL_EXT_texture_compression_astc_decode_mode, // 276 + IRR_GLX_ARB_context_flush_control, // 191 + IRR_GL_AMD_compressed_3DC_texture, // 39 + IRR_GL_AMD_compressed_ATC_texture, // 40 + IRR_GL_AMD_performance_monitor, // 50 + IRR_GL_AMD_program_binary_Z400, // 48 + IRR_GL_ANDROID_extension_pack_es31a, // 187 + IRR_GL_ANGLE_depth_texture, // 138 + IRR_GL_ANGLE_framebuffer_blit, // 83 + IRR_GL_ANGLE_framebuffer_multisample, // 84 + IRR_GL_ANGLE_instanced_arrays, // 109 + IRR_GL_ANGLE_pack_reverse_row_order, // 110 + IRR_GL_ANGLE_program_binary, // 139 + IRR_GL_ANGLE_texture_compression_dxt1, // 111 + IRR_GL_ANGLE_texture_compression_dxt3, // 111 + IRR_GL_ANGLE_texture_compression_dxt5, // 111 + IRR_GL_ANGLE_texture_usage, // 112 + IRR_GL_ANGLE_translated_shader_source, // 113 + IRR_GL_APPLE_clip_distance, // 193 + IRR_GL_APPLE_color_buffer_packed_float, // 194 + IRR_GL_APPLE_copy_texture_levels, // 123 + IRR_GL_APPLE_framebuffer_multisample, // 78 + IRR_GL_APPLE_rgb_422, // 76 + IRR_GL_APPLE_sync, // 124 + IRR_GL_APPLE_texture_2D_limited_npot, // 59 + IRR_GL_APPLE_texture_format_BGRA8888, // 79 + IRR_GL_APPLE_texture_max_level, // 80 + IRR_GL_APPLE_texture_packed_float, // 195 + IRR_ARB_texture_env_combine, // ogl, IMG simulator + IRR_ARB_texture_env_dot3, // ogl, IMG simulator + IRR_GL_ARM_mali_program_binary, // 120 + IRR_GL_ARM_mali_shader_binary, // 81 + IRR_GL_ARM_rgba8, // 82 + IRR_GL_ARM_shader_framebuffer_fetch, // 165 + IRR_GL_ARM_shader_framebuffer_fetch_depth_stencil, // 166 + IRR_GL_DMP_program_binary, // 192 + IRR_GL_DMP_shader_binary, // 88 + IRR_GL_EXT_EGL_image_array, // 278 + IRR_GL_EXT_YUV_target, // 222 + IRR_GL_EXT_base_instance, // 203 + IRR_GL_EXT_blend_func_extended, // 247 + IRR_GL_EXT_blend_minmax, // 65 + IRR_GL_EXT_buffer_storage, // 239 + IRR_GL_EXT_clear_texture, // 269 + IRR_GL_EXT_clip_control, // 290 + IRR_GL_EXT_clip_cull_distance, // 257 + IRR_GL_EXT_color_buffer_float, // 137 + IRR_GL_EXT_color_buffer_half_float, // 97 + IRR_GL_EXT_compressed_ETC1_RGB8_sub_texture, // 188 + IRR_GL_EXT_conservative_depth, // 268 + IRR_GL_EXT_copy_image, // 175 + IRR_GL_EXT_debug_label, // 98 + IRR_GL_EXT_debug_marker, // 99 + IRR_GL_EXT_discard_framebuffer, // 64 + IRR_GL_EXT_disjoint_timer_query, // 150 + IRR_GL_EXT_draw_buffers, // 151 + IRR_GL_EXT_draw_buffers_indexed, // 176 + IRR_GL_EXT_draw_elements_base_vertex, // 204 + IRR_GL_EXT_draw_instanced, // 157 + IRR_GL_EXT_draw_transform_feedback, // 272 + IRR_GL_EXT_external_buffer, // 284 + IRR_GL_EXT_float_blend, // 225 + IRR_GL_EXT_frag_depth, // 86 + IRR_GL_EXT_geometry_point_size, // 177 + IRR_GL_EXT_geometry_shader, // 177 + IRR_GL_EXT_gpu_shader5, // 178 + IRR_GL_EXT_instanced_arrays, // 156 + IRR_GL_EXT_map_buffer_range, // 121 + IRR_GL_EXT_memory_object, // 280 + IRR_GL_EXT_memory_object_fd, // 281 + IRR_GL_EXT_memory_object_win32, // 282 + IRR_GL_EXT_multi_draw_arrays, // 69 + IRR_GL_EXT_multi_draw_indirect, // 205 + IRR_GL_EXT_multisample_compatibility, // 248 + IRR_GL_EXT_multisampled_render_to_texture, // 106 + IRR_GL_EXT_multisampled_render_to_texture2, // 275 + IRR_GL_EXT_multiview_draw_buffers, // 125 + IRR_GL_EXT_occlusion_query_boolean, // 100 + IRR_GL_EXT_polygon_offset_clamp, // 252 + IRR_GL_EXT_post_depth_coverage, // 225 + IRR_GL_EXT_primitive_bounding_box, // 186 + IRR_GL_EXT_protected_textures, // 256 + IRR_GL_EXT_pvrtc_sRGB, // 155 + IRR_GL_EXT_raster_multisample, // 226 + IRR_GL_EXT_read_format_bgra, // 66 + IRR_GL_EXT_render_snorm, // 206 + IRR_GL_EXT_robustness, // 107 + IRR_GL_EXT_sRGB, // 105 + IRR_GL_EXT_sRGB_write_control, // 153 + IRR_GL_EXT_semaphore, // 280 + IRR_GL_EXT_semaphore_fd, // 281 + IRR_GL_EXT_semaphore_win32, // 282 + IRR_GL_EXT_separate_shader_objects, // 101 + IRR_GL_EXT_shader_framebuffer_fetch, // 122 + IRR_GL_EXT_shader_group_vote, // 254 + IRR_GL_EXT_shader_implicit_conversions, // 179 + IRR_GL_EXT_shader_integer_mix, // 161 + IRR_GL_EXT_shader_io_blocks, // 180 + IRR_GL_EXT_shader_non_constant_global_initializers, // 264 + IRR_GL_EXT_shader_pixel_local_storage, // 167 + IRR_GL_EXT_shader_pixel_local_storage2, // 253 + IRR_GL_EXT_shader_texture_lod, // 77 + IRR_GL_EXT_shadow_samplers, // 102 + IRR_GL_EXT_sparse_texture, // 240 + IRR_GL_EXT_sparse_texture2, // 259 + IRR_GL_EXT_tessellation_point_size, // 181 + IRR_GL_EXT_tessellation_shader, // 181 + IRR_GL_EXT_texture_border_clamp, // 182 + IRR_GL_EXT_texture_buffer, // 183 + IRR_GL_EXT_texture_compression_astc_decode_mode, // 276 IRR_GL_EXT_texture_compression_astc_decode_mode_rgb9e5, // 276 - IRR_GL_EXT_texture_compression_bptc, // 287 - IRR_GL_EXT_texture_compression_dxt1, // 49 - IRR_GL_EXT_texture_compression_rgtc, // 286 - IRR_GL_EXT_texture_compression_s3tc, // 154 - IRR_GL_EXT_texture_compression_s3tc_srgb, // 289 - IRR_GL_EXT_texture_cube_map_array, // 184 - IRR_GL_EXT_texture_filter_anisotropic, // 41 - IRR_GL_EXT_texture_filter_minmax, // 227 - IRR_GL_EXT_texture_format_BGRA8888, // 51 - IRR_GL_EXT_texture_lod_bias, // 60 - IRR_GL_EXT_texture_norm16, // 207 - IRR_GL_EXT_texture_rg, // 103 - IRR_GL_EXT_texture_sRGB_R8, // 221 - IRR_GL_EXT_texture_sRGB_RG8, // 223 - IRR_GL_EXT_texture_sRGB_decode, // 152 - IRR_GL_EXT_texture_storage, // 108 - IRR_GL_EXT_texture_type_2_10_10_10_REV, // 42 - IRR_GL_EXT_texture_view, // 185 - IRR_GL_EXT_unpack_subimage, // 90 - IRR_GL_EXT_win32_keyed_mutex, // 283 - IRR_GL_EXT_window_rectangles, // 263 - IRR_GL_FJ_shader_binary_GCCSO, // 114 - IRR_GL_IMG_bindless_texture, // 270 - IRR_GL_IMG_framebuffer_downsample, // 255 - IRR_GL_IMG_multisampled_render_to_texture, // 74 - IRR_GL_IMG_program_binary, // 67 - IRR_GL_IMG_read_format, // 53 - IRR_GL_IMG_shader_binary, // 68 - IRR_GL_IMG_texture_compression_pvrtc, // 54 - IRR_GL_IMG_texture_compression_pvrtc2, // 140 - IRR_GL_IMG_texture_env_enhanced_fixed_function, // 58 - IRR_GL_IMG_texture_format_BGRA8888, // replaced by EXT version - IRR_GL_IMG_texture_filter_cubic, // 251 - IRR_GL_IMG_user_clip_plane, // 57, was clip_planes - IRR_GL_IMG_vertex_program, // non-standard - IRR_GL_INTEL_conservative_rasterization, // 265 - IRR_GL_INTEL_framebuffer_CMAA, // 246 - IRR_GL_INTEL_performance_query, // 164 - IRR_GL_KHR_blend_equation_advanced, // 168 - IRR_GL_KHR_blend_equation_advanced_coherent, // 168 - IRR_GL_KHR_context_flush_control, // 191 - IRR_GL_KHR_debug, // 118 - IRR_GL_KHR_no_error, // 243 - IRR_GL_KHR_parallel_shader_compile, // 288 - IRR_GL_KHR_robust_buffer_access_behavior, // 189 - IRR_GL_KHR_robustness, // 190 - IRR_GL_KHR_texture_compression_astc_hdr, // 117 - IRR_GL_KHR_texture_compression_astc_ldr, // 117 - IRR_GL_KHR_texture_compression_astc_sliced_3d, // 249 - IRR_GL_NVX_blend_equation_advanced_multi_draw_buffers, // 266 - IRR_GL_NV_3dvision_settings, // 129 - IRR_GL_NV_EGL_stream_consumer_external, // 104 - IRR_GL_NV_bgr, // 135 - IRR_GL_NV_bindless_texture, // 197 - IRR_GL_NV_blend_equation_advanced, // 163 - IRR_GL_NV_blend_equation_advanced_coherent, // 163 - IRR_GL_NV_blend_minmax_factor, // 285 - IRR_GL_NV_conditional_render, // 198 - IRR_GL_NV_conservative_raster, // 228 - IRR_GL_NV_conservative_raster_pre_snap_triangles, // 262 - IRR_GL_NV_copy_buffer, // 158 - IRR_GL_NV_coverage_sample, // 72 - IRR_GL_NV_depth_nonlinear, // 73 - IRR_GL_NV_draw_buffers, // 91 - IRR_GL_NV_draw_instanced, // 141 - IRR_GL_NV_draw_texture, // 126 - IRR_GL_NV_draw_vulkan_image, // 274 - IRR_GL_NV_explicit_attrib_location, // 159 - IRR_GL_NV_fbo_color_attachments, // 92 - IRR_GL_NV_fence, // 52 - IRR_GL_NV_fill_rectangle, // 232 - IRR_GL_NV_fragment_coverage_to_color, // 229 - IRR_GL_NV_fragment_shader_interlock, // 230 - IRR_GL_NV_framebuffer_blit, // 142 - IRR_GL_NV_framebuffer_mixed_samples, // 231 - IRR_GL_NV_framebuffer_multisample, // 143 - IRR_GL_NV_generate_mipmap_sRGB, // 144 - IRR_GL_NV_geometry_shader_passthrough, // 233 - IRR_GL_NV_gpu_shader5, // 260 - IRR_GL_NV_image_formats, // 200 - IRR_GL_NV_instanced_arrays, // 145 - IRR_GL_NV_internalformat_sample_query, // 196 - IRR_GL_NV_non_square_matrices, // 160 - IRR_GL_NV_pack_subimage, // 132 - IRR_GL_NV_packed_float, // 127 - IRR_GL_NV_path_rendering, // 199 - IRR_GL_NV_path_rendering_shared_edge, // 234 - IRR_GL_NV_pixel_buffer_object, // 134 - IRR_GL_NV_platform_binary, // 131 - IRR_GL_NV_polygon_mode, // 238 - IRR_GL_NV_read_buffer, // 93 - IRR_GL_NV_read_buffer_front, // part of 93 (non standard) - IRR_GL_NV_read_depth, // part of 94 (non standard) - IRR_GL_NV_read_depth_stencil, // 94 - IRR_GL_NV_read_stencil, // part of 94 (non standard) - IRR_GL_NV_sRGB_formats, // 148 - IRR_GL_NV_sample_locations, // 235 - IRR_GL_NV_sample_mask_override_coverage, // 236 - IRR_GL_NV_shader_atomic_fp16_vector, // 261 - IRR_GL_NV_shader_noperspective_interpolation, // 201 - IRR_GL_NV_shadow_samplers_array, // 146 - IRR_GL_NV_shadow_samplers_cube, // 147 - IRR_GL_NV_texture_array, // 133 - IRR_GL_NV_texture_barrier, // 271 - IRR_GL_NV_texture_border_clamp, // 149 - IRR_GL_NV_texture_compression_latc, // 130 - IRR_GL_NV_texture_compression_s3tc, // 128 - IRR_GL_NV_texture_compression_s3tc_update, // 95 - IRR_GL_NV_texture_npot_2D_mipmap, // 96 - IRR_GL_NV_viewport_array, // 202 - IRR_GL_NV_viewport_array2, // 237 - IRR_GL_NV_viewport_swizzle, // 258 - IRR_GL_OES_EGL_image, // 23 - IRR_GL_OES_EGL_image_external, // 87 - IRR_GL_OES_EGL_image_external_essl3, // 220 - IRR_GL_OES_EGL_sync, // 75 - IRR_GL_OES_blend_equation_separate, // 1 - IRR_GL_OES_blend_func_separate, // 2 - IRR_GL_OES_blend_subtract, // 3 - IRR_GL_OES_byte_coordinates, // 4 - IRR_GL_OES_compressed_ETC1_RGB8_texture, // 5 - IRR_GL_OES_compressed_paletted_texture, // 6 - IRR_GL_OES_copy_image, // 208 - IRR_GL_OES_depth24, // 24 - IRR_GL_OES_depth32, // 25 - IRR_GL_OES_depth_texture, // 43 - IRR_GL_OES_depth_texture_cube_map, // 136 - IRR_GL_OES_draw_buffers_indexed, // 209 - IRR_GL_OES_draw_elements_base_vertex, // 219 - IRR_GL_OES_draw_texture, // 7 - IRR_GL_OES_element_index_uint, // 26 - IRR_GL_OES_extended_matrix_palette, // 8 - IRR_GL_OES_fbo_render_mipmap, // 27 - IRR_GL_OES_fixed_point, // 9 - IRR_GL_OES_fragment_precision_high, // 28 - IRR_GL_OES_framebuffer_object, // 10 - IRR_GL_OES_geometry_shader, // 210 - IRR_GL_OES_get_program_binary, // 47 - IRR_GL_OES_gpu_shader5, // 211 - IRR_GL_OES_mapbuffer, // 29 - IRR_GL_OES_matrix_get, // 11 - IRR_GL_OES_matrix_palette, // 12 - IRR_GL_OES_packed_depth_stencil, // 44 - IRR_GL_OES_point_size_array, // 14 - IRR_GL_OES_point_sprite, // 15 - IRR_GL_OES_primitive_bounding_box, // 212 - IRR_GL_OES_query_matrix, // 16 - IRR_GL_OES_read_format, // 17 - IRR_GL_OES_required_internalformat, // 115 - IRR_GL_OES_rgb8_rgba8, // 30 - IRR_GL_OES_sample_shading, // 169 - IRR_GL_OES_sample_variables, // 170 - IRR_GL_OES_shader_image_atomic, // 171 - IRR_GL_OES_shader_io_blocks, // 213 - IRR_GL_OES_shader_multisample_interpolation, // 172 - IRR_GL_OES_single_precision, // 18 - IRR_GL_OES_standard_derivatives, // 45 - IRR_GL_OES_stencil1, // 31 - IRR_GL_OES_stencil4, // 32 - IRR_GL_OES_stencil8, // 33 - IRR_GL_OES_stencil_wrap, // 19 - IRR_GL_OES_surfaceless_context, // 116 - IRR_GL_OES_tessellation_shader, // 214 - IRR_GL_OES_texture_3D, // 34 - IRR_GL_OES_texture_border_clamp, // 215 - IRR_GL_OES_texture_buffer, // 216 - IRR_GL_OES_texture_compression_astc, // 162 - IRR_GL_OES_texture_cube_map, // 20 - IRR_GL_OES_texture_cube_map_array, // 217 - IRR_GL_OES_texture_env_crossbar, // 21 - IRR_GL_OES_texture_float, // 36 - IRR_GL_OES_texture_float_linear, // 35 - IRR_GL_OES_texture_half_float, // 36 - IRR_GL_OES_texture_half_float_linear, // 35 - IRR_GL_OES_texture_mirrored_repeat, // 22 - IRR_GL_OES_texture_npot, // 37 - IRR_GL_OES_texture_stencil8, // 173 - IRR_GL_OES_texture_storage_multisample_2d_array, // 174 - IRR_GL_OES_texture_view, // 218 - IRR_GL_OES_vertex_array_object, // 71 - IRR_GL_OES_vertex_half_float, // 38 - IRR_GL_OES_vertex_type_10_10_10_2, // 46 - IRR_GL_OES_viewport_array, // 267 - IRR_GL_OVR_multiview, // 241 - IRR_GL_OVR_multiview2, // 242 - IRR_GL_OVR_multiview_multisampled_render_to_texture, // 250 - IRR_GL_QCOM_alpha_test, // 89 - IRR_GL_QCOM_binning_control, // 119 - IRR_GL_QCOM_driver_control, // 55 - IRR_GL_QCOM_extended_get, // 62 - IRR_GL_QCOM_extended_get2, // 63 - IRR_GL_QCOM_framebuffer_foveated, // 273 - IRR_GL_QCOM_performance_monitor_global_mode, // 56 - IRR_GL_QCOM_shader_framebuffer_fetch_noncoherent, // 277 - IRR_GL_QCOM_tiled_rendering, // 70 - IRR_GL_QCOM_writeonly_rendering, // 61 - IRR_GL_SUN_multi_draw_arrays, // 69 - IRR_GL_VIV_shader_binary, // 85 - WGL_ARB_context_flush_control, // 191 + IRR_GL_EXT_texture_compression_bptc, // 287 + IRR_GL_EXT_texture_compression_dxt1, // 49 + IRR_GL_EXT_texture_compression_rgtc, // 286 + IRR_GL_EXT_texture_compression_s3tc, // 154 + IRR_GL_EXT_texture_compression_s3tc_srgb, // 289 + IRR_GL_EXT_texture_cube_map_array, // 184 + IRR_GL_EXT_texture_filter_anisotropic, // 41 + IRR_GL_EXT_texture_filter_minmax, // 227 + IRR_GL_EXT_texture_format_BGRA8888, // 51 + IRR_GL_EXT_texture_lod_bias, // 60 + IRR_GL_EXT_texture_norm16, // 207 + IRR_GL_EXT_texture_rg, // 103 + IRR_GL_EXT_texture_sRGB_R8, // 221 + IRR_GL_EXT_texture_sRGB_RG8, // 223 + IRR_GL_EXT_texture_sRGB_decode, // 152 + IRR_GL_EXT_texture_storage, // 108 + IRR_GL_EXT_texture_type_2_10_10_10_REV, // 42 + IRR_GL_EXT_texture_view, // 185 + IRR_GL_EXT_unpack_subimage, // 90 + IRR_GL_EXT_win32_keyed_mutex, // 283 + IRR_GL_EXT_window_rectangles, // 263 + IRR_GL_FJ_shader_binary_GCCSO, // 114 + IRR_GL_IMG_bindless_texture, // 270 + IRR_GL_IMG_framebuffer_downsample, // 255 + IRR_GL_IMG_multisampled_render_to_texture, // 74 + IRR_GL_IMG_program_binary, // 67 + IRR_GL_IMG_read_format, // 53 + IRR_GL_IMG_shader_binary, // 68 + IRR_GL_IMG_texture_compression_pvrtc, // 54 + IRR_GL_IMG_texture_compression_pvrtc2, // 140 + IRR_GL_IMG_texture_env_enhanced_fixed_function, // 58 + IRR_GL_IMG_texture_format_BGRA8888, // replaced by EXT version + IRR_GL_IMG_texture_filter_cubic, // 251 + IRR_GL_IMG_user_clip_plane, // 57, was clip_planes + IRR_GL_IMG_vertex_program, // non-standard + IRR_GL_INTEL_conservative_rasterization, // 265 + IRR_GL_INTEL_framebuffer_CMAA, // 246 + IRR_GL_INTEL_performance_query, // 164 + IRR_GL_KHR_blend_equation_advanced, // 168 + IRR_GL_KHR_blend_equation_advanced_coherent, // 168 + IRR_GL_KHR_context_flush_control, // 191 + IRR_GL_KHR_debug, // 118 + IRR_GL_KHR_no_error, // 243 + IRR_GL_KHR_parallel_shader_compile, // 288 + IRR_GL_KHR_robust_buffer_access_behavior, // 189 + IRR_GL_KHR_robustness, // 190 + IRR_GL_KHR_texture_compression_astc_hdr, // 117 + IRR_GL_KHR_texture_compression_astc_ldr, // 117 + IRR_GL_KHR_texture_compression_astc_sliced_3d, // 249 + IRR_GL_NVX_blend_equation_advanced_multi_draw_buffers, // 266 + IRR_GL_NV_3dvision_settings, // 129 + IRR_GL_NV_EGL_stream_consumer_external, // 104 + IRR_GL_NV_bgr, // 135 + IRR_GL_NV_bindless_texture, // 197 + IRR_GL_NV_blend_equation_advanced, // 163 + IRR_GL_NV_blend_equation_advanced_coherent, // 163 + IRR_GL_NV_blend_minmax_factor, // 285 + IRR_GL_NV_conditional_render, // 198 + IRR_GL_NV_conservative_raster, // 228 + IRR_GL_NV_conservative_raster_pre_snap_triangles, // 262 + IRR_GL_NV_copy_buffer, // 158 + IRR_GL_NV_coverage_sample, // 72 + IRR_GL_NV_depth_nonlinear, // 73 + IRR_GL_NV_draw_buffers, // 91 + IRR_GL_NV_draw_instanced, // 141 + IRR_GL_NV_draw_texture, // 126 + IRR_GL_NV_draw_vulkan_image, // 274 + IRR_GL_NV_explicit_attrib_location, // 159 + IRR_GL_NV_fbo_color_attachments, // 92 + IRR_GL_NV_fence, // 52 + IRR_GL_NV_fill_rectangle, // 232 + IRR_GL_NV_fragment_coverage_to_color, // 229 + IRR_GL_NV_fragment_shader_interlock, // 230 + IRR_GL_NV_framebuffer_blit, // 142 + IRR_GL_NV_framebuffer_mixed_samples, // 231 + IRR_GL_NV_framebuffer_multisample, // 143 + IRR_GL_NV_generate_mipmap_sRGB, // 144 + IRR_GL_NV_geometry_shader_passthrough, // 233 + IRR_GL_NV_gpu_shader5, // 260 + IRR_GL_NV_image_formats, // 200 + IRR_GL_NV_instanced_arrays, // 145 + IRR_GL_NV_internalformat_sample_query, // 196 + IRR_GL_NV_non_square_matrices, // 160 + IRR_GL_NV_pack_subimage, // 132 + IRR_GL_NV_packed_float, // 127 + IRR_GL_NV_path_rendering, // 199 + IRR_GL_NV_path_rendering_shared_edge, // 234 + IRR_GL_NV_pixel_buffer_object, // 134 + IRR_GL_NV_platform_binary, // 131 + IRR_GL_NV_polygon_mode, // 238 + IRR_GL_NV_read_buffer, // 93 + IRR_GL_NV_read_buffer_front, // part of 93 (non standard) + IRR_GL_NV_read_depth, // part of 94 (non standard) + IRR_GL_NV_read_depth_stencil, // 94 + IRR_GL_NV_read_stencil, // part of 94 (non standard) + IRR_GL_NV_sRGB_formats, // 148 + IRR_GL_NV_sample_locations, // 235 + IRR_GL_NV_sample_mask_override_coverage, // 236 + IRR_GL_NV_shader_atomic_fp16_vector, // 261 + IRR_GL_NV_shader_noperspective_interpolation, // 201 + IRR_GL_NV_shadow_samplers_array, // 146 + IRR_GL_NV_shadow_samplers_cube, // 147 + IRR_GL_NV_texture_array, // 133 + IRR_GL_NV_texture_barrier, // 271 + IRR_GL_NV_texture_border_clamp, // 149 + IRR_GL_NV_texture_compression_latc, // 130 + IRR_GL_NV_texture_compression_s3tc, // 128 + IRR_GL_NV_texture_compression_s3tc_update, // 95 + IRR_GL_NV_texture_npot_2D_mipmap, // 96 + IRR_GL_NV_viewport_array, // 202 + IRR_GL_NV_viewport_array2, // 237 + IRR_GL_NV_viewport_swizzle, // 258 + IRR_GL_OES_EGL_image, // 23 + IRR_GL_OES_EGL_image_external, // 87 + IRR_GL_OES_EGL_image_external_essl3, // 220 + IRR_GL_OES_EGL_sync, // 75 + IRR_GL_OES_blend_equation_separate, // 1 + IRR_GL_OES_blend_func_separate, // 2 + IRR_GL_OES_blend_subtract, // 3 + IRR_GL_OES_byte_coordinates, // 4 + IRR_GL_OES_compressed_ETC1_RGB8_texture, // 5 + IRR_GL_OES_compressed_paletted_texture, // 6 + IRR_GL_OES_copy_image, // 208 + IRR_GL_OES_depth24, // 24 + IRR_GL_OES_depth32, // 25 + IRR_GL_OES_depth_texture, // 43 + IRR_GL_OES_depth_texture_cube_map, // 136 + IRR_GL_OES_draw_buffers_indexed, // 209 + IRR_GL_OES_draw_elements_base_vertex, // 219 + IRR_GL_OES_draw_texture, // 7 + IRR_GL_OES_element_index_uint, // 26 + IRR_GL_OES_extended_matrix_palette, // 8 + IRR_GL_OES_fbo_render_mipmap, // 27 + IRR_GL_OES_fixed_point, // 9 + IRR_GL_OES_fragment_precision_high, // 28 + IRR_GL_OES_framebuffer_object, // 10 + IRR_GL_OES_geometry_shader, // 210 + IRR_GL_OES_get_program_binary, // 47 + IRR_GL_OES_gpu_shader5, // 211 + IRR_GL_OES_mapbuffer, // 29 + IRR_GL_OES_matrix_get, // 11 + IRR_GL_OES_matrix_palette, // 12 + IRR_GL_OES_packed_depth_stencil, // 44 + IRR_GL_OES_point_size_array, // 14 + IRR_GL_OES_point_sprite, // 15 + IRR_GL_OES_primitive_bounding_box, // 212 + IRR_GL_OES_query_matrix, // 16 + IRR_GL_OES_read_format, // 17 + IRR_GL_OES_required_internalformat, // 115 + IRR_GL_OES_rgb8_rgba8, // 30 + IRR_GL_OES_sample_shading, // 169 + IRR_GL_OES_sample_variables, // 170 + IRR_GL_OES_shader_image_atomic, // 171 + IRR_GL_OES_shader_io_blocks, // 213 + IRR_GL_OES_shader_multisample_interpolation, // 172 + IRR_GL_OES_single_precision, // 18 + IRR_GL_OES_standard_derivatives, // 45 + IRR_GL_OES_stencil1, // 31 + IRR_GL_OES_stencil4, // 32 + IRR_GL_OES_stencil8, // 33 + IRR_GL_OES_stencil_wrap, // 19 + IRR_GL_OES_surfaceless_context, // 116 + IRR_GL_OES_tessellation_shader, // 214 + IRR_GL_OES_texture_3D, // 34 + IRR_GL_OES_texture_border_clamp, // 215 + IRR_GL_OES_texture_buffer, // 216 + IRR_GL_OES_texture_compression_astc, // 162 + IRR_GL_OES_texture_cube_map, // 20 + IRR_GL_OES_texture_cube_map_array, // 217 + IRR_GL_OES_texture_env_crossbar, // 21 + IRR_GL_OES_texture_float, // 36 + IRR_GL_OES_texture_float_linear, // 35 + IRR_GL_OES_texture_half_float, // 36 + IRR_GL_OES_texture_half_float_linear, // 35 + IRR_GL_OES_texture_mirrored_repeat, // 22 + IRR_GL_OES_texture_npot, // 37 + IRR_GL_OES_texture_stencil8, // 173 + IRR_GL_OES_texture_storage_multisample_2d_array, // 174 + IRR_GL_OES_texture_view, // 218 + IRR_GL_OES_vertex_array_object, // 71 + IRR_GL_OES_vertex_half_float, // 38 + IRR_GL_OES_vertex_type_10_10_10_2, // 46 + IRR_GL_OES_viewport_array, // 267 + IRR_GL_OVR_multiview, // 241 + IRR_GL_OVR_multiview2, // 242 + IRR_GL_OVR_multiview_multisampled_render_to_texture, // 250 + IRR_GL_QCOM_alpha_test, // 89 + IRR_GL_QCOM_binning_control, // 119 + IRR_GL_QCOM_driver_control, // 55 + IRR_GL_QCOM_extended_get, // 62 + IRR_GL_QCOM_extended_get2, // 63 + IRR_GL_QCOM_framebuffer_foveated, // 273 + IRR_GL_QCOM_performance_monitor_global_mode, // 56 + IRR_GL_QCOM_shader_framebuffer_fetch_noncoherent, // 277 + IRR_GL_QCOM_tiled_rendering, // 70 + IRR_GL_QCOM_writeonly_rendering, // 61 + IRR_GL_SUN_multi_draw_arrays, // 69 + IRR_GL_VIV_shader_binary, // 85 + WGL_ARB_context_flush_control, // 191 IRR_OGLES_Feature_Count }; diff --git a/source/Irrlicht/COGLESDriver.cpp b/source/Irrlicht/COGLESDriver.cpp index 2d7e061b7..104c9d59d 100644 --- a/source/Irrlicht/COGLESDriver.cpp +++ b/source/Irrlicht/COGLESDriver.cpp @@ -654,9 +654,9 @@ void COGLES1Driver::drawVertexPrimitiveList2d3d(const void *vertices, u32 vertex glPointParameterfv(GL_POINT_DISTANCE_ATTENUATION, quadratic); float maxParticleSize = 1.0f; glGetFloatv(GL_POINT_SIZE_MAX, &maxParticleSize); - // maxParticleSize=maxParticleSize(material.Thickness), DimSmoothedPoint[0], DimSmoothedPoint[1])); + // glPointSize(core::clamp(static_cast(material.Thickness), DimSmoothedPoint[0], DimSmoothedPoint[1])); // we don't use point smoothing glPointSize(core::clamp(static_cast(material.Thickness), DimAliasedPoint[0], DimAliasedPoint[1])); } else { @@ -1638,7 +1638,7 @@ void COGLES1Driver::setBasicRenderStates(const SMaterial &material, const SMater // Anti aliasing if (resetAllRenderStates || lastmaterial.AntiAliasing != material.AntiAliasing) { - // if (FeatureAvailable[IRR_ARB_multisample]) + // if (FeatureAvailable[IRR_ARB_multisample]) { if (material.AntiAliasing & EAAM_ALPHA_TO_COVERAGE) glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE); @@ -1750,7 +1750,7 @@ void COGLES1Driver::setTextureRenderStates(const SMaterial &material, bool reset E_TEXTURE_MIN_FILTER minFilter = material.TextureLayers[i].MinFilter; glTexParameteri(tmpTextureType, GL_TEXTURE_MIN_FILTER, minFilter == ETMINF_NEAREST_MIPMAP_NEAREST ? GL_NEAREST_MIPMAP_NEAREST : minFilter == ETMINF_LINEAR_MIPMAP_NEAREST ? GL_LINEAR_MIPMAP_NEAREST - : minFilter == ETMINF_NEAREST_MIPMAP_LINEAR ? GL_NEAREST_MIPMAP_LINEAR + : minFilter == ETMINF_NEAREST_MIPMAP_LINEAR ? GL_NEAREST_MIPMAP_LINEAR : (assert(minFilter == ETMINF_LINEAR_MIPMAP_LINEAR), GL_LINEAR_MIPMAP_LINEAR)); statesCache.MinFilter = minFilter; diff --git a/source/Irrlicht/COGLESDriver.h b/source/Irrlicht/COGLESDriver.h index 07178946a..143b11e8f 100644 --- a/source/Irrlicht/COGLESDriver.h +++ b/source/Irrlicht/COGLESDriver.h @@ -48,7 +48,7 @@ class COGLES1Driver : public CNullDriver, public IMaterialRendererServices, publ GLuint vbo_indicesID; // tmp GLuint vbo_verticesSize; // tmp - GLuint vbo_indicesSize; // tmp + GLuint vbo_indicesSize; // tmp }; bool updateVertexHardwareBuffer(SHWBufferLink_opengl *HWBuffer); @@ -78,7 +78,7 @@ class COGLES1Driver : public CNullDriver, public IMaterialRendererServices, publ //! queries the features of the driver, returns true if feature is available bool queryFeature(E_VIDEO_DRIVER_FEATURE feature) const override { - // return FeatureEnabled[feature] && COGLES1ExtensionHandler::queryFeature(feature); + // return FeatureEnabled[feature] && COGLES1ExtensionHandler::queryFeature(feature); return COGLES1ExtensionHandler::queryFeature(feature); } @@ -325,8 +325,8 @@ class COGLES1Driver : public CNullDriver, public IMaterialRendererServices, publ enum E_RENDER_MODE { ERM_NONE = 0, // no render state has been set yet. - ERM_2D, // 2d drawing rendermode - ERM_3D // 3d rendering mode + ERM_2D, // 2d drawing rendermode + ERM_3D // 3d rendering mode }; E_RENDER_MODE CurrentRenderMode; diff --git a/source/Irrlicht/COGLESMaterialRenderer.h b/source/Irrlicht/COGLESMaterialRenderer.h index 69d1b81ff..af9838c73 100644 --- a/source/Irrlicht/COGLESMaterialRenderer.h +++ b/source/Irrlicht/COGLESMaterialRenderer.h @@ -60,9 +60,9 @@ class COGLES1MaterialRenderer_ONETEXTURE_BLEND : public COGLES1MaterialRenderer { Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); - // if (material.MaterialType != lastMaterial.MaterialType || - // material.MaterialTypeParam != lastMaterial.MaterialTypeParam || - // resetAllRenderstates) + // if (material.MaterialType != lastMaterial.MaterialType || + // material.MaterialTypeParam != lastMaterial.MaterialTypeParam || + // resetAllRenderstates) { E_BLEND_FACTOR srcRGBFact, dstRGBFact, srcAlphaFact, dstAlphaFact; E_MODULATE_FUNC modulate; diff --git a/source/Irrlicht/COpenGLCoreCacheHandler.h b/source/Irrlicht/COpenGLCoreCacheHandler.h index 5bccca1d7..617baea4c 100644 --- a/source/Irrlicht/COpenGLCoreCacheHandler.h +++ b/source/Irrlicht/COpenGLCoreCacheHandler.h @@ -14,7 +14,7 @@ namespace video enum ESetTextureActive { - EST_ACTIVE_ALWAYS, // texture unit always active after set call + EST_ACTIVE_ALWAYS, // texture unit always active after set call EST_ACTIVE_ON_CHANGE // texture unit only active after call when texture changed in cache }; diff --git a/source/Irrlicht/COpenGLDriver.cpp b/source/Irrlicht/COpenGLDriver.cpp index 5d7db26bc..f12ad8e8d 100644 --- a/source/Irrlicht/COpenGLDriver.cpp +++ b/source/Irrlicht/COpenGLDriver.cpp @@ -162,8 +162,8 @@ bool COpenGLDriver::genericDriverInit() #endif // This is a fast replacement for NORMALIZE_NORMALS - // if ((Version>101) || FeatureAvailable[IRR_EXT_rescale_normal]) - // glEnable(GL_RESCALE_NORMAL_EXT); + // if ((Version>101) || FeatureAvailable[IRR_EXT_rescale_normal]) + // glEnable(GL_RESCALE_NORMAL_EXT); glClearDepth(1.0); glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); @@ -861,30 +861,30 @@ void COpenGLDriver::renderArray(const void *indexList, u32 primitiveCount, // prepare size and attenuation (where supported) GLfloat particleSize = Material.Thickness; - // if (AntiAlias) - // particleSize=core::clamp(particleSize, DimSmoothedPoint[0], DimSmoothedPoint[1]); - // else + // if (AntiAlias) + // particleSize=core::clamp(particleSize, DimSmoothedPoint[0], DimSmoothedPoint[1]); + // else particleSize = core::clamp(particleSize, DimAliasedPoint[0], DimAliasedPoint[1]); #if defined(GL_VERSION_1_4) || defined(GL_ARB_point_parameters) || defined(GL_EXT_point_parameters) || defined(GL_SGIS_point_parameters) const float att[] = {1.0f, 1.0f, 0.0f}; #if defined(GL_VERSION_1_4) extGlPointParameterfv(GL_POINT_DISTANCE_ATTENUATION, att); - // extGlPointParameterf(GL_POINT_SIZE_MIN,1.f); + // extGlPointParameterf(GL_POINT_SIZE_MIN,1.f); extGlPointParameterf(GL_POINT_SIZE_MAX, particleSize); extGlPointParameterf(GL_POINT_FADE_THRESHOLD_SIZE, 1.0f); #elif defined(GL_ARB_point_parameters) extGlPointParameterfv(GL_POINT_DISTANCE_ATTENUATION_ARB, att); - // extGlPointParameterf(GL_POINT_SIZE_MIN_ARB,1.f); + // extGlPointParameterf(GL_POINT_SIZE_MIN_ARB,1.f); extGlPointParameterf(GL_POINT_SIZE_MAX_ARB, particleSize); extGlPointParameterf(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 1.0f); #elif defined(GL_EXT_point_parameters) extGlPointParameterfv(GL_DISTANCE_ATTENUATION_EXT, att); - // extGlPointParameterf(GL_POINT_SIZE_MIN_EXT,1.f); + // extGlPointParameterf(GL_POINT_SIZE_MIN_EXT,1.f); extGlPointParameterf(GL_POINT_SIZE_MAX_EXT, particleSize); extGlPointParameterf(GL_POINT_FADE_THRESHOLD_SIZE_EXT, 1.0f); #elif defined(GL_SGIS_point_parameters) extGlPointParameterfv(GL_DISTANCE_ATTENUATION_SGIS, att); - // extGlPointParameterf(GL_POINT_SIZE_MIN_SGIS,1.f); + // extGlPointParameterf(GL_POINT_SIZE_MIN_SGIS,1.f); extGlPointParameterf(GL_POINT_SIZE_MAX_SGIS, particleSize); extGlPointParameterf(GL_POINT_FADE_THRESHOLD_SIZE_SGIS, 1.0f); #endif @@ -1819,7 +1819,7 @@ bool COpenGLDriver::testGLError(int code) break; #endif }; - // _IRR_DEBUG_BREAK_IF(true); + // _IRR_DEBUG_BREAK_IF(true); return true; #else return false; @@ -2325,7 +2325,7 @@ void COpenGLDriver::setBasicRenderStates(const SMaterial &material, const SMater // thickness if (resetAllRenderStates || lastmaterial.Thickness != material.Thickness) { if (AntiAlias) { - // glPointSize(core::clamp(static_cast(material.Thickness), DimSmoothedPoint[0], DimSmoothedPoint[1])); + // glPointSize(core::clamp(static_cast(material.Thickness), DimSmoothedPoint[0], DimSmoothedPoint[1])); // we don't use point smoothing glPointSize(core::clamp(static_cast(material.Thickness), DimAliasedPoint[0], DimAliasedPoint[1])); glLineWidth(core::clamp(static_cast(material.Thickness), DimSmoothedLine[0], DimSmoothedLine[1])); @@ -2461,7 +2461,7 @@ void COpenGLDriver::setTextureRenderStates(const SMaterial &material, bool reset E_TEXTURE_MIN_FILTER minFilter = material.TextureLayers[i].MinFilter; glTexParameteri(tmpType, GL_TEXTURE_MIN_FILTER, minFilter == ETMINF_NEAREST_MIPMAP_NEAREST ? GL_NEAREST_MIPMAP_NEAREST : minFilter == ETMINF_LINEAR_MIPMAP_NEAREST ? GL_LINEAR_MIPMAP_NEAREST - : minFilter == ETMINF_NEAREST_MIPMAP_LINEAR ? GL_NEAREST_MIPMAP_LINEAR + : minFilter == ETMINF_NEAREST_MIPMAP_LINEAR ? GL_NEAREST_MIPMAP_LINEAR : (assert(minFilter == ETMINF_LINEAR_MIPMAP_LINEAR), GL_LINEAR_MIPMAP_LINEAR)); statesCache.MinFilter = minFilter; @@ -3447,15 +3447,15 @@ IImage *COpenGLDriver::createScreenShot(video::ECOLOR_FORMAT format, video::E_RE u8 *tmpBuffer = new u8[pitch]; for (u32 i = 0; i < ScreenSize.Height; i += 2) { memcpy(tmpBuffer, pixels, pitch); - // for (u32 j=0; jdisableTextures(1); Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); - // if (material.MaterialType != lastMaterial.MaterialType || - // material.MaterialTypeParam != lastMaterial.MaterialTypeParam || - // resetAllRenderstates) + // if (material.MaterialType != lastMaterial.MaterialType || + // material.MaterialTypeParam != lastMaterial.MaterialTypeParam || + // resetAllRenderstates) { E_BLEND_FACTOR srcRGBFact, dstRGBFact, srcAlphaFact, dstAlphaFact; E_MODULATE_FUNC modulate; diff --git a/source/Irrlicht/COpenGLShaderMaterialRenderer.cpp b/source/Irrlicht/COpenGLShaderMaterialRenderer.cpp index 6f1b62abf..945c8c0ed 100644 --- a/source/Irrlicht/COpenGLShaderMaterialRenderer.cpp +++ b/source/Irrlicht/COpenGLShaderMaterialRenderer.cpp @@ -161,10 +161,10 @@ void COpenGLShaderMaterialRenderer::OnSetMaterial(const video::SMaterial &materi if (material.FogEnable) { GLint curFogMode; glGetIntegerv(GL_FOG_MODE, &curFogMode); - // if (Driver->LinearFog && PixelShader[1]) + // if (Driver->LinearFog && PixelShader[1]) if (curFogMode == GL_LINEAR && PixelShader[1]) nextShader = PixelShader[1]; - // else if (!Driver->LinearFog && PixelShader[2]) + // else if (!Driver->LinearFog && PixelShader[2]) else if (curFogMode == GL_EXP && PixelShader[2]) nextShader = PixelShader[2]; else if (curFogMode == GL_EXP2 && PixelShader[3]) diff --git a/source/Irrlicht/CSkinnedMesh.cpp b/source/Irrlicht/CSkinnedMesh.cpp index 9dd00667d..4d4c1ad56 100644 --- a/source/Irrlicht/CSkinnedMesh.cpp +++ b/source/Irrlicht/CSkinnedMesh.cpp @@ -46,12 +46,12 @@ irr::u32 dropMiddleKeys(irr::core::array &array, Cmp &cmp) if (cmp(array[j], array[s])) continue; // same key, handle later - if (j > s + 1) // had there been identical keys? + if (j > s + 1) // had there been identical keys? array[n++] = array[j - 1]; // keep the last - array[n++] = array[j]; // keep the new one + array[n++] = array[j]; // keep the new one s = j; } - if (array.size() > s + 1) // identical keys at the array end? + if (array.size() > s + 1) // identical keys at the array end? array[n++] = array[array.size() - 1]; // keep the last irr::u32 d = array.size() - n; // remove already copied keys @@ -144,7 +144,7 @@ IMesh *CSkinnedMesh::getMesh(s32 frame, s32 detailLevel, s32 startFrameLoop, s32 } //-------------------------------------------------------------------------- -// Keyframe Animation +// Keyframe Animation //-------------------------------------------------------------------------- //! Animates this mesh's joints based on frame input @@ -219,7 +219,7 @@ void CSkinnedMesh::buildAllLocalAnimatedMatrices() joint->GlobalSkinningSpace = false; // IRR_TEST_BROKEN_QUATERNION_USE: TODO - switched to getMatrix_transposed instead of getMatrix for downward compatibility. - // Not tested so far if this was correct or wrong before quaternion fix! + // Not tested so far if this was correct or wrong before quaternion fix! joint->Animatedrotation.getMatrix_transposed(joint->LocalAnimatedMatrix); // --- joint->LocalAnimatedMatrix *= joint->Animatedrotation.getMatrix() --- @@ -448,7 +448,7 @@ void CSkinnedMesh::getFrameData(f32 frame, SJoint *joint, } //-------------------------------------------------------------------------- -// Software Skinning +// Software Skinning //-------------------------------------------------------------------------- //! Preforms a software skin on this mesh based of joint positions diff --git a/source/Irrlicht/CWGLManager.cpp b/source/Irrlicht/CWGLManager.cpp index 71eccca0d..d0ae35a92 100644 --- a/source/Irrlicht/CWGLManager.cpp +++ b/source/Irrlicht/CWGLManager.cpp @@ -85,25 +85,25 @@ bool CWGLManager::initialize(const SIrrlichtCreationParameters ¶ms, const SE // Set up pixel format descriptor with desired parameters PIXELFORMATDESCRIPTOR tmp_pfd = { - sizeof(PIXELFORMATDESCRIPTOR), // Size Of This Pixel Format Descriptor - 1, // Version Number - (DWORD)(PFD_DRAW_TO_WINDOW | // Format Must Support Window - PFD_SUPPORT_OPENGL | // Format Must Support OpenGL + sizeof(PIXELFORMATDESCRIPTOR), // Size Of This Pixel Format Descriptor + 1, // Version Number + (DWORD)(PFD_DRAW_TO_WINDOW | // Format Must Support Window + PFD_SUPPORT_OPENGL | // Format Must Support OpenGL (Params.Doublebuffer ? PFD_DOUBLEBUFFER : 0) | // Must Support Double Buffering - (Params.Stereobuffer ? PFD_STEREO : 0)), // Must Support Stereo Buffer - PFD_TYPE_RGBA, // Request An RGBA Format - Params.Bits, // Select Our Color Depth - 0, 0, 0, 0, 0, 0, // Color Bits Ignored - 0, // No Alpha Buffer - 0, // Shift Bit Ignored - 0, // No Accumulation Buffer - 0, 0, 0, 0, // Accumulation Bits Ignored - Params.ZBufferBits, // Z-Buffer (Depth Buffer) - BYTE(Params.Stencilbuffer ? 1 : 0), // Stencil Buffer Depth - 0, // No Auxiliary Buffer - PFD_MAIN_PLANE, // Main Drawing Layer - 0, // Reserved - 0, 0, 0 // Layer Masks Ignored + (Params.Stereobuffer ? PFD_STEREO : 0)), // Must Support Stereo Buffer + PFD_TYPE_RGBA, // Request An RGBA Format + Params.Bits, // Select Our Color Depth + 0, 0, 0, 0, 0, 0, // Color Bits Ignored + 0, // No Alpha Buffer + 0, // Shift Bit Ignored + 0, // No Accumulation Buffer + 0, 0, 0, 0, // Accumulation Bits Ignored + Params.ZBufferBits, // Z-Buffer (Depth Buffer) + BYTE(Params.Stencilbuffer ? 1 : 0), // Stencil Buffer Depth + 0, // No Auxiliary Buffer + PFD_MAIN_PLANE, // Main Drawing Layer + 0, // Reserved + 0, 0, 0 // Layer Masks Ignored }; pfd = tmp_pfd; @@ -225,7 +225,7 @@ bool CWGLManager::initialize(const SIrrlichtCreationParameters ¶ms, const SE #elif defined(WGL_EXT_framebuffer_sRGB) WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT, Params.HandleSRGB ? 1 : 0, #endif - // WGL_DEPTH_FLOAT_EXT, 1, + // WGL_DEPTH_FLOAT_EXT, 1, 0, 0, 0, 0}; int iAttrSize = sizeof(iAttributes) / sizeof(int); const bool framebuffer_srgb_supported = ((wglExtensions.find("WGL_ARB_framebuffer_sRGB") != -1) || @@ -364,7 +364,7 @@ bool CWGLManager::generateContext() { WGL_CONTEXT_MAJOR_VERSION_ARB, 1, WGL_CONTEXT_MINOR_VERSION_ARB, 1, - // WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_DEBUG_BIT_ARB, // enable to get a debug context (depends on driver if that does anything) + // WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_DEBUG_BIT_ARB, // enable to get a debug context (depends on driver if that does anything) 0}; hrc = wglCreateContextAttribs_ARB(HDc, 0, iAttribs); } else diff --git a/source/Irrlicht/CWebGL1Driver.cpp b/source/Irrlicht/CWebGL1Driver.cpp index a93fa1192..8e01ba946 100644 --- a/source/Irrlicht/CWebGL1Driver.cpp +++ b/source/Irrlicht/CWebGL1Driver.cpp @@ -875,7 +875,7 @@ bool CWebGL1Driver::getColorFormatParameters(ECOLOR_FORMAT format, GLint &intern if (WebGLExtensions.queryWebGLFeature(CWebGLExtensionHandler::IRR_WEBGL_depth_texture)) { supported = true; pixelFormat = 0x84F9; // GL_DEPTH_STENCIL - pixelType = 0x84FA; // UNSIGNED_INT_24_8_WEBGL + pixelType = 0x84FA; // UNSIGNED_INT_24_8_WEBGL } break; case ECF_R8: diff --git a/source/Irrlicht/CWebGLExtensionHandler.h b/source/Irrlicht/CWebGLExtensionHandler.h index 8537ea80b..e35d9dafd 100644 --- a/source/Irrlicht/CWebGLExtensionHandler.h +++ b/source/Irrlicht/CWebGLExtensionHandler.h @@ -24,45 +24,45 @@ class CWebGLExtensionHandler // Last updated was up to (including) extension number 35 (EXT_float_blend) // Khronos ratified WebGL Extensions - IRR_OES_texture_float, // 1 - IRR_OES_texture_half_float, // 2 - IRR_WEBGL_lose_context, // 3 - IRR_OES_standard_derivatives, // 4 - IRR_OES_vertex_array_object, // 5 - IRR_WEBGL_debug_renderer_info, // 6 - IRR_WEBGL_debug_shaders, // 7 - IRR_WEBGL_compressed_texture_s3tc, // 8 - IRR_WEBGL_depth_texture, // 9 - IRR_OES_element_index_uint, // 10 + IRR_OES_texture_float, // 1 + IRR_OES_texture_half_float, // 2 + IRR_WEBGL_lose_context, // 3 + IRR_OES_standard_derivatives, // 4 + IRR_OES_vertex_array_object, // 5 + IRR_WEBGL_debug_renderer_info, // 6 + IRR_WEBGL_debug_shaders, // 7 + IRR_WEBGL_compressed_texture_s3tc, // 8 + IRR_WEBGL_depth_texture, // 9 + IRR_OES_element_index_uint, // 10 IRR_EXT_texture_filter_anisotropic, // 11 - IRR_EXT_frag_depth, // 16 - IRR_WEBGL_draw_buffers, // 18 - IRR_ANGLE_instanced_arrays, // 19 - IRR_OES_texture_float_linear, // 20 - IRR_OES_texture_half_float_linear, // 21 - IRR_EXT_blend_minmax, // 25 - IRR_EXT_shader_texture_lod, // 27 + IRR_EXT_frag_depth, // 16 + IRR_WEBGL_draw_buffers, // 18 + IRR_ANGLE_instanced_arrays, // 19 + IRR_OES_texture_float_linear, // 20 + IRR_OES_texture_half_float_linear, // 21 + IRR_EXT_blend_minmax, // 25 + IRR_EXT_shader_texture_lod, // 27 // Community approved WebGL Extensions - IRR_WEBGL_compressed_texture_atc, // 12 - IRR_WEBGL_compressed_texture_pvrtc, // 13 - IRR_EXT_color_buffer_half_float, // 14 - IRR_WEBGL_color_buffer_float, // 15 - IRR_EXT_sRGB, // 17 - IRR_WEBGL_compressed_texture_etc1, // 24 - IRR_EXT_disjoint_timer_query, // 26 - IRR_WEBGL_compressed_texture_etc, // 29 - IRR_WEBGL_compressed_texture_astc, // 30 - IRR_EXT_color_buffer_float, // 31 + IRR_WEBGL_compressed_texture_atc, // 12 + IRR_WEBGL_compressed_texture_pvrtc, // 13 + IRR_EXT_color_buffer_half_float, // 14 + IRR_WEBGL_color_buffer_float, // 15 + IRR_EXT_sRGB, // 17 + IRR_WEBGL_compressed_texture_etc1, // 24 + IRR_EXT_disjoint_timer_query, // 26 + IRR_WEBGL_compressed_texture_etc, // 29 + IRR_WEBGL_compressed_texture_astc, // 30 + IRR_EXT_color_buffer_float, // 31 IRR_WEBGL_compressed_texture_s3tc_srgb, // 32 - IRR_EXT_disjoint_timer_query_webgl2, // 33 + IRR_EXT_disjoint_timer_query_webgl2, // 33 // Draft WebGL Extensions - IRR_WEBGL_shared_resources, // 22 + IRR_WEBGL_shared_resources, // 22 IRR_WEBGL_security_sensitive_resources, // 23 - IRR_OES_fbo_render_mipmap, // 28 - IRR_WEBGL_get_buffer_sub_data_async, // 34 - IRR_EXT_float_blend, // 35 + IRR_OES_fbo_render_mipmap, // 28 + IRR_WEBGL_get_buffer_sub_data_async, // 34 + IRR_EXT_float_blend, // 35 IRR_WEBGL_Feature_Count }; diff --git a/source/Irrlicht/CXMeshFileLoader.cpp b/source/Irrlicht/CXMeshFileLoader.cpp index 2dd03570b..8627bd3d9 100644 --- a/source/Irrlicht/CXMeshFileLoader.cpp +++ b/source/Irrlicht/CXMeshFileLoader.cpp @@ -770,9 +770,9 @@ bool CXMeshFileLoader::parseDataObjectMesh(SXMesh &mesh) s16 tangenttype = -1; s16 binormaltype = -1; - (void)tangentpos; // disable unused variable warnings - (void)binormalpos; // disable unused variable warnings - (void)tangenttype; // disable unused variable warnings + (void)tangentpos; // disable unused variable warnings + (void)binormalpos; // disable unused variable warnings + (void)tangenttype; // disable unused variable warnings (void)binormaltype; // disable unused variable warnings for (j = 0; j < dcnt; ++j) { @@ -1233,7 +1233,7 @@ bool CXMeshFileLoader::parseDataObjectMeshMaterialList(SXMesh &mesh) // being represented as 1;1;0;; which means 1 material, 1 face with first material // all the other faces have to obey then, so check is disabled // if (nFaceIndices != mesh.IndexCountPerFace.size()) - // os::Printer::log("Index count per face not equal to face material index count in x file.", ELL_WARNING); + // os::Printer::log("Index count per face not equal to face material index count in x file.", ELL_WARNING); // read non triangulated face indices and create triangulated ones mesh.FaceMaterialIndices.set_used(mesh.Indices.size() / 3); diff --git a/source/Irrlicht/CZipReader.cpp b/source/Irrlicht/CZipReader.cpp index 049e02c3e..ac8894eac 100644 --- a/source/Irrlicht/CZipReader.cpp +++ b/source/Irrlicht/CZipReader.cpp @@ -96,7 +96,7 @@ bool CArchiveLoaderZIP::isALoadableFileFormat(io::IReadFile *file) const header.Sig = os::Byteswap::byteswap(header.Sig); #endif - return header.Sig == 0x04034b50 || // ZIP + return header.Sig == 0x04034b50 || // ZIP (header.Sig & 0xffff) == 0x8b1f; // gzip } diff --git a/source/Irrlicht/CZipReader.h b/source/Irrlicht/CZipReader.h index ad1b73447..85122032c 100644 --- a/source/Irrlicht/CZipReader.h +++ b/source/Irrlicht/CZipReader.h @@ -73,13 +73,13 @@ struct SZIPFileCentralDirFileHeader struct SZIPFileCentralDirEnd { - u32 Sig; // 'PK0506' end_of central dir signature // (0x06054b50) - u16 NumberDisk; // number of this disk + u32 Sig; // 'PK0506' end_of central dir signature // (0x06054b50) + u16 NumberDisk; // number of this disk u16 NumberStart; // number of the disk with the start of the central directory - u16 TotalDisk; // total number of entries in the central dir on this disk + u16 TotalDisk; // total number of entries in the central dir on this disk u16 TotalEntries; // total number of entries in the central dir - u32 Size; // size of the central directory - u32 Offset; // offset of start of centraldirectory with respect to the starting disk number + u32 Size; // size of the central directory + u32 Offset; // offset of start of centraldirectory with respect to the starting disk number u16 CommentLength; // zipfile comment length // zipfile comment (variable size) } PACK_STRUCT; @@ -109,7 +109,7 @@ enum E_GZIP_FLAGS struct SGZIPMemberHeader { - u16 sig; // 0x8b1f + u16 sig; // 0x8b1f u8 compressionMethod; // 8 = deflate u8 flags; u32 time; diff --git a/source/Irrlicht/Irrlicht.cpp b/source/Irrlicht/Irrlicht.cpp index cde03c349..ca746a96d 100644 --- a/source/Irrlicht/Irrlicht.cpp +++ b/source/Irrlicht/Irrlicht.cpp @@ -86,7 +86,7 @@ extern "C" IRRLICHT_API IrrlichtDevice *IRRCALLCONV createDeviceEx(const SIrrlic if (dev && !dev->getVideoDriver() && params.DriverType != video::EDT_NULL) { dev->closeDevice(); // destroy window - dev->run(); // consume quit message + dev->run(); // consume quit message dev->drop(); dev = 0; } diff --git a/source/Irrlicht/OpenGL/Driver.cpp b/source/Irrlicht/OpenGL/Driver.cpp index c9f5fa183..13cc94cf7 100644 --- a/source/Irrlicht/OpenGL/Driver.cpp +++ b/source/Irrlicht/OpenGL/Driver.cpp @@ -243,11 +243,11 @@ bool COpenGL3DriverBase::genericDriverInit(const core::dimension2d &screenS DriverAttributes->setAttribute("MaxTextures", (s32)Feature.MaxTextureUnits); DriverAttributes->setAttribute("MaxSupportedTextures", (s32)Feature.MaxTextureUnits); - // DriverAttributes->setAttribute("MaxLights", MaxLights); + // DriverAttributes->setAttribute("MaxLights", MaxLights); DriverAttributes->setAttribute("MaxAnisotropy", MaxAnisotropy); - // DriverAttributes->setAttribute("MaxUserClipPlanes", MaxUserClipPlanes); - // DriverAttributes->setAttribute("MaxAuxBuffers", MaxAuxBuffers); - // DriverAttributes->setAttribute("MaxMultipleRenderTargets", MaxMultipleRenderTargets); + // DriverAttributes->setAttribute("MaxUserClipPlanes", MaxUserClipPlanes); + // DriverAttributes->setAttribute("MaxAuxBuffers", MaxAuxBuffers); + // DriverAttributes->setAttribute("MaxMultipleRenderTargets", MaxMultipleRenderTargets); DriverAttributes->setAttribute("MaxIndices", (s32)MaxIndices); DriverAttributes->setAttribute("MaxTextureSize", (s32)MaxTextureSize); DriverAttributes->setAttribute("MaxTextureLODBias", MaxTextureLODBias); @@ -1410,7 +1410,7 @@ void COpenGL3DriverBase::setTextureRenderStates(const SMaterial &material, bool E_TEXTURE_MIN_FILTER minFilter = material.TextureLayers[i].MinFilter; GL.TexParameteri(tmpTextureType, GL_TEXTURE_MIN_FILTER, minFilter == ETMINF_NEAREST_MIPMAP_NEAREST ? GL_NEAREST_MIPMAP_NEAREST : minFilter == ETMINF_LINEAR_MIPMAP_NEAREST ? GL_LINEAR_MIPMAP_NEAREST - : minFilter == ETMINF_NEAREST_MIPMAP_LINEAR ? GL_NEAREST_MIPMAP_LINEAR + : minFilter == ETMINF_NEAREST_MIPMAP_LINEAR ? GL_NEAREST_MIPMAP_LINEAR : (assert(minFilter == ETMINF_LINEAR_MIPMAP_LINEAR), GL_LINEAR_MIPMAP_LINEAR)); tmpTexture->getStatesCache().MinFilter = minFilter; @@ -1841,8 +1841,8 @@ IImage *COpenGL3DriverBase::createScreenShot(video::ECOLOR_FORMAT format, video: GLint internalformat = GL_RGBA; GLint type = GL_UNSIGNED_BYTE; { - // GL.GetIntegerv(GL_IMPLEMENTATION_COLOR_READ_FORMAT, &internalformat); - // GL.GetIntegerv(GL_IMPLEMENTATION_COLOR_READ_TYPE, &type); + // GL.GetIntegerv(GL_IMPLEMENTATION_COLOR_READ_FORMAT, &internalformat); + // GL.GetIntegerv(GL_IMPLEMENTATION_COLOR_READ_TYPE, &type); // there's a format we don't support ATM if (GL_UNSIGNED_SHORT_4_4_4_4 == type) { internalformat = GL_RGBA; diff --git a/source/Irrlicht/OpenGL/Driver.h b/source/Irrlicht/OpenGL/Driver.h index 42d1a2276..d1dd0f0d5 100644 --- a/source/Irrlicht/OpenGL/Driver.h +++ b/source/Irrlicht/OpenGL/Driver.h @@ -53,7 +53,7 @@ class COpenGL3DriverBase : public CNullDriver, public IMaterialRendererServices, } u32 vbo_verticesID; // tmp - u32 vbo_indicesID; // tmp + u32 vbo_indicesID; // tmp u32 vbo_verticesSize; // tmp u32 vbo_indicesSize; // tmp @@ -132,7 +132,7 @@ class COpenGL3DriverBase : public CNullDriver, public IMaterialRendererServices, SColor color = SColor(255, 255, 255, 255)) override; //! Draws a pixel - // virtual void drawPixel(u32 x, u32 y, const SColor & color); + // virtual void drawPixel(u32 x, u32 y, const SColor & color); //! Returns the name of the video driver. const wchar_t *getName() const override; @@ -385,8 +385,8 @@ class COpenGL3DriverBase : public CNullDriver, public IMaterialRendererServices, enum E_RENDER_MODE { ERM_NONE = 0, // no render state has been set yet. - ERM_2D, // 2d drawing rendermode - ERM_3D // 3d rendering mode + ERM_2D, // 2d drawing rendermode + ERM_3D // 3d rendering mode }; E_RENDER_MODE CurrentRenderMode; diff --git a/source/Irrlicht/OpenGL3/Driver.cpp b/source/Irrlicht/OpenGL3/Driver.cpp index ce5449e82..f537266cb 100644 --- a/source/Irrlicht/OpenGL3/Driver.cpp +++ b/source/Irrlicht/OpenGL3/Driver.cpp @@ -39,8 +39,8 @@ void COpenGL3Driver::initFeatures() initExtensionsNew(); TextureFormats[ECF_A1R5G5B5] = {GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV}; // WARNING: may not be renderable - TextureFormats[ECF_R5G6B5] = {GL_RGB, GL_RGB, GL_UNSIGNED_SHORT_5_6_5}; // GL_RGB565 is an extension until 4.1 - TextureFormats[ECF_R8G8B8] = {GL_RGB8, GL_RGB, GL_UNSIGNED_BYTE}; // WARNING: may not be renderable + TextureFormats[ECF_R5G6B5] = {GL_RGB, GL_RGB, GL_UNSIGNED_SHORT_5_6_5}; // GL_RGB565 is an extension until 4.1 + TextureFormats[ECF_R8G8B8] = {GL_RGB8, GL_RGB, GL_UNSIGNED_BYTE}; // WARNING: may not be renderable TextureFormats[ECF_A8R8G8B8] = {GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV}; TextureFormats[ECF_R16F] = {GL_R16F, GL_RED, GL_HALF_FLOAT}; TextureFormats[ECF_G16R16F] = {GL_RG16F, GL_RG, GL_HALF_FLOAT}; diff --git a/source/Irrlicht/S2DVertex.h b/source/Irrlicht/S2DVertex.h index 113c9f6f2..7e6ad18cc 100644 --- a/source/Irrlicht/S2DVertex.h +++ b/source/Irrlicht/S2DVertex.h @@ -15,9 +15,9 @@ namespace video struct S2DVertex { - core::vector2d Pos; // position + core::vector2d Pos; // position core::vector2d TCoords; // texture coordinates - TZBufferType ZValue; // zvalue + TZBufferType ZValue; // zvalue u16 Color; };