nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

widget now uses new transformcomponent but not in an ecs way

Browse Source
This commit is contained in:
turanszkij
2018-08-28 17:17:03 +01:00
parent 61bac38dae
commit 8184f47f35
6 changed files with 255 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WickedEngine/wiGUI.cpp
-42
View File
@@ -23,48 +23,6 @@ void wiGUI::Update(float dt)
return;
}
for (size_t i = 0; i < transforms.GetCount(); ++i)
{
auto& transform = transforms[i];
const bool parented = transforms.IsValid(transform.parent_ref);
//if (transform.dirty || parented)
{
transform.dirty = false;
XMVECTOR scale_local = XMLoadFloat3(&transform.scale_local);
XMVECTOR rotation_local = XMLoadFloat4(&transform.rotation_local);
XMVECTOR translation_local = XMLoadFloat3(&transform.translation_local);
XMMATRIX world =
XMMatrixScalingFromVector(scale_local) *
XMMatrixRotationQuaternion(rotation_local) *
XMMatrixTranslationFromVector(translation_local);
if (parented)
{
auto& parent = transforms.GetComponent(transform.parent_ref);
XMMATRIX world_parent = XMLoadFloat4x4(&parent.world);
XMMATRIX bindMatrix = XMLoadFloat4x4(&transform.world_parent_bind);
world = world * bindMatrix * world_parent;
}
else
{
transform.translation_local.x += 0.1f;
}
XMVECTOR S, R, T;
XMMatrixDecompose(&S, &R, &T, world);
XMStoreFloat3(&transform.scale, S);
XMStoreFloat4(&transform.rotation, R);
XMStoreFloat3(&transform.translation, T);
transform.world_prev = transform.world;
XMStoreFloat4x4(&transform.world, world);
}
}
XMFLOAT4 _p = wiInputManager::GetInstance()->getpointer();
pointerpos.x = _p.x;
pointerpos.y = _p.y;
WickedEngine/wiGUI.h
-3
View File
@@ -1,7 +1,6 @@
#pragma once
#include "CommonInclude.h"
#include "wiEnums.h"
#include "wiSceneSystem.h"
#include <list>
@@ -52,7 +51,5 @@ public:
{
return pointerpos;
}
wiECS::ComponentManager<wiSceneSystem::TransformComponent> transforms;
};
WickedEngine/wiSceneSystem.cpp
+71 -25
View File
@@ -8,6 +8,49 @@ using namespace wiGraphicsTypes;
namespace wiSceneSystem
{
void TransformComponent::AttachTo(const TransformComponent* const parent)
{
dirty = true;
XMMATRIX parent_world_inverse = XMMatrixInverse(nullptr, XMLoadFloat4x4(&parent->world));
XMStoreFloat4x4(&world_parent_bind, parent_world_inverse);
}
void TransformComponent::UpdateTransform(const TransformComponent* const parent)
{
if (dirty || parent != nullptr)
{
dirty = false;
XMVECTOR S_local = XMLoadFloat3(&scale_local);
XMVECTOR R_local = XMLoadFloat4(&rotation_local);
XMVECTOR T_local = XMLoadFloat3(&translation_local);
XMMATRIX W =
XMMatrixScalingFromVector(S_local) *
XMMatrixRotationQuaternion(R_local) *
XMMatrixTranslationFromVector(T_local);
if (parent != nullptr)
{
XMMATRIX W_parent = XMLoadFloat4x4(&parent->world);
XMMATRIX B = XMLoadFloat4x4(&world_parent_bind);
W = W * B * W_parent;
XMVECTOR S, R, T;
XMMatrixDecompose(&S, &R, &T, W);
XMStoreFloat3(&scale, S);
XMStoreFloat4(&rotation, R);
XMStoreFloat3(&translation, T);
}
else
{
scale = scale_local;
rotation = rotation_local;
translation = translation_local;
}
world_prev = world;
XMStoreFloat4x4(&world, W);
}
}
void TransformComponent::ClearTransform()
{
dirty = true;
@@ -151,36 +194,39 @@ namespace wiSceneSystem
auto& transform = transforms[i];
const bool parented = transforms.IsValid(transform.parent_ref);
const TransformComponent* parent = parented ? &transforms.GetComponent(transform.parent_ref) : nullptr;
if (transform.dirty || parented)
{
transform.dirty = false;
transform.UpdateTransform(parent);
XMVECTOR scale_local = XMLoadFloat3(&transform.scale_local);
XMVECTOR rotation_local = XMLoadFloat4(&transform.rotation_local);
XMVECTOR translation_local = XMLoadFloat3(&transform.translation_local);
XMMATRIX world =
XMMatrixScalingFromVector(scale_local) *
XMMatrixRotationQuaternion(rotation_local) *
XMMatrixTranslationFromVector(translation_local);
//if (transform.dirty || parented)
//{
// transform.dirty = false;
if (parented)
{
auto& parent = transforms.GetComponent(transform.parent_ref);
XMMATRIX world_parent = XMLoadFloat4x4(&parent.world);
XMMATRIX bindMatrix = XMLoadFloat4x4(&transform.world_parent_bind);
world = world * bindMatrix * world_parent;
}
// XMVECTOR scale_local = XMLoadFloat3(&transform.scale_local);
// XMVECTOR rotation_local = XMLoadFloat4(&transform.rotation_local);
// XMVECTOR translation_local = XMLoadFloat3(&transform.translation_local);
// XMMATRIX world =
// XMMatrixScalingFromVector(scale_local) *
// XMMatrixRotationQuaternion(rotation_local) *
// XMMatrixTranslationFromVector(translation_local);
XMVECTOR S, R, T;
XMMatrixDecompose(&S, &R, &T, world);
XMStoreFloat3(&transform.scale, S);
XMStoreFloat4(&transform.rotation, R);
XMStoreFloat3(&transform.translation, T);
// if (parented)
// {
// auto& parent = transforms.GetComponent(transform.parent_ref);
// XMMATRIX world_parent = XMLoadFloat4x4(&parent.world);
// XMMATRIX bindMatrix = XMLoadFloat4x4(&transform.world_parent_bind);
// world = world * bindMatrix * world_parent;
// }
transform.world_prev = transform.world;
XMStoreFloat4x4(&transform.world, world);
}
// XMVECTOR S, R, T;
// XMMatrixDecompose(&S, &R, &T, world);
// XMStoreFloat3(&transform.scale, S);
// XMStoreFloat4(&transform.rotation, R);
// XMStoreFloat3(&transform.translation, T);
// transform.world_prev = transform.world;
// XMStoreFloat4x4(&transform.world, world);
//}
}
WickedEngine/wiSceneSystem.h
+2
View File
@@ -40,6 +40,8 @@ namespace wiSceneSystem
XMFLOAT4X4 world_prev;
XMFLOAT4X4 world_parent_bind;
void AttachTo(const TransformComponent* const parent);
void UpdateTransform(const TransformComponent* const parent = nullptr);
void ClearTransform();
void Translate(const XMFLOAT3& value);
void RotateRollPitchYaw(const XMFLOAT3& value);
WickedEngine/wiWidget.cpp
+180 -153
View File
File diff suppressed because it is too large Load Diff
WickedEngine/wiWidget.h
+2 -1
View File
@@ -4,6 +4,7 @@
#include "wiColor.h"
#include "wiGraphicsAPI.h"
#include "wiIntersectables.h"
#include "wiSceneSystem.h"
#include <string>
#include <list>
@@ -24,7 +25,7 @@ struct wiEventArgs
std::string sValue;
};
class wiWidget
class wiWidget : public wiSceneSystem::TransformComponent
{
friend class wiGUI;
public: