Last active
August 29, 2015 14:03
-
-
Save jvcleave/a9e8d7cee4cdd74fb5b1 to your computer and use it in GitHub Desktop.
Jetson TK1 OF 0.8.3 diff
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Only in openFrameworks/apps/myApps/emptyExample: bin | |
| Only in openFrameworks/apps/myApps/emptyExample: obj | |
| Only in openFrameworks/examples/utils/conversionExample/bin: conversionExample | |
| Only in openFrameworks/examples/utils/conversionExample/bin: conversionExample_debug | |
| Only in openFrameworks/examples/utils/conversionExample/bin: libs | |
| Only in openFrameworks/examples/utils/conversionExample/bin: readMe.txt | |
| Only in openFrameworks/examples/utils/conversionExample: obj | |
| Only in openFrameworks/examples/utils/fileOpenSaveDialogExample: obj | |
| Only in openFrameworks/examples/utils/windowExample/bin: libs | |
| Only in openFrameworks/examples/utils/windowExample/bin: readMe.txt | |
| Only in openFrameworks/examples/utils/windowExample/bin: windowExample | |
| Only in openFrameworks/examples/utils/windowExample/bin: windowExample_debug | |
| Only in openFrameworks/examples/utils/windowExample: obj | |
| diff -bur openFrameworks_old/libs/glfw/include/GLFW/glfw3.h openFrameworks/libs/glfw/include/GLFW/glfw3.h | |
| --- openFrameworks_old/libs/glfw/include/GLFW/glfw3.h 2014-07-02 15:47:13.000000000 +0000 | |
| +++ openFrameworks/libs/glfw/include/GLFW/glfw3.h 2014-07-14 03:56:31.000000000 +0000 | |
| @@ -169,9 +169,9 @@ | |
| #endif | |
| #if defined(GLFW_DLL) && defined(_GLFW_BUILD_DLL) | |
| - /* GLFW_DLL is defined by users of GLFW when compiling programs that will link | |
| - * to the DLL version of the GLFW library. _GLFW_BUILD_DLL is defined by the | |
| - * GLFW configuration header when compiling the DLL version of the library. | |
| + /* GLFW_DLL must be defined by applications that are linking against the DLL | |
| + * version of the GLFW library. _GLFW_BUILD_DLL is defined by the GLFW | |
| + * configuration header when compiling the DLL version of the library. | |
| */ | |
| #error "You must not have both GLFW_DLL and _GLFW_BUILD_DLL defined" | |
| #endif | |
| @@ -497,6 +497,8 @@ | |
| #define GLFW_RESIZABLE 0x00020003 | |
| #define GLFW_VISIBLE 0x00020004 | |
| #define GLFW_DECORATED 0x00020005 | |
| +#define GLFW_AUTO_ICONIFY 0x00020006 | |
| +#define GLFW_FLOATING 0x00020007 | |
| #define GLFW_RED_BITS 0x00021001 | |
| #define GLFW_GREEN_BITS 0x00021002 | |
| @@ -513,6 +515,7 @@ | |
| #define GLFW_SAMPLES 0x0002100D | |
| #define GLFW_SRGB_CAPABLE 0x0002100E | |
| #define GLFW_REFRESH_RATE 0x0002100F | |
| +#define GLFW_DOUBLEBUFFER 0x00021010 | |
| #define GLFW_CLIENT_API 0x00022001 | |
| #define GLFW_CONTEXT_VERSION_MAJOR 0x00022002 | |
| @@ -545,6 +548,8 @@ | |
| #define GLFW_CONNECTED 0x00040001 | |
| #define GLFW_DISCONNECTED 0x00040002 | |
| +#define GLFW_DONT_CARE -1 | |
| + | |
| /************************************************************************* | |
| * GLFW API types | |
| @@ -600,7 +605,7 @@ | |
| * | |
| * This is the function signature for window position callback functions. | |
| * | |
| - * @param[in] window The window that the user moved. | |
| + * @param[in] window The window that was moved. | |
| * @param[in] xpos The new x-coordinate, in screen coordinates, of the | |
| * upper-left corner of the client area of the window. | |
| * @param[in] ypos The new y-coordinate, in screen coordinates, of the | |
| @@ -616,7 +621,7 @@ | |
| * | |
| * This is the function signature for window size callback functions. | |
| * | |
| - * @param[in] window The window that the user resized. | |
| + * @param[in] window The window that was resized. | |
| * @param[in] width The new width, in screen coordinates, of the window. | |
| * @param[in] height The new height, in screen coordinates, of the window. | |
| * | |
| @@ -760,7 +765,6 @@ | |
| * @param[in] window The window that received the event. | |
| * @param[in] key The [keyboard key](@ref keys) that was pressed or released. | |
| * @param[in] scancode The system-specific scancode of the key. | |
| - * @param[in] codepoint The locale-specific unicode of the key or -1. | |
| * @param[in] action @ref GLFW_PRESS, @ref GLFW_RELEASE or @ref GLFW_REPEAT. | |
| * @param[in] mods Bit field describing which [modifier keys](@ref mods) were | |
| * held down. | |
| @@ -769,7 +773,7 @@ | |
| * | |
| * @ingroup input | |
| */ | |
| -typedef void (* GLFWkeyfun)(GLFWwindow*,int,int,unsigned int,int,int); | |
| +typedef void (* GLFWkeyfun)(GLFWwindow*,int,int,int,int); | |
| /*! @brief The function signature for Unicode character callbacks. | |
| * | |
| @@ -784,6 +788,23 @@ | |
| */ | |
| typedef void (* GLFWcharfun)(GLFWwindow*,unsigned int); | |
| +/*! @brief The function signature for Unicode character with modifiers | |
| + * callbacks. | |
| + * | |
| + * This is the function signature for Unicode character with modifiers callback | |
| + * functions. It is called for each input character, regardless of what | |
| + * modifier keys are held down. | |
| + * | |
| + * @param[in] window The window that received the event. | |
| + * @param[in] codepoint The Unicode code point of the character. | |
| + * @param[in] mods Bit field describing which [modifier keys](@ref mods) were | |
| + * held down. | |
| + * | |
| + * @sa glfwSetCharModsCallback | |
| + * | |
| + * @ingroup input | |
| + */ | |
| +typedef void (* GLFWcharmodsfun)(GLFWwindow*,unsigned int,int); | |
| /*! @brief The function signature for file drop callbacks. | |
| * | |
| @@ -897,9 +918,10 @@ | |
| * succeeds, you should call @ref glfwTerminate before the program exits. | |
| * | |
| * Additional calls to this function after successful initialization but before | |
| - * termination will succeed but will do nothing. | |
| + * termination will return `GL_TRUE` immediately. | |
| * | |
| - * @return `GL_TRUE` if successful, or `GL_FALSE` if an error occurred. | |
| + * @return `GL_TRUE` if successful, or `GL_FALSE` if an error occurred. Errors | |
| + * are reported to the [error callback](@ref intro_error). | |
| * | |
| * @par New in GLFW 3 | |
| * This function no longer registers @ref glfwTerminate with `atexit`. | |
| @@ -950,6 +972,8 @@ | |
| * @param[out] minor Where to store the minor version number, or `NULL`. | |
| * @param[out] rev Where to store the revision number, or `NULL`. | |
| * | |
| + * @remarks This function always succeeds. | |
| + * | |
| * @remarks This function may be called before @ref glfwInit. | |
| * | |
| * @remarks This function may be called from any thread. | |
| @@ -962,24 +986,15 @@ | |
| /*! @brief Returns a string describing the compile-time configuration. | |
| * | |
| - * This function returns a static string generated at compile-time according to | |
| - * which configuration macros were defined. This is intended for use when | |
| - * submitting bug reports, to allow developers to see which code paths are | |
| - * enabled in a binary. | |
| - * | |
| - * The format of the string is as follows: | |
| - * - The version of GLFW | |
| - * - The name of the window system API | |
| - * - The name of the context creation API | |
| - * - Any additional options or APIs | |
| - * | |
| - * For example, when compiling GLFW 3.0 with MinGW using the Win32 and WGL | |
| - * back ends, the version string may look something like this: | |
| - * | |
| - * 3.0.0 Win32 WGL MinGW | |
| + * This function returns the compile-time generated | |
| + * [version string](@ref intro_version_string) of the GLFW library binary. It | |
| + * describes the version, platform, compiler and any platform-specific | |
| + * compile-time options. | |
| * | |
| * @return The GLFW version string. | |
| * | |
| + * @remarks This function always succeeds. | |
| + * | |
| * @remarks This function may be called before @ref glfwInit. | |
| * | |
| * @remarks This function may be called from any thread. | |
| @@ -997,8 +1012,9 @@ | |
| * | |
| * @param[in] cbfun The new callback, or `NULL` to remove the currently set | |
| * callback. | |
| - * @return The previously set callback, or `NULL` if no callback was set or an | |
| - * error occurred. | |
| + * @return The previously set callback, or `NULL` if no callback was set. | |
| + * | |
| + * @remarks This function always succeeds. | |
| * | |
| * @remarks This function may be called before @ref glfwInit. | |
| * | |
| @@ -1024,7 +1040,8 @@ | |
| * | |
| * @param[out] count Where to store the size of the returned array. This is | |
| * set to zero if an error occurred. | |
| - * @return An array of monitor handles, or `NULL` if an error occurred. | |
| + * @return An array of monitor handles, or `NULL` if an error occurred. Errors | |
| + * are reported to the [error callback](@ref intro_error). | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -1046,7 +1063,8 @@ | |
| * This function returns the primary monitor. This is usually the monitor | |
| * where elements like the Windows task bar or the OS X menu bar is located. | |
| * | |
| - * @return The primary monitor, or `NULL` if an error occurred. | |
| + * @return The primary monitor, or `NULL` if an error occurred. Errors are | |
| + * reported to the [error callback](@ref intro_error). | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -1099,7 +1117,7 @@ | |
| * | |
| * @param[in] monitor The monitor to query. | |
| * @return The UTF-8 encoded name of the monitor, or `NULL` if an error | |
| - * occurred. | |
| + * occurred. Errors are reported to the [error callback](@ref intro_error). | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -1118,8 +1136,8 @@ | |
| * | |
| * @param[in] cbfun The new callback, or `NULL` to remove the currently set | |
| * callback. | |
| - * @return The previously set callback, or `NULL` if no callback was set or an | |
| - * error occurred. | |
| + * @return The previously set callback, or `NULL` if no callback was set or the | |
| + * library had not been [initialized](@ref intro_init). | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -1140,7 +1158,8 @@ | |
| * @param[in] monitor The monitor to query. | |
| * @param[out] count Where to store the number of video modes in the returned | |
| * array. This is set to zero if an error occurred. | |
| - * @return An array of video modes, or `NULL` if an error occurred. | |
| + * @return An array of video modes, or `NULL` if an error occurred. Errors are | |
| + * reported to the [error callback](@ref intro_error). | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -1164,6 +1183,7 @@ | |
| * | |
| * @param[in] monitor The monitor to query. | |
| * @return The current mode of the monitor, or `NULL` if an error occurred. | |
| + * Errors are reported to the [error callback](@ref intro_error). | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -1184,6 +1204,10 @@ | |
| * @param[in] monitor The monitor whose gamma ramp to set. | |
| * @param[in] gamma The desired exponent. | |
| * | |
| + * @remark You cannot generate sRGB gamma using this function, because although | |
| + * it is approximately 2.2 it cannot be accurately expressed as a single | |
| + * numerical value. | |
| + * | |
| * @note This function may only be called from the main thread. | |
| * | |
| * @ingroup monitor | |
| @@ -1195,7 +1219,8 @@ | |
| * This function retrieves the current gamma ramp of the specified monitor. | |
| * | |
| * @param[in] monitor The monitor to query. | |
| - * @return The current gamma ramp, or `NULL` if an error occurred. | |
| + * @return The current gamma ramp, or `NULL` if an error occurred. Errors are | |
| + * reported to the [error callback](@ref intro_error). | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -1266,21 +1291,23 @@ | |
| * can use the newly created context, you need to make it current using @ref | |
| * glfwMakeContextCurrent. | |
| * | |
| - * Note that the created window and context may differ from what you requested, | |
| - * as not all parameters and hints are | |
| + * The created window, framebuffer and context may differ from what you | |
| + * requested, as not all parameters and hints are | |
| * [hard constraints](@ref window_hints_hard). This includes the size of the | |
| * window, especially for full screen windows. To retrieve the actual | |
| - * attributes of the created window and context, use queries like @ref | |
| - * glfwGetWindowAttrib and @ref glfwGetWindowSize. | |
| + * attributes of the created window, framebuffer and context, use queries like | |
| + * @ref glfwGetWindowAttrib and @ref glfwGetWindowSize. | |
| * | |
| - * To create a full screen window, you need to specify the monitor to use. If | |
| - * no monitor is specified, windowed mode will be used. Unless you have a way | |
| - * for the user to choose a specific monitor, it is recommended that you pick | |
| - * the primary monitor. For more information on how to retrieve monitors, see | |
| - * @ref monitor_monitors. | |
| - * | |
| - * To create the window at a specific position, make it initially invisible | |
| - * using the `GLFW_VISIBLE` window hint, set its position and then show it. | |
| + * To create a full screen window, you need to specify the monitor the window | |
| + * will cover. If no monitor is specified, windowed mode will be used. Unless | |
| + * you have a way for the user to choose a specific monitor, it is recommended | |
| + * that you pick the primary monitor. For more information on how to retrieve | |
| + * monitors, see @ref monitor_monitors. | |
| + * | |
| + * By default, newly created windows use the placement recommended by the | |
| + * window system. To create the window at a specific position, make it | |
| + * initially invisible using the `GLFW_VISIBLE` window hint, set its position | |
| + * and then show it. | |
| * | |
| * If a full screen window is active, the screensaver is prohibited from | |
| * starting. | |
| @@ -1295,6 +1322,11 @@ | |
| * @param[in] share The window whose context to share resources with, or `NULL` | |
| * to not share resources. | |
| * @return The handle of the created window, or `NULL` if an error occurred. | |
| + * Errors are reported to the [error callback](@ref intro_error). | |
| + * | |
| + * @remarks The [swap interval](@ref window_swap) is not set during window | |
| + * creation and the initial value may vary depending on driver settings and | |
| + * defaults. | |
| * | |
| * @remarks **Windows:** Window creation will fail if the Microsoft GDI | |
| * software OpenGL implementation is the only one available. | |
| @@ -1308,13 +1340,14 @@ | |
| * Also, the first time a window is opened the menu bar is populated with | |
| * common commands like Hide, Quit and About. The (minimal) about dialog uses | |
| * information from the application's bundle. For more information on bundles, | |
| - * see the Bundle Programming Guide provided by Apple. | |
| + * see the | |
| + * [Bundle Programming Guide](https://developer.apple.com/library/mac/documentation/CoreFoundation/Conceptual/CFBundles/) | |
| + * in the Mac Developer Library. | |
| * | |
| * @remarks **X11:** There is no mechanism for setting the window icon yet. | |
| * | |
| - * @remarks The swap interval is not set during window creation, but is left at | |
| - * the default value for that platform. For more information, see @ref | |
| - * glfwSwapInterval. | |
| + * @remarks **X11:** Some window managers will not respect the placement of | |
| + * initially hidden windows. | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -1516,9 +1549,9 @@ | |
| * @param[out] bottom Where to store the size, in screen coordinates, of the | |
| * bottom edge of the window frame. | |
| * | |
| - * @remarks This function returns the size of each window frame edge, not its | |
| - * offset from the client area edge, so the returned values will always be zero | |
| - * or positive. | |
| + * @remarks This function retrieves the size of each window frame edge, not the | |
| + * offset along a screen coordinate axis, so the retrieved values will always | |
| + * be zero or positive. | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -1614,7 +1647,8 @@ | |
| * @param[in] window The window to query. | |
| * @param[in] attrib The [window attribute](@ref window_attribs) whose value to | |
| * return. | |
| - * @return The value of the attribute, or zero if an error occurred. | |
| + * @return The value of the attribute, or zero if an error occurred. Errors | |
| + * are reported to the [error callback](@ref intro_error). | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -1663,8 +1697,8 @@ | |
| * @param[in] window The window whose callback to set. | |
| * @param[in] cbfun The new callback, or `NULL` to remove the currently set | |
| * callback. | |
| - * @return The previously set callback, or `NULL` if no callback was set or an | |
| - * error occurred. | |
| + * @return The previously set callback, or `NULL` if no callback was set or the | |
| + * library had not been [initialized](@ref intro_init). | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -1681,8 +1715,8 @@ | |
| * @param[in] window The window whose callback to set. | |
| * @param[in] cbfun The new callback, or `NULL` to remove the currently set | |
| * callback. | |
| - * @return The previously set callback, or `NULL` if no callback was set or an | |
| - * error occurred. | |
| + * @return The previously set callback, or `NULL` if no callback was set or the | |
| + * library had not been [initialized](@ref intro_init). | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -1704,8 +1738,8 @@ | |
| * @param[in] window The window whose callback to set. | |
| * @param[in] cbfun The new callback, or `NULL` to remove the currently set | |
| * callback. | |
| - * @return The previously set callback, or `NULL` if no callback was set or an | |
| - * error occurred. | |
| + * @return The previously set callback, or `NULL` if no callback was set or the | |
| + * library had not been [initialized](@ref intro_init). | |
| * | |
| * @par New in GLFW 3 | |
| * The close callback no longer returns a value. | |
| @@ -1732,8 +1766,8 @@ | |
| * @param[in] window The window whose callback to set. | |
| * @param[in] cbfun The new callback, or `NULL` to remove the currently set | |
| * callback. | |
| - * @return The previously set callback, or `NULL` if no callback was set or an | |
| - * error occurred. | |
| + * @return The previously set callback, or `NULL` if no callback was set or the | |
| + * library had not been [initialized](@ref intro_init). | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -1758,8 +1792,8 @@ | |
| * @param[in] window The window whose callback to set. | |
| * @param[in] cbfun The new callback, or `NULL` to remove the currently set | |
| * callback. | |
| - * @return The previously set callback, or `NULL` if no callback was set or an | |
| - * error occurred. | |
| + * @return The previously set callback, or `NULL` if no callback was set or the | |
| + * library had not been [initialized](@ref intro_init). | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -1775,8 +1809,8 @@ | |
| * @param[in] window The window whose callback to set. | |
| * @param[in] cbfun The new callback, or `NULL` to remove the currently set | |
| * callback. | |
| - * @return The previously set callback, or `NULL` if no callback was set or an | |
| - * error occurred. | |
| + * @return The previously set callback, or `NULL` if no callback was set or the | |
| + * library had not been [initialized](@ref intro_init). | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -1792,8 +1826,8 @@ | |
| * @param[in] window The window whose callback to set. | |
| * @param[in] cbfun The new callback, or `NULL` to remove the currently set | |
| * callback. | |
| - * @return The previously set callback, or `NULL` if no callback was set or an | |
| - * error occurred. | |
| + * @return The previously set callback, or `NULL` if no callback was set or the | |
| + * library had not been [initialized](@ref intro_init). | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -1956,6 +1990,9 @@ | |
| * named after their use on the standard US keyboard layout. If you want to | |
| * input text, use the Unicode character callback instead. | |
| * | |
| + * The [modifier key bit masks](@ref mods) are not key tokens and cannot be | |
| + * used with this function. | |
| + * | |
| * @param[in] window The desired window. | |
| * @param[in] key The desired [keyboard key](@ref keys). | |
| * @return One of `GLFW_PRESS` or `GLFW_RELEASE`. | |
| @@ -2045,13 +2082,19 @@ | |
| /*! @brief Creates a cursor. | |
| * | |
| + * Creates a new cursor that can be made the system cursor for a window with | |
| + * @ref glfwSetCursor. The cursor can be destroyed with @ref | |
| + * glfwDestroyCursor. Any remaining cursors are destroyed by @ref | |
| + * glfwTerminate. | |
| + * | |
| + * The specified image is in 32-bit RGBA format, so eight bits per channel. | |
| + * | |
| * @param[in] image The desired cursor image. | |
| * @param[in] xhot The desired x-coordinate of the cursor hotspot. | |
| * @param[in] yhot The desired y-coordinate of the cursor hotspot. | |
| * | |
| - * @return A new cursor ready to use or `NULL` if an error occurred. If you | |
| - * don't destroy the cursor by calling `glfwDestroyCursor` it will be destroyed | |
| - * automatically by `GLFW` on termination. | |
| + * @return A new cursor ready to use or `NULL` if an error occurred. Errors | |
| + * are reported to the [error callback](@ref intro_error). | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -2061,11 +2104,11 @@ | |
| /*! @brief Destroys a cursor. | |
| * | |
| - * This function destroys a cursor previously created by a call to | |
| - * `glfwCreateCursor`. `GLFW` will destroy all cursors automatically on | |
| - * termination. | |
| + * This function destroys a cursor previously created with @ref | |
| + * glfwCreateCursor. Any remaining cursors will be destroyed by @ref | |
| + * glfwTerminate. | |
| * | |
| - * @param[in] cursor The cursor to destroy. | |
| + * @param[in] cursor The cursor object to destroy. | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -2073,11 +2116,11 @@ | |
| */ | |
| GLFWAPI void glfwDestroyCursor(GLFWcursor* cursor); | |
| -/*! @brief Sets the cursor for a given window. | |
| +/*! @brief Sets the system cursor for a given window. | |
| * | |
| - * @param[in] window The window to set the cursor for. | |
| - * @param[in] cursor The cursor to change to, or `NULL` to switch back to the | |
| - * default system cursor. | |
| + * @param[in] window The window to set the system cursor for. | |
| + * @param[in] cursor The cursor to change to, or `NULL` to switch back | |
| + * to the default system cursor. | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -2112,8 +2155,8 @@ | |
| * @param[in] window The window whose callback to set. | |
| * @param[in] cbfun The new key callback, or `NULL` to remove the currently | |
| * set callback. | |
| - * @return The previously set callback, or `NULL` if no callback was set or an | |
| - * error occurred. | |
| + * @return The previously set callback, or `NULL` if no callback was set or the | |
| + * library had not been [initialized](@ref intro_init). | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -2126,8 +2169,45 @@ | |
| * This function sets the character callback of the specific window, which is | |
| * called when a Unicode character is input. | |
| * | |
| - * The character callback is intended for text input. If you want to know | |
| - * whether a specific key was pressed or released, use the | |
| + * The character callback is intended for Unicode text input. As it deals with | |
| + * characters, it is keyboard layout dependent, whereas the | |
| + * [key callback](@ref glfwSetKeyCallback) is not. Characters do not map 1:1 | |
| + * to physical keys, as a key may produce zero, one or more characters. If you | |
| + * want to know whether a specific physical key was pressed or released, see | |
| + * the key callback instead. | |
| + * | |
| + * The character callback behaves as system text input normally does and will | |
| + * not be called if modifier keys are held down that would prevent normal text | |
| + * input on that platform, for example a Super (Command) key on OS X or Alt key | |
| + * on Windows. There is a | |
| + * [character with modifiers callback](@ref glfwSetCharModsCallback) that | |
| + * receives these events. | |
| + * | |
| + * @param[in] window The window whose callback to set. | |
| + * @param[in] cbfun The new callback, or `NULL` to remove the currently set | |
| + * callback. | |
| + * @return The previously set callback, or `NULL` if no callback was set or the | |
| + * library had not been [initialized](@ref intro_init). | |
| + * | |
| + * @note This function may only be called from the main thread. | |
| + * | |
| + * @ingroup input | |
| + */ | |
| +GLFWAPI GLFWcharfun glfwSetCharCallback(GLFWwindow* window, GLFWcharfun cbfun); | |
| + | |
| +/*! @brief Sets the Unicode character with modifiers callback. | |
| + * | |
| + * This function sets the character with modifiers callback of the specific | |
| + * window, which is called when a Unicode character is input regardless of what | |
| + * modifier keys are used. | |
| + * | |
| + * The character with modifiers callback is intended for implementing custom | |
| + * Unicode character input. For regular Unicode text input, see the | |
| + * [character callback](@ref glfwSetCharCallback). Like the character | |
| + * callback, the character with modifiers callback deals with characters and is | |
| + * keyboard layout dependent. Characters do not map 1:1 to physical keys, as | |
| + * a key may produce zero, one or more characters. If you want to know whether | |
| + * a specific physical key was pressed or released, see the | |
| * [key callback](@ref glfwSetKeyCallback) instead. | |
| * | |
| * @param[in] window The window whose callback to set. | |
| @@ -2140,7 +2220,7 @@ | |
| * | |
| * @ingroup input | |
| */ | |
| -GLFWAPI GLFWcharfun glfwSetCharCallback(GLFWwindow* window, GLFWcharfun cbfun); | |
| +GLFWAPI GLFWcharmodsfun glfwSetCharModsCallback(GLFWwindow* window, GLFWcharmodsfun cbfun); | |
| /*! @brief Sets the mouse button callback. | |
| * | |
| @@ -2156,8 +2236,8 @@ | |
| * @param[in] window The window whose callback to set. | |
| * @param[in] cbfun The new callback, or `NULL` to remove the currently set | |
| * callback. | |
| - * @return The previously set callback, or `NULL` if no callback was set or an | |
| - * error occurred. | |
| + * @return The previously set callback, or `NULL` if no callback was set or the | |
| + * library had not been [initialized](@ref intro_init). | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -2175,8 +2255,8 @@ | |
| * @param[in] window The window whose callback to set. | |
| * @param[in] cbfun The new callback, or `NULL` to remove the currently set | |
| * callback. | |
| - * @return The previously set callback, or `NULL` if no callback was set or an | |
| - * error occurred. | |
| + * @return The previously set callback, or `NULL` if no callback was set or the | |
| + * library had not been [initialized](@ref intro_init). | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -2193,8 +2273,8 @@ | |
| * @param[in] window The window whose callback to set. | |
| * @param[in] cbfun The new callback, or `NULL` to remove the currently set | |
| * callback. | |
| - * @return The previously set callback, or `NULL` if no callback was set or an | |
| - * error occurred. | |
| + * @return The previously set callback, or `NULL` if no callback was set or the | |
| + * library had not been [initialized](@ref intro_init). | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -2214,8 +2294,8 @@ | |
| * @param[in] window The window whose callback to set. | |
| * @param[in] cbfun The new scroll callback, or `NULL` to remove the currently | |
| * set callback. | |
| - * @return The previously set callback, or `NULL` if no callback was set or an | |
| - * error occurred. | |
| + * @return The previously set callback, or `NULL` if no callback was set or the | |
| + * library had not been [initialized](@ref intro_init). | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -2232,8 +2312,8 @@ | |
| * @param[in] window The window whose callback to set. | |
| * @param[in] cbfun The new file drop callback, or `NULL` to remove the | |
| * currently set callback. | |
| - * @return The previously set callback, or `NULL` if no callback was set or an | |
| - * error occurred. | |
| + * @return The previously set callback, or `NULL` if no callback was set or the | |
| + * library had not been [initialized](@ref intro_init). | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -2340,7 +2420,8 @@ | |
| * | |
| * @param[in] window The window that will request the clipboard contents. | |
| * @return The contents of the clipboard as a UTF-8 encoded string, or `NULL` | |
| - * if an error occurred. | |
| + * if an error occurred. Errors are reported to the | |
| + * [error callback](@ref intro_error). | |
| * | |
| * @note This function may only be called from the main thread. | |
| * | |
| @@ -2362,7 +2443,8 @@ | |
| * been set using @ref glfwSetTime, the timer measures time elapsed since GLFW | |
| * was initialized. | |
| * | |
| - * @return The current value, in seconds, or zero if an error occurred. | |
| + * @return The current value, in seconds, or zero if an error occurred. Errors | |
| + * are reported to the [error callback](@ref intro_error). | |
| * | |
| * @remarks This function may be called from any thread. | |
| * | |
| @@ -2521,8 +2603,6 @@ | |
| */ | |
| GLFWAPI GLFWglproc glfwGetProcAddress(const char* procname); | |
| -GLFWAPI long glfwKeyCode2Unicode(int keyCode); | |
| - | |
| /************************************************************************* | |
| * Global definition cleanup | |
| diff -bur openFrameworks_old/libs/glfw/include/GLFW/glfw3native.h openFrameworks/libs/glfw/include/GLFW/glfw3native.h | |
| --- openFrameworks_old/libs/glfw/include/GLFW/glfw3native.h 2014-07-02 15:47:13.000000000 +0000 | |
| +++ openFrameworks/libs/glfw/include/GLFW/glfw3native.h 2014-07-14 04:09:06.656710747 +0000 | |
| @@ -1,5 +1,5 @@ | |
| /************************************************************************* | |
| - * GLFW 3.0 - www.glfw.org | |
| + * GLFW 3.1 - www.glfw.org | |
| * A library for OpenGL, window and input | |
| *------------------------------------------------------------------------ | |
| * Copyright (c) 2002-2006 Marcus Geelnard | |
| @@ -73,6 +73,7 @@ | |
| #if defined(GLFW_EXPOSE_NATIVE_WIN32) | |
| #include <windows.h> | |
| #elif defined(GLFW_EXPOSE_NATIVE_COCOA) | |
| + #include <ApplicationServices/ApplicationServices.h> | |
| #if defined(__OBJC__) | |
| #import <Cocoa/Cocoa.h> | |
| #else | |
| @@ -102,6 +103,12 @@ | |
| *************************************************************************/ | |
| #if defined(GLFW_EXPOSE_NATIVE_WIN32) | |
| +/*! @brief Returns the device name of the specified monitor. | |
| + * @return The the device name of the specified monitor. | |
| + * @ingroup native | |
| + */ | |
| +GLFWAPI const WCHAR* glfwGetWin32Monitor(GLFWmonitor* monitor); | |
| + | |
| /*! @brief Returns the `HWND` of the specified window. | |
| * @return The `HWND` of the specified window. | |
| * @ingroup native | |
| @@ -118,6 +125,12 @@ | |
| #endif | |
| #if defined(GLFW_EXPOSE_NATIVE_COCOA) | |
| +/*! @brief Returns the `CGDirectDisplayID` of the specified monitor. | |
| + * @return The the `CGDirectDisplayID` of the specified monitor. | |
| + * @ingroup native | |
| + */ | |
| +GLFWAPI CGDirectDisplayID glfwGetCocoaMonitor(GLFWmonitor* monitor); | |
| + | |
| /*! @brief Returns the `NSWindow` of the specified window. | |
| * @return The `NSWindow` of the specified window. | |
| * @ingroup native | |
| @@ -139,6 +152,13 @@ | |
| * @ingroup native | |
| */ | |
| GLFWAPI Display* glfwGetX11Display(void); | |
| + | |
| +/*! @brief Returns the `RRCrtc` of the specified monitor. | |
| + * @return The the `RRCrtc` of the specified monitor. | |
| + * @ingroup native | |
| + */ | |
| +//GLFWAPI RRCrtc glfwGetX11Monitor(GLFWmonitor* monitor); | |
| + | |
| /*! @brief Returns the `Window` of the specified window. | |
| * @return The `Window` of the specified window. | |
| * @ingroup native | |
| @@ -160,11 +180,13 @@ | |
| * @ingroup native | |
| */ | |
| GLFWAPI EGLDisplay glfwGetEGLDisplay(void); | |
| + | |
| /*! @brief Returns the `EGLContext` of the specified window. | |
| * @return The `EGLContext` of the specified window. | |
| * @ingroup native | |
| */ | |
| GLFWAPI EGLContext glfwGetEGLContext(GLFWwindow* window); | |
| + | |
| /*! @brief Returns the `EGLSurface` of the specified window. | |
| * @return The `EGLSurface` of the specified window. | |
| * @ingroup native | |
| Binary files openFrameworks_old/libs/glfw/lib/linuxarmv7l/libglfw3.a and openFrameworks/libs/glfw/lib/linuxarmv7l/libglfw3.a differ | |
| Only in openFrameworks/libs: glfw.zip | |
| Only in openFrameworks_old/libs/openFrameworks/app: ofAppEGLWindow.cpp | |
| Only in openFrameworks_old/libs/openFrameworks/app: ofAppEGLWindow.h | |
| diff -bur openFrameworks_old/libs/openFrameworks/app/ofAppGLFWWindow.cpp openFrameworks/libs/openFrameworks/app/ofAppGLFWWindow.cpp | |
| --- openFrameworks_old/libs/openFrameworks/app/ofAppGLFWWindow.cpp 2014-07-02 15:47:13.000000000 +0000 | |
| +++ openFrameworks/libs/openFrameworks/app/ofAppGLFWWindow.cpp 2014-07-14 04:19:47.736552510 +0000 | |
| @@ -929,8 +929,10 @@ | |
| ofLogError("ofAppGLFWWindow") << errorCode << ": " << errorDescription; | |
| } | |
| +//static void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods) | |
| //------------------------------------------------------------ | |
| -void ofAppGLFWWindow::keyboard_cb(GLFWwindow* windowP_, int keycode, int scancode, unsigned int codepoint, int action, int mods) { | |
| +void ofAppGLFWWindow::keyboard_cb(GLFWwindow* windowP_, int keycode, int scancode, int action, int mods) { | |
| + int codepoint = 0; | |
| int key; | |
| switch (keycode) { | |
| case GLFW_KEY_ESCAPE: | |
| diff -bur openFrameworks_old/libs/openFrameworks/app/ofAppGLFWWindow.h openFrameworks/libs/openFrameworks/app/ofAppGLFWWindow.h | |
| --- openFrameworks_old/libs/openFrameworks/app/ofAppGLFWWindow.h 2014-07-02 15:47:13.000000000 +0000 | |
| +++ openFrameworks/libs/openFrameworks/app/ofAppGLFWWindow.h 2014-07-14 04:18:38.587420527 +0000 | |
| @@ -112,7 +112,7 @@ | |
| static void mouse_cb(GLFWwindow* windowP_, int button, int state, int mods); | |
| static void motion_cb(GLFWwindow* windowP_, double x, double y); | |
| - static void keyboard_cb(GLFWwindow* windowP_, int key, int scancode, unsigned int codepoint, int action, int mods); | |
| + static void keyboard_cb(GLFWwindow* windowP_, int key, int scancode, int action, int mods); | |
| static void resize_cb(GLFWwindow* windowP_, int w, int h); | |
| static void exit_cb(GLFWwindow* windowP_); | |
| static void scroll_cb(GLFWwindow* windowP_, double x, double y); | |
| diff -bur openFrameworks_old/libs/openFrameworks/utils/ofConstants.h openFrameworks/libs/openFrameworks/utils/ofConstants.h | |
| --- openFrameworks_old/libs/openFrameworks/utils/ofConstants.h 2014-07-02 15:47:13.000000000 +0000 | |
| +++ openFrameworks/libs/openFrameworks/utils/ofConstants.h 2014-07-14 03:21:58.778051504 +0000 | |
| @@ -72,7 +72,7 @@ | |
| #define TARGET_OPENGLES | |
| #elif defined(__ARMEL__) | |
| #define TARGET_LINUX | |
| - #define TARGET_OPENGLES | |
| + //#define TARGET_OPENGLES | |
| #define TARGET_LINUX_ARM | |
| #else | |
| #define TARGET_LINUX | |
| @@ -166,14 +166,17 @@ | |
| #include "bcm_host.h" | |
| #endif | |
| - #include "GLES/gl.h" | |
| - #include "GLES/glext.h" | |
| - #include "GLES2/gl2.h" | |
| - #include "GLES2/gl2ext.h" | |
| - | |
| - #define EGL_EGLEXT_PROTOTYPES | |
| - #include "EGL/egl.h" | |
| - #include "EGL/eglext.h" | |
| + //#include "GLES/gl.h" | |
| + //#include "GLES/glext.h" | |
| + //#include "GLES2/gl2.h" | |
| + //#include "GLES2/gl2ext.h" | |
| + | |
| + //#define EGL_EGLEXT_PROTOTYPES | |
| + //#include "EGL/egl.h" | |
| + //#include "EGL/eglext.h" | |
| + #include <GL/glew.h> | |
| + #include <GL/gl.h> | |
| + #include <GL/glx.h> | |
| #else // normal linux | |
| #include <GL/glew.h> | |
| #include <GL/gl.h> | |
| Only in openFrameworks/libs/openFrameworksCompiled/lib: linuxarmv7l | |
| diff -bur openFrameworks_old/libs/openFrameworksCompiled/project/linuxarmv7l/config.linuxarmv7l.default.mk openFrameworks/libs/openFrameworksCompiled/project/linuxarmv7l/config.linuxarmv7l.default.mk | |
| --- openFrameworks_old/libs/openFrameworksCompiled/project/linuxarmv7l/config.linuxarmv7l.default.mk 2014-07-02 15:47:13.000000000 +0000 | |
| +++ openFrameworks/libs/openFrameworksCompiled/project/linuxarmv7l/config.linuxarmv7l.default.mk 2014-07-14 03:39:51.669821332 +0000 | |
| @@ -46,7 +46,15 @@ | |
| PLATFORM_CFLAGS += -ftree-vectorize | |
| PLATFORM_CFLAGS += -Wno-psabi | |
| PLATFORM_CFLAGS += -pipe | |
| - | |
| +PLATFORM_CFLAGS += -I/usr/include/cairo | |
| +PLATFORM_CFLAGS += -I/usr/include/gstreamer-0.10 | |
| +PLATFORM_CFLAGS += -I/usr/include/glib-2.0 | |
| +PLATFORM_CFLAGS += -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include | |
| +PLATFORM_CFLAGS += -I/usr/include/gtk-3.0 | |
| +PLATFORM_CFLAGS += -I/usr/include/pango-1.0 | |
| +PLATFORM_CFLAGS += -I/usr/include/gdk-pixbuf-2.0 | |
| +PLATFORM_CFLAGS += -I/usr/include/atk-1.0 | |
| +PLATFORM_CFLAGS += -I/usr/include/freetype2 | |
| ################################################################################ | |
| # PLATFORM LIBRARIES | |
| # These are library names/paths that are platform specific and are specified | |
| @@ -66,9 +74,13 @@ | |
| # Note: Leave a leading space when adding list items with the += operator | |
| ################################################################################ | |
| -PLATFORM_PKG_CONFIG_LIBRARIES += glesv1_cm | |
| -PLATFORM_PKG_CONFIG_LIBRARIES += glesv2 | |
| -PLATFORM_PKG_CONFIG_LIBRARIES += egl | |
| +#PLATFORM_PKG_CONFIG_LIBRARIES += glesv1_cm | |
| +#PLATFORM_PKG_CONFIG_LIBRARIES += glesv2 | |
| +#PLATFORM_PKG_CONFIG_LIBRARIES += egl | |
| + | |
| +PLATFORM_PKG_CONFIG_LIBRARIES += gl | |
| +PLATFORM_PKG_CONFIG_LIBRARIES += glu | |
| +PLATFORM_PKG_CONFIG_LIBRARIES += glew | |
| ifeq ($(CROSS_COMPILING),1) | |
| GCC_PREFIX=arm-linux-gnueabihf | |
| diff -bur openFrameworks_old/libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk openFrameworks/libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk | |
| --- openFrameworks_old/libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk 2014-07-02 15:47:13.000000000 +0000 | |
| +++ openFrameworks/libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk 2014-07-14 03:20:48.010824104 +0000 | |
| @@ -257,7 +257,7 @@ | |
| ifneq ($(strip $(CORE_PKG_CONFIG_LIBRARIES)),) | |
| $(info checking pkg-config libraries: $(CORE_PKG_CONFIG_LIBRARIES)) | |
| ifneq ($(shell pkg-config "$(CORE_PKG_CONFIG_LIBRARIES)" --exists; echo $$?),0) | |
| -$(error couldn't find some pkg-config packages, did you run the latest install_dependencies.sh?) | |
| +$(warning couldn't find some pkg-config packages, did you run the latest install_dependencies.sh?) | |
| endif | |
| ifeq ($(CROSS_COMPILING),1) | |
| OF_CORE_INCLUDES_CFLAGS += $(patsubst -I%,-I$(SYSROOT)% ,$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR);pkg-config "$(CORE_PKG_CONFIG_LIBRARIES)" --cflags)) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment