Entity is now sent with the click events.
Fixed small things
This commit is contained in:
@@ -7,7 +7,8 @@ namespace Events
|
||||
{
|
||||
|
||||
struct ButtonClicked : public Event {
|
||||
std::string EntityName = "DEFAULT STRING USED";
|
||||
std::string EntityName;
|
||||
EntityWrapper Entity;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -7,7 +7,8 @@ namespace Events
|
||||
{
|
||||
|
||||
struct ButtonPressed : public Event {
|
||||
std::string EntityName = "DEFAULT STRING USED";
|
||||
std::string EntityName;
|
||||
EntityWrapper Entity;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -6,7 +6,9 @@
|
||||
namespace Events
|
||||
{
|
||||
|
||||
struct ButtonReleased : public Event { };
|
||||
struct ButtonReleased : public Event {
|
||||
EntityWrapper Entity;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -108,7 +108,7 @@ struct ModelJob : RenderJob
|
||||
EndIndex = matGroup->EndIndex;
|
||||
Matrix = matrix;
|
||||
Color = modelComponent["Color"];
|
||||
GlowIntencity = ((double)modelComponent["GlowIntensity"]);
|
||||
GlowIntensity = ((double)modelComponent["GlowIntensity"]);
|
||||
Entity = modelComponent.EntityID;
|
||||
glm::vec3 abspos = Transform::AbsolutePosition(world, modelComponent.EntityID);
|
||||
glm::vec3 worldpos = glm::vec3(camera->ViewMatrix() * glm::vec4(abspos, 1));
|
||||
@@ -171,7 +171,7 @@ struct ModelJob : RenderJob
|
||||
::Skeleton::AnimationOffset AnimationOffset;
|
||||
|
||||
|
||||
float GlowIntencity = 8.0;
|
||||
float GlowIntensity = 8.0;
|
||||
glm::vec4 DiffuseColor;
|
||||
glm::vec4 SpecularColor;
|
||||
glm::vec4 IncandescenceColor;
|
||||
|
||||
Reference in New Issue
Block a user