remove add visibility algorithms and always use symmetric shadowcasting

Author: jube

examples/19-gridmap.cc

@@ -178,21 +178,13 @@ namespace {
   struct State {
     gf::Vec2I light = { 0, 0 };
     int radius = 6;
-    gf::Visibility visibility = gf::Visibility::ShadowCast;
   };
 
   class GridScene : public gf::Scene {
   public:
     GridScene(gf::BasicSceneManager* scene_manager)
-    : m_scene_manager(scene_manager)
-    , m_grid_entity(scene_manager)
+    : m_grid_entity(scene_manager)
     {
-      m_actions.add_action("RayCast"_id, gf::ActionSettings().add_keycode_control(gf::Keycode::Num1));
-      m_actions.add_action("ShadowCast"_id, gf::ActionSettings().add_keycode_control(gf::Keycode::Num2));
-      m_actions.add_action("DiamondWalls"_id, gf::ActionSettings().add_keycode_control(gf::Keycode::Num3));
-      m_actions.add_action("Permissive"_id, gf::ActionSettings().add_keycode_control(gf::Keycode::Num4));
-      m_actions.add_action("Improved"_id, gf::ActionSettings().add_keycode_control(gf::Keycode::Num5));
-
       m_actions.add_action("clear"_id, gf::ActionSettings().add_keycode_control(gf::Keycode::C));
 
       set_world_size(MapSize * CellSize);
@@ -215,7 +207,7 @@ namespace {
             if (position != m_state.light) {
               m_state.light = position;
               m_grid_entity.map().clear_visible();
-              m_grid_entity.map().compute_field_of_vision(m_state.light, m_state.radius, m_state.visibility);
+              m_grid_entity.map().compute_field_of_vision(m_state.light, m_state.radius);
             }
           }
           break;
@@ -228,47 +220,13 @@ namespace {
 
     void do_handle_actions() override
     {
-      gf::Visibility visibility = m_state.visibility;
-
-      if (m_actions.active("RayCast"_id)) {
-        gf::Log::info("Visibility: RayCast");
-        visibility = gf::Visibility::RayCast;
-      }
-
-      if (m_actions.active("ShadowCast"_id)) {
-        gf::Log::info("Visibility: ShadowCast");
-        visibility = gf::Visibility::ShadowCast;
-      }
-
-      if (m_actions.active("DiamondWalls"_id)) {
-        gf::Log::info("Visibility: DiamondWalls");
-        visibility = gf::Visibility::DiamondWalls;
-      }
-
-      if (m_actions.active("Permissive"_id)) {
-        gf::Log::info("Visibility: Permissive");
-        visibility = gf::Visibility::Permissive;
-      }
-
-      if (m_actions.active("Improved"_id)) {
-        gf::Log::info("Visibility: Improved");
-        visibility = gf::Visibility::Improved;
-      }
-
-      if (visibility != m_state.visibility) {
-        m_state.visibility = visibility;
-        m_grid_entity.map().clear_visible();
-        m_grid_entity.map().compute_field_of_vision(m_state.light, m_state.radius, m_state.visibility);
-      }
-
       if (m_actions.active("clear"_id)) {
         m_grid_entity.map().clear_explored();
       }
 
       m_actions.reset();
     }
 
-    gf::BasicSceneManager* m_scene_manager = nullptr;
     GridEntity m_grid_entity;
     gf::ActionGroup m_actions;
     State m_state;

include/gf2/core/GridMap.h

@@ -24,14 +24,6 @@ namespace gf {
     float blocked = 5.0f;
   };
 
-  enum class Visibility : uint8_t {
-    RayCast,
-    ShadowCast,
-    DiamondWalls,
-    Permissive,
-    Improved,
-  };
-
   class GF_CORE_API GridMap {
   public:
     GridMap() = default;
@@ -78,11 +70,6 @@ namespace gf {
     bool visible(Vec2I position) const;
     bool explored(Vec2I position) const;
 
-    std::vector<Vec2I> compute_route(Vec2I origin, Vec2I target, RouteCost cost = {}, Route route = Route::AStar);
-
-    void compute_field_of_vision(Vec2I origin, int range_limit, Visibility visibility);
-    void compute_local_field_of_vision(Vec2I origin, int range_limit, Visibility visibility);
-
     uint32_t tag(Vec2I position) const;
     void set_tag(Vec2I position, uint32_t tag);
 
@@ -98,10 +85,15 @@ namespace gf {
       set_tag(position, static_cast<uint32_t>(static_cast<std::underlying_type_t<E>>(tag)));
     }
 
+    std::vector<Vec2I> compute_route(Vec2I origin, Vec2I target, RouteCost cost = {}, Route route = Route::AStar);
+
+    void compute_field_of_vision(Vec2I origin, int range_limit);
+    void compute_local_field_of_vision(Vec2I origin, int range_limit);
+
   private:
     GridMap(Vec2I size, AnyGrid grid);
 
-    void raw_compute_field_of_vision(Vec2I origin, int range_limit, Flags<CellProperty> properties, Visibility visibility);
+    void raw_compute_field_of_vision(Vec2I origin, int range_limit, Flags<CellProperty> properties);
 
     Array2D<Flags<CellProperty>> m_cells;
     Array2D<uint32_t> m_tags;