mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2024-11-09 01:38:20 +00:00
ae349d6b15
* Components: Make ComponentType inline Prevents the next commits ODR violation * Components: Add new components * Entity: Add headers inline script component ComponentType * Components: Flip constructor argument order Entity comes first always * Entity: Add generic AddComponent Allows for much easier adding of components and is error proof by not allowing the user to add more than 1 of a specific component type to an Entity. * Entity: Migrate all component constructors Move all to the new variadic templates AddComponent function to reduce clutter and ways the component map is modified. The new function makes no assumptions. Component is assumed to not exist and is checked for with operator[]. This will construct a null component which will then be newed if the component didnt exist, or it will just get the current component if it does already exist. No new component will be allocated or constructed if the component already exists and the already existing pointer is returned instead. * Entity: Add placement new For the case where the component may already exist, use a placement new to construct the component again, it would be constructed again, but would not need to go through the allocator. * Entity: Add comments on likely new code * Tests: Fix tests * Update Entity.cpp * Update SGCannon.cpp * Entity: call destructor when re-constructing * Update Entity.cpp Update Entity.cpp --------- Co-authored-by: Aaron Kimbrell <aronwk.aaron@gmail.com>
77 lines
1.7 KiB
C++
77 lines
1.7 KiB
C++
#pragma once
|
|
#include "dCommonVars.h"
|
|
#include "Entity.h"
|
|
#include "GUID.h"
|
|
#include "Component.h"
|
|
#include "eReplicaComponentType.h"
|
|
|
|
struct MusicCue {
|
|
std::string name;
|
|
uint32_t result;
|
|
float boredomTime;
|
|
|
|
MusicCue(std::string name, float boredomTime = -1.0, uint32_t result = 1){
|
|
this->name = name;
|
|
this->result = result;
|
|
this->boredomTime = boredomTime;
|
|
};
|
|
|
|
void Serialize(RakNet::BitStream* outBitStream);
|
|
};
|
|
|
|
struct MusicParameter {
|
|
std::string name;
|
|
float value;
|
|
|
|
MusicParameter(std::string name, float value = 0.0){
|
|
this->name = name;
|
|
this->value = value;
|
|
}
|
|
|
|
void Serialize(RakNet::BitStream* outBitStream);
|
|
};
|
|
|
|
struct GUIDResults{
|
|
GUID guid;
|
|
uint32_t result;
|
|
|
|
GUIDResults(std::string guidString, uint32_t result = 1){
|
|
this->guid = GUID(guidString);
|
|
this->result = result;
|
|
}
|
|
|
|
void Serialize(RakNet::BitStream* outBitStream);
|
|
};
|
|
|
|
struct MixerProgram{
|
|
std::string name;
|
|
uint32_t result;
|
|
|
|
MixerProgram(std::string name, uint32_t result = 0){
|
|
this->name = name;
|
|
this->result = result;
|
|
}
|
|
|
|
void Serialize(RakNet::BitStream* outBitStream);
|
|
};
|
|
|
|
|
|
class SoundTriggerComponent : public Component {
|
|
public:
|
|
inline static const eReplicaComponentType ComponentType = eReplicaComponentType::SOUND_TRIGGER;
|
|
explicit SoundTriggerComponent(Entity* parent);
|
|
void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate) override;
|
|
void ActivateMusicCue(const std::string& name, float bordemTime = -1.0);
|
|
void DeactivateMusicCue(const std::string& name);
|
|
|
|
private:
|
|
|
|
std::vector<MusicCue> m_MusicCues = {};
|
|
std::vector<MusicParameter> m_MusicParameters = {};
|
|
std::vector<GUIDResults> m_2DAmbientSounds = {};
|
|
std::vector<GUIDResults> m_3DAmbientSounds = {};
|
|
std::vector<MixerProgram> m_MixerPrograms = {};
|
|
|
|
bool m_Dirty = false;
|
|
};
|