MRR/traintastic
1
0
Fork 0
Code Issues Pull-Requests Actions Pakete Projekte Releases Wiki Aktivität

removed TrainProperty, ObjectProperty<Train> can be used.

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Reinder Feenstra 2023-09-24 17:26:01 +02:00
Ursprung eb63012511
Commit 838714f2fb
4 geänderte Dateien mit 3 neuen und 210 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

140
server/src/core/trainproperty.cpp
Datei anzeigen

@ -1,140 +0,0 @@
/**
* server/src/core/trainproperty.cpp
*
* This file is part of the traintastic source code.
*
* Copyright (C) 2019-2020 Reinder Feenstra
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "trainproperty.hpp"
#include "../train/train.hpp"
using T = Train;
TrainProperty::TrainProperty(Object* object, std::string_view name, const std::shared_ptr<T>& value, PropertyFlags flags) :
AbstractObjectProperty(object, name, flags),
m_value{value}
{
}
TrainProperty::TrainProperty(Object* object, std::string_view name, std::nullptr_t, PropertyFlags flags) :
TrainProperty(object, name, std::shared_ptr<T>(), flags)
{
}
TrainProperty::TrainProperty(Object* object, std::string_view name, const std::shared_ptr<T>& value, PropertyFlags flags, OnSet onSet) :
TrainProperty(object, name, value, flags)
{
m_onSet = onSet;
}
TrainProperty::TrainProperty(Object* object, std::string_view name, std::nullptr_t, PropertyFlags flags, OnSet onSet) :
TrainProperty(object, name, std::shared_ptr<T>(), flags, onSet)
{
}
const std::shared_ptr<T>& TrainProperty::value() const
{
return m_value;
}
void TrainProperty::setValue(const std::shared_ptr<T>& value)
{
assert(isWriteable());
if(m_value == value)
return;
if(!isWriteable())
throw not_writable_error();
if(!m_onSet || m_onSet(value))
{
m_value = value;
changed();
}
else
throw invalid_value_error();
}
void TrainProperty::setValueInternal(const std::shared_ptr<T>& value)
{
if(m_value != value)
{
m_value = value;
changed();
}
}
const T* TrainProperty::operator ->() const
{
return m_value.get();
}
T* TrainProperty::operator ->()
{
return m_value.get();
}
const T& TrainProperty::operator *() const
{
return *m_value;
}
T& TrainProperty::operator *()
{
return *m_value;
}
TrainProperty::operator bool()
{
return m_value.operator bool();
}
TrainProperty& TrainProperty::operator =(const std::shared_ptr<T>& value)
{
setValue(value);
return *this;
}
ObjectPtr TrainProperty::toObject() const
{
return std::dynamic_pointer_cast<Object>(m_value);
}
void TrainProperty::fromObject(const ObjectPtr& value)
{
if(value)
{
if(std::shared_ptr<T> v = std::dynamic_pointer_cast<T>(value))
setValue(v);
else
throw conversion_error();
}
else
setValue(nullptr);
}
void TrainProperty::loadObject(const ObjectPtr& value)
{
if(value)
{
if(std::shared_ptr<T> v = std::dynamic_pointer_cast<T>(value))
m_value = v;
else
throw conversion_error();
}
else
m_value.reset();
}

68
server/src/core/trainproperty.hpp
Datei anzeigen

@ -1,68 +0,0 @@
/**
* server/src/core/trainproperty.hpp
*
* This file is part of the traintastic source code.
*
* Copyright (C) 2019-2020 Reinder Feenstra
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef TRAINTASTIC_SERVER_CORE_TRAINPROPERTY_HPP
#define TRAINTASTIC_SERVER_CORE_TRAINPROPERTY_HPP
#include "abstractobjectproperty.hpp"
#include <functional>
class Train;
//! workaround for ObjectProperty<Train>
class TrainProperty : public AbstractObjectProperty
{
public:
using OnSet = std::function<bool(const std::shared_ptr<Train>& value)>;
protected:
std::shared_ptr<Train> m_value;
OnSet m_onSet;
public:
TrainProperty(Object* object, std::string_view name, const std::shared_ptr<Train>& value, PropertyFlags flags);
TrainProperty(Object* object, std::string_view name, std::nullptr_t, PropertyFlags flags);
TrainProperty(Object* object, std::string_view name, const std::shared_ptr<Train>& value, PropertyFlags flags, OnSet onSet);
TrainProperty(Object* object, std::string_view name, std::nullptr_t, PropertyFlags flags, OnSet onSet);
const std::shared_ptr<Train>& value() const;
void setValue(const std::shared_ptr<Train>& value);
void setValueInternal(const std::shared_ptr<Train>& value);
const Train* operator ->() const;
Train* operator ->();
const Train& operator *() const;
Train& operator *();
operator bool();
TrainProperty& operator =(const std::shared_ptr<Train>& value);
ObjectPtr toObject() const final;
void fromObject(const ObjectPtr& value) final;
void loadObject(const ObjectPtr& value) final;
};
#endif

1
server/src/vehicle/rail/railvehicle.cpp
Datei anzeigen

@ -28,6 +28,7 @@
#include "../../core/attributes.hpp"
#include "../../core/objectproperty.tpp"
#include "../../utils/displayname.hpp"
#include "../../train/train.hpp"
RailVehicle::RailVehicle(World& world, std::string_view _id) :
Vehicle(world, _id),

4
server/src/vehicle/rail/railvehicle.hpp
Datei anzeigen

@ -28,9 +28,9 @@
#include "../../core/lengthproperty.hpp"
#include "../../core/speedproperty.hpp"
#include "../../core/weightproperty.hpp"
#include "../../core/trainproperty.hpp"
class Decoder;
class Train;
class RailVehicle : public Vehicle
{
@ -52,7 +52,7 @@ class RailVehicle : public Vehicle
WeightProperty weight;
WeightProperty totalWeight;
TrainProperty activeTrain;
ObjectProperty<Train> activeTrain;
};
#endif