Merge branch 'release-0.21.0'

Author: jube

.editorconfig

@@ -0,0 +1,11 @@
+# https://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true

.travis.yml

@@ -1,14 +1,15 @@
 cmake_minimum_required(VERSION 3.10)
 
 project(GF
-  VERSION 0.20.0
+  VERSION 0.21.0
   LANGUAGES CXX C
 )
 
 include(GenerateExportHeader)
 
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 if(NOT MSVC AND (NOT DEFINED CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL ""))
   message(STATUS "Setting build type to 'RelWithDebInfo' as none was specified.")

CMakeLists.txt

@@ -1,5 +1,24 @@
 # ChangeLog for gf
 
+## gf 0.21.0 (14 Jul 2021)
+
+- Core (gf::core)
+  - Remove gf::HexagonHelper, gf::StaggerHelper and gf::OrthogonalHelper
+  - Add gf::Cells and its subclasses gf::HexagonalCells, gf::StaggeredCells, gf::OrthogonalCells
+  - Remove gf::SquareGrid, gf::HexagonalGrid
+  - Add gf::Grid (with gf::Cells)
+  - Rework gf::Tileset (with gf::Cells)
+  - Rename and refactor cell related classes and enums
+- Graphics (gf::graphics)
+  - Add some missing texture format constants
+  - Rework Animation::addTileset and add tileOffset (thanks @mquinson)
+- Network (gf::net)
+- Misc
+  - Add .editorconfig
+  - Changed CI from Travis CI to Buddy.works
+  - Preliminary work for Android compilation
+  - Delete IRC channel on freenode (prefer Discord)
+
 ## gf 0.20.0 (14 Apr 2021)
 
 - Core (gf::core)

ChangeLog.md

@@ -1,6 +1,6 @@
 # Gamedev Framework (gf)
 
-[![Travis](https://img.shields.io/travis/GamedevFramework/gf.svg?style=flat-square)](https://travis-ci.org/GamedevFramework/gf)
+[![Buddy](https://app.buddy.works/jube/gf/pipelines/pipeline/337210/badge.svg?token=23ffd15ec7784efca148879f00926ce2b5dbe8a431c91c1a0836bb04c2124ad1 "Buddy")](https://app.buddy.works/jube/gf/pipelines/pipeline/337210)
 [![AppVeyor](https://img.shields.io/appveyor/ci/jube/gf.svg?style=flat-square)](https://ci.appveyor.com/project/jube/gf)
 [![GitHub license](https://img.shields.io/badge/license-zlib-blue.svg?style=flat-square)](https://raw.githubusercontent.com/GamedevFramework/gf/master/LICENSE)
 [![GitHub tag](https://img.shields.io/github/tag/GamedevFramework/gf.svg?style=flat-square)](https://github.com/GamedevFramework/gf/tags)
@@ -88,7 +88,6 @@ If you want to talk directly with the developpers, you can
 
 - chat on the [Discord server of gf](https://discord.gg/2fXM3T4)
 - post a message on [/r/GamedevFramework](https://www.reddit.com/r/GamedevFramework/).
-- join the [#gf-devel IRC channel on Freenode](irc://chat.freenode.net/gf-devel)
 
 ## Contribution
 

README.md

@@ -1,6 +1,6 @@
 # Things to do (or not) in gf
 
-This file is a list of ideas for gf. Some of them will eventually be in gf. Others are just random thoughts. If you are interested in on of these items, read [CONTRIBUTING.md](CONTRIBUTING.md).
+This file is a list of ideas for gf. Some of them will eventually be in gf. Others are just random thoughts. If you are interested in one of these items, read [CONTRIBUTING.md](CONTRIBUTING.md).
 
 ## core
 
@@ -37,7 +37,7 @@ This file is a list of ideas for gf. Some of them will eventually be in gf. Othe
 
 ## meta
 
-- (docs) split gf_dev_doc by modules (core, graphics, net)
 - (portability) consider using [hedley](https://nemequ.github.io/hedley/)
   - blocking bug: nemequ/hedley#35
 - (packaging) use CPack to create packages
+- (binding) Python binding with [pybind11](https://github.com/pybind/pybind11)?

TODO.md

@@ -22,7 +22,7 @@
     </tab>
     <tab type="examples" visible="yes" title="" intro=""/>
     <tab type="user" url="https://github.com/GamedevFramework/gf" title="gf on github" />
-    <tab type="user" url="irc://chat.freenode.net/gf-devel" title="#gf-devel on Freenode" />
+    <tab type="user" url="https://discord.gg/2fXM3T4" title="GamedevFramework on Discord" />
     <tab type="user" url="https://www.reddit.com/r/GamedevFramework/" title="/r/GamedevFramework on Reddit" />
   </navindex>
 

docs/custom/DoxygenLayout.xml

@@ -88,6 +88,10 @@ target_link_libraries(mygame
 @ingroup core
 @brief Serialization
 
+@defgroup core_cells Cells
+@ingroup core
+@brief Cells handling related classes (orthogonal, hexagonal, staggered)
+
 @defgroup core_utilities Utilities
 @ingroup core
 @brief Various game-related utilities

docs/index.dox

@@ -9,31 +9,52 @@ add_gf_snippet(doc_index)
 add_gf_snippet(doc_it_moves)
 add_gf_snippet(doc_simple_template)
 
-add_executable(gfdev_doc
+add_executable(gfdev_core_doc
   doc_class_clock.cc
+  doc_class_flags.cc
+  doc_class_image.cc
+  doc_class_time.cc
+  doc_struct_circ.cc
+  doc_tutorial_id.cc
+  doc_tutorial_messages.cc
+  main.cc
+)
+
+target_link_libraries(gfdev_core_doc
+  PRIVATE
+    gfcore0
+)
+
+add_executable(gfdev_graphics_doc
   doc_class_console.cc
   doc_class_cursor.cc
   doc_class_drawable.cc
   doc_class_entity_container.cc
-  doc_class_flags.cc
   doc_class_font.cc
-  doc_class_image.cc
-  doc_class_socket_selector.cc
   doc_class_sprite.cc
-  doc_class_tcp_listener.cc
-  doc_class_tcp_socket.cc
   doc_class_text.cc
   doc_class_texture.cc
-  doc_class_time.cc
-  doc_class_udp_socket.cc
   doc_class_view_container.cc
   doc_class_window.cc
   doc_struct_blend_mode.cc
-  doc_struct_circ.cc
   doc_struct_event.cc
-  doc_tutorial_id.cc
-  doc_tutorial_messages.cc
   main.cc
 )
 
-target_link_libraries(gfdev_doc gf0 gfnet0)
+target_link_libraries(gfdev_graphics_doc
+  PRIVATE
+    gf0
+)
+
+add_executable(gfdev_net_doc
+  doc_class_socket_selector.cc
+  doc_class_tcp_listener.cc
+  doc_class_tcp_socket.cc
+  doc_class_udp_socket.cc
+  main.cc
+)
+
+target_link_libraries(gfdev_net_doc
+  PRIVATE
+    gfnet0
+)

docs/snippets/CMakeLists.txt

@@ -38,12 +38,7 @@ int main() {
   texture.setSmooth();
 
   gf::Animation animation;
-
-  for (unsigned frame = 0; frame < 8; ++frame) {
-    unsigned x = frame % 4;
-    unsigned y = frame / 4;
-    animation.addFrame(texture, gf::RectF::fromPositionSize({ 0.25f * x, 0.5f * y }, { 0.25f, 0.5f }), gf::milliseconds(100));
-  }
+  animation.addTileset(texture, gf::vec(4, 2), gf::milliseconds(100), 8);
 
   gf::AnimatedSprite animatedSprite;
   animatedSprite.setAnimation(animation);