[#17] : Fixed OpenGL issue

ange-yaghi · Jul 26, 2020 · e3fdf73 · e3fdf73
1 parent 667c060
commit e3fdf73
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 12 deletions.
diff --git a/engines/basic/include/render_skeleton.h b/engines/basic/include/render_skeleton.h
@@ -12,6 +12,7 @@ namespace dbasic {
         RenderSkeleton();
         ~RenderSkeleton();
 
+        RenderNode *GetRoot();
         RenderNode *NewNode();
         RenderNode *GetNode(int index);
         RenderNode *GetNode(const char *nodeName);

diff --git a/engines/basic/src/render_skeleton.cpp b/engines/basic/src/render_skeleton.cpp
@@ -8,6 +8,10 @@ dbasic::RenderSkeleton::~RenderSkeleton() {
     /* void */
 }
 
+dbasic::RenderNode *dbasic::RenderSkeleton::GetRoot() {
+    return GetNode(0);
+}
+
 dbasic::RenderNode *dbasic::RenderSkeleton::NewNode() {
     RenderNode *newNode = m_renderNodes.NewGeneric<RenderNode, 16>();
     newNode->SetSkeleton(this);
@@ -79,9 +83,7 @@ void dbasic::RenderSkeleton::UpdateAnimation(float dt) {
         TransformTarget *rotTarget = node->GetRotationTarget();
 
         if (locTarget->IsAnimated()) {
-            ysVector movement = node->Transform.LocalToParentDirection(locTarget->GetLocationResult());
-            ysVector movementParentSpace = movement;
-
+            ysVector movementParentSpace = locTarget->GetLocationResult();
             node->Transform.SetPosition(ysMath::Add(node->GetRestLocation(), movementParentSpace));
         }
 

diff --git a/include/yds_opengl_device.h b/include/yds_opengl_device.h
@@ -30,6 +30,7 @@ class ysOpenGLDevice : public ysDevice {
     virtual ysError ResizeRenderTarget(ysRenderTarget *target, int width, int height);
     virtual ysError DestroyRenderTarget(ysRenderTarget *&target);
     virtual ysError SetRenderTarget(ysRenderTarget *target);
+    virtual ysError SetDepthTestEnabled(ysRenderTarget *target, bool enable);
 
     virtual ysError ClearBuffers(const float *clearColor);
     virtual ysError Present();

diff --git a/include/yds_opengl_render_target.h b/include/yds_opengl_render_target.h
@@ -3,13 +3,10 @@
 
 #include "yds_render_target.h"
 
-class ysOpenGLRenderTarget : public ysRenderTarget
-{
-
+class ysOpenGLRenderTarget : public ysRenderTarget {
 	friend class ysOpenGLDevice;
 
 public:
-
 	ysOpenGLRenderTarget();
 	virtual ~ysOpenGLRenderTarget();
 
@@ -18,11 +15,9 @@ class ysOpenGLRenderTarget : public ysRenderTarget
 	unsigned int GetDepthBuffer() const { return m_depthBufferHandle; }
 
 protected:
-
 	unsigned int m_framebufferHandle;
 	unsigned int m_depthBufferHandle;
 	unsigned int m_textureHandle;
-
 };
 
-#endif
+#endif /* YDS_OPENGL_RENDER_TARGET_H */
diff --git a/include/yds_transform.h b/include/yds_transform.h
@@ -28,6 +28,7 @@ class ysTransform {
     ysVector ParentToLocalDirection(const ysVector &p);
     ysVector ParentToWorldDirection(const ysVector &p);
 
+    ysQuaternion WorldToLocalOrientation(const ysQuaternion &q);
     ysQuaternion WorldToParentOrientation(const ysQuaternion &q);
 
     ysQuaternion GetLocalOrientation() const;

diff --git a/src/yds_math.cpp b/src/yds_math.cpp
@@ -66,7 +66,7 @@ ysQuaternion ysMath::LoadQuaternion(float angle, const ysVector &axis) {
     ysVector newAxis = _mm_shuffle_ps(axis, axis, _MM_SHUFFLE(2, 1, 0, 3));
     newAxis = _mm_and_ps(newAxis, ysMath::Constants::MaskOffX);
     newAxis = _mm_mul_ps(newAxis, ysMath::LoadScalar(sinAngle));
-    newAxis = _mm_or_ps(newAxis, ysMath::LoadVector(cosAngle));
+    newAxis = _mm_add_ps(newAxis, ysMath::LoadVector(cosAngle));
 
     newAxis = ysMath::Normalize(newAxis);
 

diff --git a/src/yds_opengl_device.cpp b/src/yds_opengl_device.cpp
@@ -272,7 +272,7 @@ ysError ysOpenGLDevice::SetRenderTarget(ysRenderTarget *target) {
             m_realContext->glBindFramebuffer(GL_DRAW_FRAMEBUFFER, realTarget->GetFramebuffer());
         }
 
-        if (target->HasDepthBuffer()) glEnable(GL_DEPTH_TEST);
+        if (target->HasDepthBuffer() && target->IsDepthTestEnabled()) glEnable(GL_DEPTH_TEST);
         else glDisable(GL_DEPTH_TEST);
 
         int refw, refh;
@@ -288,6 +288,19 @@ ysError ysOpenGLDevice::SetRenderTarget(ysRenderTarget *target) {
     return YDS_ERROR_RETURN(ysError::YDS_NO_ERROR);
 }
 
+ysError ysOpenGLDevice::SetDepthTestEnabled(ysRenderTarget *target, bool enable) {
+    YDS_ERROR_DECLARE("SetDepthTestEnabled");
+
+    bool previousState = target->IsDepthTestEnabled();
+    YDS_NESTED_ERROR_CALL(ysDevice::SetDepthTestEnabled(target, enable));
+
+    if (target == GetActiveRenderTarget() && previousState != enable) {
+        SetRenderTarget(target);
+    }
+
+    return YDS_ERROR_RETURN(ysError::YDS_NO_ERROR);
+}
+
 ysError ysOpenGLDevice::DestroyRenderTarget(ysRenderTarget *&target) {
     YDS_ERROR_DECLARE("DestroyRenderTarget");
 

diff --git a/src/yds_transform.cpp b/src/yds_transform.cpp
@@ -96,6 +96,11 @@ ysVector ysTransform::ParentToWorldDirection(const ysVector &p) {
     else return m_parent->LocalToWorldDirection(p);
 }
 
+ysQuaternion ysTransform::WorldToLocalOrientation(const ysQuaternion &q) {
+    return ysMath::QuatMultiply(
+        ysMath::QuatInvert(ysMath::Normalize(GetWorldOrientation())), q);
+}
+
 ysQuaternion ysTransform::WorldToParentOrientation(const ysQuaternion &q) {
     if (m_parent == nullptr) return q;
     else return ysMath::QuatMultiply(