devel to master for 1.0.0 release #137
Merged
Conversation
This file contains 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
Also changed the font size to scale automatically based on window width in linear fashion.
If the given axis data range's string representation crosses five characters in length, then the corresponding axis's labels string representations are generated using scientific notation of floating point numbers. If the label format is already in scientific notation, no changes will take place.
Earlier, both the API's had their own individual entry point into the core library. Now, C++ API just delegates the calls to C API.
Also moved GLSL shaders from OpenGL backend to one level above as they can be potentially shared with other backends such as Vulkan.
Forgot to change Font class earlier when other C++ fns were modified. Also, removed unused MACRO definitions from err_common.hpp file.
…-flags Consistent definition of USE_SYSTEM flags for glbinding, glm and freetype
The potential future backend, vulkan, is supported in both of the window toolkits(glfw3, sdl2) we currently use. Therefore, since their dependency would be common to both the backends, moving them to one level up.
Couple of style fixes are also included in this.
* Earlier, these were hard coded values which is very bad! * Also fixed couple of cell margin arithmetic in grid mode
Earlier, multiple views in a window had to be conformed to layouts that are square. After this change, rectangular layouts such as below are also possible. _________________________ | | | | | | | | | | | | |_______|_______|_______| | | | | | | |___________|___________|
Fixed Tegra build link in README.md
Non-regular multi-view layout & Scientific number format for axes labels
Remove freeimage dependency from examples
hunterize build
This also bumps up the freetype version to VER-2-7-1 in build_freetype.cmake script.
Building shared libs for freetype on MSVC toolchain is not supported yet and hence reverting back to static libs. However, using static libs for freetype version > 2.6 has harfbuzz linking issue with users of forge target i.e. examples or downstream libraries. To circumvent this issue, added harfbuzz to link command for unix platforms. Tested these changes on Ubuntu 16.04 and Windows with VS2013 & VS2015.
glfw3 cmake config file provided with glfw package is not located in consistent location on linux/unix distributions and hence `FIND_PACKGE(glfw3)` is occasionaly resulting in glfw3 not found errors while compiling from source. FindGLFW.cmake can take care of this by looking for the required headers and libraries in multiple known locations.
freetype can be built without harfbuzz dependency which was not clear to immediately earlier as the cmake options don't display the WITH_* options. Found the `WITH_HarfBuzz` option while going through the project's CMakeLists.txt file. Using this option, forge's internal build of freetype won't experience the undefined reference errors due to harfbuzz while using freetype version >=2.6.1.
For a not yet known reason, having these dependencies is causing linking errors although package based freetype installations don't have such issue. Since the PNG, ZLIB, BZip2 and harfbuzz are not required for forge's use case of freetype, they are disabled.
Although, this hasn't caused any issues on Linux and Windows, OpenCL examples on OSX platform are failing to compile without the explicit linker flags for OpenGL. Since, the GL libs are used by forge anyway, didn't add any platform based checks.
|
Awaiting tegra build to finish on jenkins, please don't merge yet - this may take a while as couple of arrayfire build jobs are queued ahead of forge's. |
Also updates documentation and README on freeimage dependency info.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[skip forge ci]
Fixes #84