Merge branch 'develop'

Author: jube

.github/workflows/ubuntu.yml

@@ -29,6 +29,13 @@ jobs:
           submodules: recursive
           ref: ${{ steps.extract_branch.outputs.branch }}
 
+      - name: CMake hack for Ubuntu
+        shell: bash
+        working-directory: ${{ github.workspace }}
+        run: |
+          cat library/CMakeLists.txt | sed 's/SDL2::SDL2/\$\{SDL2_LIBRARIES\}/' | tee library/CMakeLists.txt > /dev/null
+          echo 'include_directories(SYSTEM ${SDL2_INCLUDE_DIRS})' >> library/CMakeLists.txt
+
       - name: Configure gf
         run: cmake -DGF_BUILD_GAMES=OFF -DGF_BUILD_EXAMPLES=OFF -DGF_BUILD_DOCUMENTATION=OFF -DGF_SINGLE_COMPILTATION_UNIT=OFF -DGF_DEBUG=OFF -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -S ${{ github.workspace }} -B ${{ github.workspace }}/build
 

.github/workflows/windows.yml

@@ -8,7 +8,7 @@ on:
 
 env:
   BUILD_TYPE: Release
-  VCPKG_COMMIT: 5568f110b509a9fd90711978a7cb76bae75bb092
+  VCPKG_COMMIT: af2287382b1991dbdcb7e5112d236f3323b9dd7a
   VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}\vcpkg\binary-cache
 
 jobs:
@@ -20,7 +20,7 @@ jobs:
         uses: actions/cache@v2.1.6
         with:
           path: vcpkg
-          key: ${{ runner.os }}-vcpkg-${{ env.VCPKG_COMMIT }}-v3
+          key: ${{ runner.os }}-vcpkg-${{ env.VCPKG_COMMIT }}-v1
 
       - uses: actions/checkout@v2
         if: steps.cache-vcpkg.outputs.cache-hit != 'true'

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10)
 
 project(GF
-  VERSION 0.22.0
+  VERSION 1.0.0
   LANGUAGES CXX C
 )
 
@@ -36,10 +36,6 @@ set(GF_SHARED ${BUILD_SHARED_LIBS})
 include(GNUInstallDirs)
 set(GF_DATADIR ${CMAKE_INSTALL_FULL_DATADIR})
 
-if(NOT DEFINED GF_VCPKG)
-  list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-endif()
-
 set(SDL2_BUILDING_LIBRARY TRUE)
 find_package(SDL2 REQUIRED)
 

ChangeLog.md

@@ -1,5 +1,22 @@
 # ChangeLog for gf
 
+## gf 1.0.0 (14 Jul 2022)
+
+- Core (gf::core)
+  - Add gf::Flags serialization
+  - Add gf::angleTo and gf::projectOnto
+  - Remove gf::unused in favor of `[[maybe_unused]]`
+- Graphics (gf::graphics)
+  - Add VertexArray::appendAll()
+  - Add ShapeParticles::addPolygon()
+  - Add a flag of EventFilter in Window::pollEvent() and Window::waitEvent()
+  - Add gf::ConsoleStyle and update related classes
+  - Add TileLayer::setTilesetSmooth()
+  - Remove gf::LightSystem and related classes (not ready)
+- Network (gf::net)
+- Misc
+  - 6th anniversary!
+
 ## gf 0.22.0 (14 Jan 2022)
 
 - Core (gf::core)

TODO.md

@@ -14,9 +14,7 @@ This file is a list of ideas for gf. Some of them will eventually be in gf. Othe
 
 ## graphics
 
-- (cursor) fix the bug due to image handling
 - (font) use Signed Distance Field for big size fonts
-- (window/events) add a flag in `pollEvent`/`waitEvent` (`EventFlag::TouchAsMouse`, `EventFlag::NoWindowFilter`)
 - (curve/shape) add anti-aliasing to `Curve` and `Shape`
   - ideas: [vaserenderer](https://github.com/tyt2y3/vaserenderer),
   - ideas: [a forum thread](https://forum.libcinder.org/topic/smooth-thick-lines-using-geometry-shader#23286000001269127)
@@ -26,7 +24,6 @@ This file is a list of ideas for gf. Some of them will eventually be in gf. Othe
 - (scene) integrate post-processing in `Scene`/`SceneManager`
   - remove `RenderPipeline`
   - rename `Effect` in `PostProcEffect`
-- (console) make style a class and remove internal style state
 - (drawable) Remove `Drawable`, make it a named requirement (or a concept in the future)
 
 ## net
@@ -42,4 +39,3 @@ This file is a list of ideas for gf. Some of them will eventually be in gf. Othe
   - blocking bug: nemequ/hedley#35
 - (packaging) use CPack to create packages
 - (binding) Python binding with [pybind11](https://github.com/pybind/pybind11)?
-- (code) remove gf::unused

appveyor.yml

@@ -7,6 +7,7 @@ skip_tags: true
 image:
   - Visual Studio 2017
   - Visual Studio 2019
+  - Visual Studio 2022
 platform: x64
 configuration:
   - Debug
@@ -19,7 +20,7 @@ cache:
 install:
   - cmd: cd C:\Tools\vcpkg
   - cmd: git fetch
-  - cmd: git checkout 2020.01
+  - cmd: git checkout 2022.02.23
   - cmd: .\bootstrap-vcpkg.bat
   - cmd: vcpkg integrate install
   - cmd: vcpkg remove --outdated --recurse
@@ -31,7 +32,7 @@ before_build:
   - cmd: git submodule update --init
   - cmd: mkdir build
   - cmd: cd build
-  - cmd: cmake -A x64 -DGF_VCPKG=ON -DGF_DEBUG=OFF -DGF_BUILD_GAMES=OFF -DGF_SINGLE_COMPILTATION_UNIT=ON -DBUILD_SHARED_LIBS=OFF  -DBUILD_TESTING=ON -DCMAKE_TOOLCHAIN_FILE=C:\Tools\vcpkg\scripts\buildsystems\vcpkg.cmake ..
+  - cmd: cmake -A x64 -DGF_DEBUG=OFF -DGF_BUILD_GAMES=OFF -DGF_SINGLE_COMPILTATION_UNIT=ON -DBUILD_SHARED_LIBS=OFF  -DBUILD_TESTING=ON -DCMAKE_TOOLCHAIN_FILE=C:\Tools\vcpkg\scripts\buildsystems\vcpkg.cmake ..
 
 build:
   parallel: true

cmake/FindSDL2.cmake

@@ -100,6 +100,8 @@ target_link_libraries(mygame
 @ingroup core
 @brief TMX (Tiled) support
 
+gf supports TMX 1.5+. In particular, it does not support the old terrain element in favor of wang sets.
+
 @defgroup graphics Graphics
 @brief All the classes related to graphics
 

docs/index.dox

@@ -13,6 +13,7 @@ add_executable(gfdev_core_doc
   doc_class_clock.cc
   doc_class_flags.cc
   doc_class_image.cc
+  doc_class_rect.cc
   doc_class_time.cc
   doc_struct_circ.cc
   doc_tutorial_id.cc

docs/snippets/CMakeLists.txt

@@ -19,7 +19,9 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 #include <gf/Clock.h>
-#include <gf/Unused.h>
+
+template <typename... Args>
+constexpr void unused(Args&&...) { }
 
 void dummyClockUsage() {
 
@@ -31,6 +33,5 @@ void dummyClockUsage() {
   gf::Time time2 = clock.restart();
   /// [clock]
 
-  gf::unused(clock, time1, time2);
-
+  unused(clock, time1, time2);
 }