bestguigui_lab 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d384a7e131d476249187d97515f7f62f9c165702063908cfb7852ef261300d6c
-  data.tar.gz: 523552046db0a7e19c10556a4782ad37ad8ee272053d037345985717ed698fe1
+  metadata.gz: ef2f3f88c26af654bbcc041f8bd7fc933a63c5609d747d97a7a293ddf76675ec
+  data.tar.gz: 788af1255f57430851b9c540cece24285f318ea815ec509b3a846ce314e0180b
 SHA512:
-  metadata.gz: ed74df8e29395e4545125d07f8a53d17a927b59d2fe235f3c8ac75d22dcc0d6e0ff912775b03c2c9f3a0799c369c3d24e0c05c1ed466bbea2842c79fbe42b09c
-  data.tar.gz: 1441f99ec534d3cade5502c36c1c1ebcc6a3ddfaeda66ac1affd710405490f7a01f67a986242cf2b1440d6d5c161bd050a81c7993e5b1235644df311738b7238
+  metadata.gz: 54e63a9a9e6e8db8553290ee3b00dae55b774a8f935b164574af1504e5577683886bcea05f8c1a7c39b53436e479afbc5d1d7d3fe32fde3b287630027176b0fb
+  data.tar.gz: 941c362b66dc200c264f13fa6694a9c359f183a0de09784e4fcc1bdf438e99c11413b64d83678adc05de87c8ad3be51454c68fd3fa246d70873beb48dbc9e803

data/lib/bestguigui_lab/gltf_animator.rb

@@ -6,7 +6,9 @@ module Bestguigui
     # temps de la transition, jamais de coupure nette d'une animation a
     # l'autre. GLTFModel#play/#update s'en servent directement.
     class GLTFAnimator
-        def initialize
+        attr_accessor :speed
+
+        def initialize(speed: 1.0)
             @current = nil
             @time = 0.0
             @loop = true
@@ -15,6 +17,7 @@ module Bestguigui
             @previous_loop = true
             @transition_duration = 0.0
             @transition_elapsed = 0.0
+            @speed = speed
         end
 
         # loop: rejoue en boucle une fois la fin atteinte. transition: duree
@@ -35,10 +38,10 @@ module Bestguigui
         def update(dt)
             return unless @current
 
-            @time = advance_time(@time, dt, @current, @loop)
+            @time = advance_time(@time, dt * @speed, @current, @loop)
             return unless @previous
 
-            @previous_time = advance_time(@previous_time, dt, @previous, @previous_loop)
+            @previous_time = advance_time(@previous_time, dt * @speed, @previous, @previous_loop)
             @transition_elapsed += dt
             @previous = nil if @transition_elapsed >= @transition_duration
         end

data/lib/bestguigui_lab/gltf_model.rb

@@ -3,34 +3,31 @@
 require 'tempfile'
 
 module Bestguigui
-    # Charge un modele .glb (glTF binaire, un seul fichier auto-suffisant —
-    # voir GLTFBuffer) : squelette et animations (voir GLTFSkeleton/
-    # GLTFAnimation/GLTFAnimator), rendu en shading: :texture (par defaut) ou
-    # :gouraud (voir GouraudShading), sans aucun shader — le skinning se fait
-    # sur le CPU (voir GLTFPrimitive). Un seul skin/squelette par fichier
-    # (cf. GLTFSkeleton).
+    # Charge un modele .glb (glTF binaire auto-suffisant, cf. GLTFBuffer) :
+    # squelette + animations (GLTFSkeleton/GLTFAnimation/GLTFAnimator),
+    # skinning CPU (GLTFPrimitive), shading: :texture ou :gouraud, rigid:
+    # true pour ignorer la mise a l'echelle des os.
     #
     #   model = Bestguigui::Assets.gltf_model('assets/jill.glb')
     #   model.play('Idle')
-    #   # dans update(dt)/draw de ta Scene :
-    #   model.update(dt)
-    #   model.draw
-    #   model.play('walk', transition: 0.3) # fondu enchaine de 0.3s vers walk
-    #
-    # rigid: true interdit toute deformation du maillage par mise a
-    # l'echelle d'un os (seules rotation et translation l'articulent) — voir
-    # GLTFSkeleton.
+    #   model.update(dt) # puis model.draw, dans ta Scene
+    #   model.play('walk', transition: 0.3)
     class GLTFModel
-        def initialize(path, shading: :texture, rigid: false)
+        def initialize(path, shading: :texture, rigid: false, speed: 1.0)
             super()
             @shading = shading
             @rigid = rigid
             load_scene(path)
-            @animator = GLTFAnimator.new
+            @animator = GLTFAnimator.new(speed: speed)
             reskin
         end
 
         def animation_names = @animations.keys
+        def speed = @animator.speed
+
+        def speed=(value)
+            @animator.speed = value
+        end
 
         def play(name, loop: true, transition: 0.0)
             animation = @animations.fetch(name) { raise ArgumentError, "animation glTF inconnue : #{name.inspect}" }
@@ -121,9 +118,7 @@ module Bestguigui
             return nil unless material_index
 
             texture_ref = @json['materials'][material_index].dig('pbrMetallicRoughness', 'baseColorTexture')
-            return nil unless texture_ref
-
-            @textures[@json['textures'][texture_ref['index']]['source']]
+            texture_ref && @textures[@json['textures'][texture_ref['index']]['source']]
         end
 
         # --- Texture embarquee : ecrite dans un fichier temporaire le temps

data/lib/bestguigui_lab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bestguigui
-    VERSION = '0.14.0'
+    VERSION = '0.14.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bestguigui_lab
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Bestguigui