0.9.1

demo/addons/gd_cubism/cs/gd_cubism_effect_custom_cs.cs

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: MIT
 // SPDX-FileCopyrightText: 2023 MizunagiKB <mizukb@live.jp>
-using System;
 using Godot;
 using Godot.NativeInterop;
 
@@ -24,7 +23,7 @@ public GDCubismEffectCustomCS(Node o) : base(o) { }
     // -------------------------------------------------------------- Method(s)
     // -------------------------------------------------------------- Signal(s)
 
-    public delegate void CubismEpilogueEventHandler(Node2D value, float delta);
+    public delegate void CubismEpilogueEventHandler(Node2D value, double delta);
 
     private static void CubismEpilogueTrampoline(object delegateObj, NativeVariantPtrArgs args, out godot_variant ret)
     {
@@ -57,7 +56,7 @@ public unsafe event CubismInitEventHandler CubismInit
         remove => this.InternalObject.Disconnect(CubismInitName, Callable.CreateWithUnsafeTrampoline(value, &CubismInitrampoline));
     }
 
-    public delegate void CubsimPrologueEventHandler(Node2D value, float delta);
+    public delegate void CubsimPrologueEventHandler(Node2D value, double delta);
 
     private static void CubismPrologueTrampoline(object delegateObj, NativeVariantPtrArgs args, out godot_variant ret)
     {
@@ -74,7 +73,7 @@ public unsafe event CubsimPrologueEventHandler CubismPrologue
         remove => this.InternalObject.Disconnect(CubismPrologueName, Callable.CreateWithUnsafeTrampoline(value, &CubismPrologueTrampoline));
     }
 
-    public delegate void CubismProcessEventHandler(Node2D value, float delta);
+    public delegate void CubismProcessEventHandler(Node2D value, double delta);
 
     private static void CubismProcessTrampoline(object delegateObj, NativeVariantPtrArgs args, out godot_variant ret)
     {

demo/addons/gd_cubism/cs/gd_cubism_user_model_cs.cs

@@ -279,7 +279,7 @@ public float SpeedScale
     ///     Please specify a value of 0.0 or more for delta.
     /// </summary>
     /// <param name="delta">The time to progress the animation.</param>
-    public void Advance(float delta)
+    public void Advance(double delta)
     {
         this.InternalObject.Call("advance", delta);
     }

demo/addons/gd_cubism/example/demo_effect_custom_02.cs

@@ -70,7 +70,7 @@ public override void _Process(double delta)
         recalc_model_position(this.cubism_model);
     }
 
-    private void _on_cubism_process(Node2D model, float delta)
+    private void _on_cubism_process(Node2D model, double delta)
     {
         const int ARRAY_VERTEX = (int)ArrayMesh.ArrayType.Vertex;
 

demo/addons/gd_cubism/example/demo_effect_custom_03.cs

@@ -101,7 +101,7 @@ private void _on_cubism_term(Node2D _model)
         this.history_position = 0;
     }
 
