diff --git a/examples/AutomatedTest/test_array.cpp b/examples/AutomatedTest/test_array.cpp index 7b2d8228..42959e91 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 702ffe69..95979bef 100644 --- a/include/ECullingTypes.h +++ b/include/ECullingTypes.h @@ -24,10 +24,10 @@ enum E_CULLING_TYPE //! Names for 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, }; diff --git a/include/ICursorControl.h b/include/ICursorControl.h index cb20a873..65b8efb7 100644 --- a/include/ICursorControl.h +++ b/include/ICursorControl.h @@ -19,19 +19,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 38961e4d..6134b79f 100644 --- a/include/IEventReceiver.h +++ b/include/IEventReceiver.h @@ -464,9 +464,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 a2bb4534..fb77b48c 100644 --- a/include/IFileArchive.h +++ b/include/IFileArchive.h @@ -17,7 +17,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/IGUIElement.h b/include/IGUIElement.h index 6c5de88e..866ca282 100644 --- a/include/IGUIElement.h +++ b/include/IGUIElement.h @@ -706,7 +706,7 @@ protected: 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/Keycodes.h b/include/Keycodes.h index cdda9d0c..cdc90d19 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 1fdb9a4a..c803f5fd 100644 --- a/include/SMaterial.h +++ b/include/SMaterial.h @@ -23,32 +23,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_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_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_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_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_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 diff --git a/include/matrix4.h b/include/matrix4.h index 1a541784..374fc6e4 100644 --- a/include/matrix4.h +++ b/include/matrix4.h @@ -1618,9 +1618,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; @@ -1660,9 +1660,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; @@ -1702,9 +1702,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; @@ -1745,9 +1745,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 d0e9d18a..35c33ef6 100644 --- a/source/Irrlicht/Android/CIrrDeviceAndroid.cpp +++ b/source/Irrlicht/Android/CIrrDeviceAndroid.cpp @@ -523,102 +523,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 @@ -637,118 +637,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.h b/source/Irrlicht/CAnimatedMeshSceneNode.h index 5d912c7f..0364ab52 100644 --- a/source/Irrlicht/CAnimatedMeshSceneNode.h +++ b/source/Irrlicht/CAnimatedMeshSceneNode.h @@ -154,8 +154,8 @@ private: 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 1801b537..6ee24af0 100644 --- a/source/Irrlicht/CB3DMeshFileLoader.cpp +++ b/source/Irrlicht/CB3DMeshFileLoader.cpp @@ -698,9 +698,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)); @@ -871,7 +871,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/CCameraSceneNode.cpp b/source/Irrlicht/CCameraSceneNode.cpp index e480a114..f8899e5f 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 ad21a965..66875630 100644 --- a/source/Irrlicht/CCameraSceneNode.h +++ b/source/Irrlicht/CCameraSceneNode.h @@ -149,10 +149,10 @@ protected: 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 4028a17c..971b3935 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 ded95ae6..bffb703d 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 230b8a98..8593621b 100644 --- a/source/Irrlicht/CGLXManager.cpp +++ b/source/Irrlicht/CGLXManager.cpp @@ -191,7 +191,7 @@ 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 None, }; diff --git a/source/Irrlicht/CGLXManager.h b/source/Irrlicht/CGLXManager.h index e39a0767..f940d431 100644 --- a/source/Irrlicht/CGLXManager.h +++ b/source/Irrlicht/CGLXManager.h @@ -68,7 +68,7 @@ private: 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 e81b565e..8d03caf4 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; diff --git a/source/Irrlicht/CGUIFont.cpp b/source/Irrlicht/CGUIFont.cpp index f742170a..4d85702f 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 84976092..84ceaeab 100644 --- a/source/Irrlicht/CGUISkin.cpp +++ b/source/Irrlicht/CGUISkin.cpp @@ -67,7 +67,7 @@ CGUISkin::CGUISkin(EGUI_SKIN_TYPE type, video::IVideoDriver *driver) : // 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] = 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; diff --git a/source/Irrlicht/CImageLoaderJPG.h b/source/Irrlicht/CImageLoaderJPG.h index 4d804de9..921a46a2 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 7abe1a2c..5b7cc614 100644 --- a/source/Irrlicht/CImageLoaderTGA.cpp +++ b/source/Irrlicht/CImageLoaderTGA.cpp @@ -152,9 +152,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 b590613e..574e4604 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 86096583..71eb0f26 100644 --- a/source/Irrlicht/CIrrDeviceLinux.cpp +++ b/source/Irrlicht/CIrrDeviceLinux.cpp @@ -412,7 +412,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 @@ -1439,18 +1439,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)); @@ -1465,11 +1465,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)); @@ -1501,7 +1501,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)); @@ -1637,8 +1637,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; @@ -1721,16 +1721,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; @@ -1936,11 +1936,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, @@ -1948,7 +1948,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]; @@ -2145,10 +2145,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 54edf116..8e484344 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 @@ struct JoystickInfo 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() : diff --git a/source/Irrlicht/CIrrDeviceSDL.cpp b/source/Irrlicht/CIrrDeviceSDL.cpp index bc4c9bb3..17dc033d 100644 --- a/source/Irrlicht/CIrrDeviceSDL.cpp +++ b/source/Irrlicht/CIrrDeviceSDL.cpp @@ -1244,19 +1244,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.h b/source/Irrlicht/CIrrDeviceWin32.h index 3ac36fd2..8a4c1427 100644 --- a/source/Irrlicht/CIrrDeviceWin32.h +++ b/source/Irrlicht/CIrrDeviceWin32.h @@ -136,7 +136,7 @@ public: } #endif if ((visible && info.flags == CURSOR_SHOWING) || // visible - (!visible && info.flags == 0)) // hidden + (!visible && info.flags == 0)) // hidden { break; } diff --git a/source/Irrlicht/COGLESDriver.cpp b/source/Irrlicht/COGLESDriver.cpp index c38229e7..2cd8430f 100644 --- a/source/Irrlicht/COGLESDriver.cpp +++ b/source/Irrlicht/COGLESDriver.cpp @@ -1624,7 +1624,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 8733ab36..82b4a179 100644 --- a/source/Irrlicht/COGLESDriver.h +++ b/source/Irrlicht/COGLESDriver.h @@ -48,7 +48,7 @@ public: GLuint vbo_indicesID; // tmp GLuint vbo_verticesSize; // tmp - GLuint vbo_indicesSize; // tmp + GLuint vbo_indicesSize; // tmp }; bool updateVertexHardwareBuffer(SHWBufferLink_opengl *HWBuffer); @@ -293,8 +293,8 @@ private: 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/COpenGLCoreCacheHandler.h b/source/Irrlicht/COpenGLCoreCacheHandler.h index 6422f26b..ae366131 100644 --- a/source/Irrlicht/COpenGLCoreCacheHandler.h +++ b/source/Irrlicht/COpenGLCoreCacheHandler.h @@ -16,7 +16,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 ad43881b..ef560e33 100644 --- a/source/Irrlicht/COpenGLDriver.cpp +++ b/source/Irrlicht/COpenGLDriver.cpp @@ -2301,7 +2301,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; diff --git a/source/Irrlicht/COpenGLDriver.h b/source/Irrlicht/COpenGLDriver.h index 9618e5c1..6fe8ac37 100644 --- a/source/Irrlicht/COpenGLDriver.h +++ b/source/Irrlicht/COpenGLDriver.h @@ -35,10 +35,10 @@ public: // Information about state of fixed pipeline activity. enum E_OPENGL_FIXED_PIPELINE_STATE { - EOFPS_ENABLE = 0, // fixed pipeline. - EOFPS_DISABLE, // programmable pipeline. + EOFPS_ENABLE = 0, // fixed pipeline. + EOFPS_DISABLE, // programmable pipeline. EOFPS_ENABLE_TO_DISABLE, // switch from fixed to programmable pipeline. - EOFPS_DISABLE_TO_ENABLE // switch from programmable to fixed pipeline. + EOFPS_DISABLE_TO_ENABLE // switch from programmable to fixed pipeline. }; COpenGLDriver(const SIrrlichtCreationParameters ¶ms, io::IFileSystem *io, IContextManager *contextManager); @@ -65,7 +65,7 @@ public: GLuint vbo_indicesID; // tmp GLuint vbo_verticesSize; // tmp - GLuint vbo_indicesSize; // tmp + GLuint vbo_indicesSize; // tmp }; //! updates hardware buffer if needed @@ -392,8 +392,8 @@ private: 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/CSkinnedMesh.cpp b/source/Irrlicht/CSkinnedMesh.cpp index 03f4ed57..eb731730 100644 --- a/source/Irrlicht/CSkinnedMesh.cpp +++ b/source/Irrlicht/CSkinnedMesh.cpp @@ -47,12 +47,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 diff --git a/source/Irrlicht/CWGLManager.cpp b/source/Irrlicht/CWGLManager.cpp index 3084563f..9c071a9e 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; diff --git a/source/Irrlicht/CXMeshFileLoader.cpp b/source/Irrlicht/CXMeshFileLoader.cpp index b1dc184c..5978980f 100644 --- a/source/Irrlicht/CXMeshFileLoader.cpp +++ b/source/Irrlicht/CXMeshFileLoader.cpp @@ -768,9 +768,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) { diff --git a/source/Irrlicht/CZipReader.cpp b/source/Irrlicht/CZipReader.cpp index 049e02c3..b761c72e 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 ad1b7344..d9afd668 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 cde03c34..c97e5d30 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 d472fd34..73c3451f 100644 --- a/source/Irrlicht/OpenGL/Driver.cpp +++ b/source/Irrlicht/OpenGL/Driver.cpp @@ -1416,7 +1416,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; diff --git a/source/Irrlicht/OpenGL/Driver.h b/source/Irrlicht/OpenGL/Driver.h index b0ac8278..fefb12e2 100644 --- a/source/Irrlicht/OpenGL/Driver.h +++ b/source/Irrlicht/OpenGL/Driver.h @@ -53,7 +53,7 @@ public: } u32 vbo_verticesID; // tmp - u32 vbo_indicesID; // tmp + u32 vbo_indicesID; // tmp u32 vbo_verticesSize; // tmp u32 vbo_indicesSize; // tmp @@ -368,8 +368,8 @@ private: 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 ce5449e8..8196a811 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};