Skip to content

Commit

Permalink
Move inner enums/structs out of MapObject
Browse files Browse the repository at this point in the history
  • Loading branch information
@sirjuddington
sirjuddington committed Mar 25, 2024
1 parent 7aea604 commit 5a14dec
Show file tree
Hide file tree
Showing 26 changed files with 289 additions and 239 deletions.
1 change: 1 addition & 0 deletions src/Application/Common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@
// C++ -------------------------------------------------------------------------

#include <algorithm>
#include <array>
#include <cmath>
#include <functional>
#include <map>
Expand Down
19 changes: 11 additions & 8 deletions src/Game/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@

#include "Args.h"
#include "General/Defs.h"
#include "SLADEMap/MapObject/MapObject.h"
#include <array>
#include "Utility/PropertyList.h"

// Forward declarations
namespace slade
{
namespace map
{
enum class ObjectType;
}
namespace zscript
{
class Definitions;
Expand Down Expand Up @@ -165,8 +168,8 @@ class Configuration
const string& spacTriggerUDMFName(unsigned trigger_index);

// UDMF properties
UDMFProperty* getUDMFProperty(const string& name, MapObject::Type type);
UDMFPropMap& allUDMFProperties(MapObject::Type type);
UDMFProperty* getUDMFProperty(const string& name, map::ObjectType type);
UDMFPropMap& allUDMFProperties(map::ObjectType type);
void cleanObjectUDMFProps(MapObject* object);

// Sector types
Expand All @@ -189,10 +192,10 @@ class Configuration
bool kill_grounded) const;

// Defaults
string defaultString(MapObject::Type type, const string& property) const;
int defaultInt(MapObject::Type type, const string& property) const;
double defaultFloat(MapObject::Type type, const string& property) const;
bool defaultBool(MapObject::Type type, const string& property) const;
string defaultString(map::ObjectType type, const string& property) const;
int defaultInt(map::ObjectType type, const string& property) const;
double defaultFloat(map::ObjectType type, const string& property) const;
bool defaultBool(map::ObjectType type, const string& property) const;
void applyDefaults(MapObject* object, bool udmf = false) const;

// Special Presets
Expand Down
1 change: 0 additions & 1 deletion src/Graphics/Font/SFont.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#pragma once

#include "Utility/ColRGBA.h"
#include <array>

namespace slade
{
Expand Down
1 change: 1 addition & 0 deletions src/MapEditor/MapEditor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#include "MapEditor/UI/PropsPanel/SectorPropsPanel.h"
#include "MapEditor/UI/PropsPanel/ThingPropsPanel.h"
#include "MapTextureManager.h"
#include "SLADEMap/MapObject/MapObject.h"
#include "UI/Browser/BrowserItem.h"
#include "UI/MapCanvas.h"
#include "UI/MapEditorWindow.h"
Expand Down
106 changes: 53 additions & 53 deletions src/MapEditor/Renderer/MapRenderer2D.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ void MapRenderer2D::renderVertices(float alpha)
void MapRenderer2D::renderVerticesImmediate()
{
if (list_vertices_ > 0 && map_->nVertices() == n_vertices_ && map_->geometryUpdated() <= vertices_updated_
&& !map_->mapData().modifiedSince(vertices_updated_, MapObject::Type::Vertex))
&& !map_->mapData().modifiedSince(vertices_updated_, map::ObjectType::Vertex))
glCallList(list_vertices_);
else
{
Expand Down Expand Up @@ -410,7 +410,7 @@ void MapRenderer2D::renderLinesImmediate(bool show_direction, float alpha)
// Use display list if it's built
if (list_lines_ > 0 && show_direction == lines_dirs_ && map_->nLines() == n_lines_
&& map_->geometryUpdated() <= lines_updated_
&& !map_->mapData().modifiedSince(lines_updated_, MapObject::Type::Line))
&& !map_->mapData().modifiedSince(lines_updated_, map::ObjectType::Line))
{
glCallList(list_lines_);
return;
Expand Down Expand Up @@ -451,7 +451,7 @@ void MapRenderer2D::renderLinesImmediate(bool show_direction, float alpha)
// Direction tab
if (show_direction)
{
auto mid = line->getPoint(MapObject::Point::Mid);
auto mid = line->getPoint(map::ObjectPoint::Mid);
auto tab = line->dirTabPoint();
glVertex2d(mid.x, mid.y);
glVertex2d(tab.x, tab.y);
Expand All @@ -476,7 +476,7 @@ void MapRenderer2D::renderLinesVBO(bool show_direction, float alpha)
// Update lines VBO if required
if (vbo_lines_ == 0 || show_direction != lines_dirs_ || map_->nLines() != n_lines_
|| map_->geometryUpdated() > lines_updated_
|| map_->mapData().modifiedSince(lines_updated_, MapObject::Type::Line))
|| map_->mapData().modifiedSince(lines_updated_, map::ObjectType::Line))
updateLinesVBO(show_direction, alpha);

// Disable any blending
Expand Down Expand Up @@ -538,7 +538,7 @@ void MapRenderer2D::renderLineHilight(int index, float fade) const
glEnd();

// Direction tab
auto mid = line->getPoint(MapObject::Point::Mid);
auto mid = line->getPoint(map::ObjectPoint::Mid);
auto tab = line->dirTabPoint();
glBegin(GL_LINES);
glVertex2d(mid.x, mid.y);
Expand Down Expand Up @@ -577,7 +577,7 @@ void MapRenderer2D::renderLineSelection(const ItemSelection& selection, float fa
glVertex2d(line->x2(), line->y2());

// Direction tab
auto mid = line->getPoint(MapObject::Point::Mid);
auto mid = line->getPoint(map::ObjectPoint::Mid);
auto tab = line->dirTabPoint();
glVertex2d(mid.x, mid.y);
glVertex2d(tab.x, tab.y);
Expand Down Expand Up @@ -620,7 +620,7 @@ void MapRenderer2D::renderTaggedLines(const vector<MapLine*>& lines, float fade)
glEnd();

// Direction tab
auto mid = line->getPoint(MapObject::Point::Mid);
auto mid = line->getPoint(map::ObjectPoint::Mid);
auto tab = line->dirTabPoint();
glBegin(GL_LINES);
glVertex2d(mid.x, mid.y);
Expand All @@ -632,8 +632,8 @@ void MapRenderer2D::renderTaggedLines(const vector<MapLine*>& lines, float fade)
{
glLineWidth(line_width * 1.5f);
drawing::drawArrow(
line->getPoint(MapObject::Point::Within),
object->getPoint(MapObject::Point::Within),
line->getPoint(map::ObjectPoint::Within),
object->getPoint(map::ObjectPoint::Within),
col,
false,
arrowhead_angle,
Expand Down Expand Up @@ -677,7 +677,7 @@ void MapRenderer2D::renderTaggingLines(const vector<MapLine*>& lines, float fade
glEnd();

// Direction tab
auto mid = line->getPoint(MapObject::Point::Mid);
auto mid = line->getPoint(map::ObjectPoint::Mid);
auto tab = line->dirTabPoint();
glBegin(GL_LINES);
glVertex2d(mid.x, mid.y);
Expand All @@ -689,8 +689,8 @@ void MapRenderer2D::renderTaggingLines(const vector<MapLine*>& lines, float fade
{
glLineWidth(line_width * 1.5f);
drawing::drawArrow(
object->getPoint(MapObject::Point::Within),
line->getPoint(MapObject::Point::Within),
object->getPoint(map::ObjectPoint::Within),
line->getPoint(map::ObjectPoint::Within),
col,
false,
arrowhead_angle,
Expand Down Expand Up @@ -792,13 +792,13 @@ void MapRenderer2D::renderThingOverlay(double x, double y, double radius, bool p
// Renders a round thing icon at [x,y]
// -----------------------------------------------------------------------------
void MapRenderer2D::renderRoundThing(
double x,
double y,
double angle,
const game::ThingType& type,
const MapObject::ArgSet& args,
float alpha,
double radius_mult) const
double x,
double y,
double angle,
const game::ThingType& type,
const map::ArgSet& args,
float alpha,
double radius_mult) const
{
// --- Determine texture to use ---
unsigned tex = 0;
Expand Down Expand Up @@ -890,14 +890,14 @@ void MapRenderer2D::renderRoundThing(
// If [fitradius] is true, the sprite is drawn to fit within the thing's radius
// -----------------------------------------------------------------------------
bool MapRenderer2D::renderSpriteThing(
double x,
double y,
double angle,
const game::ThingType& type,
const MapObject::ArgSet& args,
unsigned index,
float alpha,
bool fitradius)
double x,
double y,
double angle,
const game::ThingType& type,
const map::ArgSet& args,
unsigned index,
float alpha,
bool fitradius)
{
// Refresh sprites list if needed
if (thing_sprites_.size() != map_->nThings())
Expand Down Expand Up @@ -1002,14 +1002,14 @@ bool MapRenderer2D::renderSpriteThing(
// Renders a square thing icon at [x,y]
// -----------------------------------------------------------------------------
bool MapRenderer2D::renderSquareThing(
double x,
double y,
double angle,
const game::ThingType& type,
const MapObject::ArgSet& args,
float alpha,
bool showicon,
bool framed) const
double x,
double y,
double angle,
const game::ThingType& type,
const map::ArgSet& args,
float alpha,
bool showicon,
bool framed) const
{
// --- Determine texture to use ---
unsigned tex = 0;
Expand Down Expand Up @@ -1135,12 +1135,12 @@ bool MapRenderer2D::renderSquareThing(
// Renders a simple square thing icon at [x,y]
// -----------------------------------------------------------------------------
void MapRenderer2D::renderSimpleSquareThing(
double x,
double y,
double angle,
const game::ThingType& type,
const MapObject::ArgSet& args,
float alpha) const
double x,
double y,
double angle,
const game::ThingType& type,
const map::ArgSet& args,
float alpha) const
{
// Get thing info
double radius = type.radius();
Expand Down Expand Up @@ -1620,12 +1620,12 @@ void MapRenderer2D::renderTaggedThings(const vector<MapThing*>& things, float fa
auto object = mapeditor::editContext().selection().hilightedObject();
if (object && action_lines)
{
auto dst = object->getPoint(MapObject::Point::Within);
auto dst = object->getPoint(map::ObjectPoint::Within);
glLineWidth(line_width * 1.5f);
for (auto thing : things)
{
drawing::drawArrow(
thing->getPoint(MapObject::Point::Within), dst, col, false, arrowhead_angle, arrowhead_length);
thing->getPoint(map::ObjectPoint::Within), dst, col, false, arrowhead_angle, arrowhead_length);
}
}
}
Expand Down Expand Up @@ -1675,12 +1675,12 @@ void MapRenderer2D::renderTaggingThings(const vector<MapThing*>& things, float f
auto object = mapeditor::editContext().selection().hilightedObject();
if (object && action_lines)
{
auto src = object->getPoint(MapObject::Point::Within);
auto src = object->getPoint(map::ObjectPoint::Within);
glLineWidth(line_width * 1.5f);
for (auto thing : things)
{
drawing::drawArrow(
src, thing->getPoint(MapObject::Point::Within), col, false, arrowhead_angle, arrowhead_length);
src, thing->getPoint(map::ObjectPoint::Within), col, false, arrowhead_angle, arrowhead_length);
}
}
}
Expand Down Expand Up @@ -1856,8 +1856,8 @@ void MapRenderer2D::renderPathedThings(const vector<MapThing*>& things)
continue;

drawing::drawArrow(
to->getPoint(MapObject::Point::Mid),
from->getPoint(MapObject::Point::Mid),
to->getPoint(map::ObjectPoint::Mid),
from->getPoint(map::ObjectPoint::Mid),
(thing_path.type == PathType::DragonBoth || thing_path.type == PathType::Dragon) ? dragoncol :
pathedcol,
(thing_path.type == PathType::NormalBoth || thing_path.type == PathType::DragonBoth),
Expand Down Expand Up @@ -2349,8 +2349,8 @@ void MapRenderer2D::renderFlatHilight(int index, float fade) const
//// TEST draw text point
// glPointSize(8.0f);
// glBegin(GL_POINTS);
// glVertex2d(map->getSector(index)->getPoint(MapObject::Point::Within).x,
// map->getSector(index)->getPoint(MapObject::Point::Within).y); glEnd();
// glVertex2d(map->getSector(index)->getPoint(map::ObjectPoint::Within).x,
// map->getSector(index)->getPoint(map::ObjectPoint::Within).y); glEnd();
}

// -----------------------------------------------------------------------------
Expand Down Expand Up @@ -2474,7 +2474,7 @@ void MapRenderer2D::renderTaggedFlats(const vector<MapSector*>& sectors, float f
if (object && action_lines)
{
// Skip if the tagged sector is adjacent
if (object->objType() == MapObject::Type::Line)
if (object->objType() == map::ObjectType::Line)
{
auto line = dynamic_cast<MapLine*>(object);
if (line->frontSector() == sector || line->backSector() == sector)
Expand All @@ -2483,8 +2483,8 @@ void MapRenderer2D::renderTaggedFlats(const vector<MapSector*>& sectors, float f

glLineWidth(line_width * 1.5f);
drawing::drawArrow(
sector->getPoint(MapObject::Point::Within),
object->getPoint(MapObject::Point::Within),
sector->getPoint(map::ObjectPoint::Within),
object->getPoint(map::ObjectPoint::Within),
col,
false,
arrowhead_angle,
Expand Down Expand Up @@ -3087,7 +3087,7 @@ void MapRenderer2D::updateLinesVBO(bool show_direction, float base_alpha)
// Direction tab if needed
if (show_direction)
{
auto mid = line->getPoint(MapObject::Point::Mid);
auto mid = line->getPoint(map::ObjectPoint::Mid);
auto tab = line->dirTabPoint();
lines[v + 2].x = mid.x;
lines[v + 2].y = mid.y;
Expand Down
Loading

0 comments on commit 5a14dec

Please sign in to comment.