-    private void _on_cubism_process(Node2D _model, float delta)
+    private void _on_cubism_process(Node2D _model, double delta)
     {
         if (this.lipsync_ready == false) return;
 

src/gd_cubism_effect.cpp

@@ -35,9 +35,9 @@ void GDCubismEffect::_cubism_term(InternalCubismUserModel* model) {
 }
 
 
-void GDCubismEffect::_cubism_prologue(InternalCubismUserModel* model, const float delta) {}
-void GDCubismEffect::_cubism_process(InternalCubismUserModel* model, const float delta) {}
-void GDCubismEffect::_cubism_epilogue(InternalCubismUserModel* model, const float delta) {}
+void GDCubismEffect::_cubism_prologue(InternalCubismUserModel* model, const double delta) {}
+void GDCubismEffect::_cubism_process(InternalCubismUserModel* model, const double delta) {}
+void GDCubismEffect::_cubism_epilogue(InternalCubismUserModel* model, const double delta) {}
 
 
 void GDCubismEffect::_enter_tree() {

src/gd_cubism_effect.hpp

@@ -42,9 +42,9 @@ class GDCubismEffect : public Node {
 
     virtual void _cubism_init(InternalCubismUserModel* model);
     virtual void _cubism_term(InternalCubismUserModel* model);
-    virtual void _cubism_prologue(InternalCubismUserModel* model, const float delta);
-    virtual void _cubism_process(InternalCubismUserModel* model, const float delta);
-    virtual void _cubism_epilogue(InternalCubismUserModel* model, const float delta);
+    virtual void _cubism_prologue(InternalCubismUserModel* model, const double delta);
+    virtual void _cubism_process(InternalCubismUserModel* model, const double delta);
+    virtual void _cubism_epilogue(InternalCubismUserModel* model, const double delta);
 
     void _enter_tree() override;
     void _exit_tree() override;

src/gd_cubism_effect_breath.hpp

@@ -70,7 +70,7 @@ class GDCubismEffectBreath : public GDCubismEffect {
         this->_initialized = false;
     }
 
-    virtual void _cubism_process(InternalCubismUserModel* model, const float delta) override {
+    virtual void _cubism_process(InternalCubismUserModel* model, const double delta) override {
         if(this->_initialized == false) return;
         if(this->_active == false) return;
         if(this->_breath == nullptr) return;

src/gd_cubism_effect_custom.hpp

@@ -52,19 +52,19 @@ class GDCubismEffectCustom : public GDCubismEffect {
         this->_initialized = false;
     }
 
-    virtual void _cubism_prologue(InternalCubismUserModel* model, const float delta) override {
+    virtual void _cubism_prologue(InternalCubismUserModel* model, const double delta) override {
         if(this->_initialized == false) return;
         if(this->_active == false) return;
         this->emit_signal("cubism_prologue", model->_owner_viewport, delta);
     }
 
-    virtual void _cubism_process(InternalCubismUserModel* model, const float delta) override {
+    virtual void _cubism_process(InternalCubismUserModel* model, const double delta) override {
         if(this->_initialized == false) return;
         if(this->_active == false) return;
         this->emit_signal("cubism_process", model->_owner_viewport, delta);
     }
 
-    virtual void _cubism_epilogue(InternalCubismUserModel* model, const float delta) override {
+    virtual void _cubism_epilogue(InternalCubismUserModel* model, const double delta) override {
         if(this->_initialized == false) return;
         if(this->_active == false) return;
         this->emit_signal("cubism_epilogue", model->_owner_viewport, delta);

src/gd_cubism_effect_eye_blink.hpp

@@ -55,7 +55,7 @@ class GDCubismEffectEyeBlink : public GDCubismEffect {
         this->_initialized = false;
     }
 
-    virtual void _cubism_process(InternalCubismUserModel* model, const float delta) override {
+    virtual void _cubism_process(InternalCubismUserModel* model, const double delta) override {
         if(this->_initialized == false) return;
         if(this->_active == false) return;
         if(this->_eye_blink == nullptr) return;

src/gd_cubism_effect_hit_area.hpp

@@ -165,7 +165,7 @@ class GDCubismEffectHitArea : public GDCubismEffect {
         this->_initialized = false;
     }
 
-    virtual void _cubism_process(InternalCubismUserModel* model, const float delta) override {
+    virtual void _cubism_process(InternalCubismUserModel* model, const double delta) override {
         if(this->_initialized == false) return;
         if(this->_active == false) return;
 

src/gd_cubism_effect_target_point.hpp

@@ -170,7 +170,7 @@ class GDCubismEffectTargetPoint : public GDCubismEffect {
         this->_initialized = false;
     }
 
-    virtual void _cubism_process(InternalCubismUserModel* model, const float delta) override {
+    virtual void _cubism_process(InternalCubismUserModel* model, const double delta) override {
         if(this->_initialized == false) return;
         if(this->_active == false) return;
         if(this->_target_point == nullptr) return;

src/gd_cubism_user_model.cpp

@@ -450,7 +450,7 @@ void GDCubismUserModel::on_motion_finished(Csm::ACubismMotion* motion) {
 }
 
 
-void GDCubismUserModel::_update(const float delta) {
+void GDCubismUserModel::_update(const double delta) {
 
     this->internal_model->pro_update(delta * this->speed_scale);
 
@@ -493,7 +493,7 @@ void GDCubismUserModel::_update(const float delta) {
 }
 
 
-void GDCubismUserModel::advance(const float delta) {
+void GDCubismUserModel::advance(const double delta) {
     ERR_FAIL_COND(this->is_initialized() == false);
     if(this->playback_process_mode != MANUAL) return;
 

src/gd_cubism_user_model.hpp

@@ -221,9 +221,9 @@ class GDCubismUserModel : public Node2D {
     // for Signal
     static void on_motion_finished(Csm::ACubismMotion* motion);
 
-    void _update(const float delta);
+    void _update(const double delta);
 
-    void advance(const float delta);
+    void advance(const double delta);
 
     bool check_cubism_effect_dirty() const;
     void cubism_effect_dirty_reset();

src/plugin.cpp

@@ -127,7 +127,13 @@ void GDCubismPlugin::_input(const Ref<InputEvent> &p_event) {
     InputEventMouseButton* p_evt_mouse_button = Object::cast_to<InputEventMouseButton>(p_event.ptr());
 
     if (p_evt_mouse_button != nullptr) {
-        Vector2 mouse_pos = get_editor_interface()->get_editor_viewport_2d()->get_mouse_position();
+        const SubViewport *editor_viewport = this->get_editor_interface()->get_editor_viewport_2d();
+        const Rect2 viewport_rect(Point2(0.0, 0.0), editor_viewport->get_size());
+
+        // Check in Viewport2D
+        if (viewport_rect.has_point(p_evt_mouse_button->get_position()) == false) return;
+
+        Vector2 mouse_pos = editor_viewport->get_mouse_position();
 
         if (p_evt_mouse_button->get_button_index() == MOUSE_BUTTON_LEFT) {
             if (p_evt_mouse_button->is_pressed() == true) {
@@ -182,7 +188,13 @@ bool GDCubismPlugin::_forward_canvas_gui_input(const Ref<InputEvent> &p_event) {
     InputEventMouseButton *p_evt_mouse_button = Object::cast_to<InputEventMouseButton>(p_event.ptr());
 
     if (p_evt_mouse_button != nullptr) {
-        Vector2 mouse_pos = this->get_editor_interface()->get_editor_viewport_2d()->get_mouse_position();
+        const SubViewport *editor_viewport = this->get_editor_interface()->get_editor_viewport_2d();
+        const Rect2 viewport_rect(Point2(0.0, 0.0), editor_viewport->get_size());
+
+        // Check in Viewport2D
+        if (viewport_rect.has_point(p_evt_mouse_button->get_position()) == false) return false;
+
+        Vector2 mouse_pos = editor_viewport->get_mouse_position();
 
         if (p_evt_mouse_button->get_button_index() == MOUSE_BUTTON_LEFT) {
             if (p_evt_mouse_button->is_pressed() == true) {

src/private/internal_cubism_user_model.cpp

@@ -172,7 +172,7 @@ void InternalCubismUserModel::model_load_resource()
 }
 
 
-void InternalCubismUserModel::pro_update(const float delta) {
+void InternalCubismUserModel::pro_update(const double delta) {
     if(this->IsInitialized() == false) return;
     if(this->_model_setting == nullptr) return;
     if(this->_model == nullptr) return;
@@ -193,7 +193,7 @@ void InternalCubismUserModel::pro_update(const float delta) {
 }
 
 
-void InternalCubismUserModel::efx_update(const float delta) {
+void InternalCubismUserModel::efx_update(const double delta) {
     if(this->IsInitialized() == false) return;
     if(this->_model_setting == nullptr) return;
     if(this->_model == nullptr) return;
@@ -208,7 +208,7 @@ void InternalCubismUserModel::efx_update(const float delta) {
 }
 
 
-void InternalCubismUserModel::epi_update(const float delta) {
+void InternalCubismUserModel::epi_update(const double delta) {
     if(this->IsInitialized() == false) return;
     if(this->_model_setting == nullptr) return;
     if(this->_model == nullptr) return;
@@ -479,7 +479,7 @@ void InternalCubismUserModel::effect_term() {
 }
 
 
-void InternalCubismUserModel::effect_batch(const float delta, const EFFECT_CALL efx_call) {
+void InternalCubismUserModel::effect_batch(const double delta, const EFFECT_CALL efx_call) {
     for(
         Csm::csmVector<GDCubismEffect*>::iterator i = this->_owner_viewport->_list_cubism_effect.Begin();
         i != this->_owner_viewport->_list_cubism_effect.End();

src/private/internal_cubism_user_model.hpp

@@ -63,9 +63,9 @@ class InternalCubismUserModel : public Csm::CubismUserModel {
 public:
     bool model_load(const String &model_pathname);
     void model_load_resource();
-    void pro_update(const float delta);
-    void efx_update(const float delta);
-    void epi_update(const float delta);
+    void pro_update(const double delta);
+    void efx_update(const double delta);
+    void epi_update(const double delta);
     void update_node();
     void clear();
 
@@ -88,7 +88,7 @@ class InternalCubismUserModel : public Csm::CubismUserModel {
 
     void effect_init();
     void effect_term();
-    void effect_batch(const float delta, const EFFECT_CALL efx_call);
+    void effect_batch(const double delta, const EFFECT_CALL efx_call);
 };