Update app.py

app.py

@@ -244,6 +244,10 @@ light.data.energy = 2.0
 bpy.context.scene.render.engine = 'CYCLES'
 bpy.context.scene.cycles.device = 'CPU'
 bpy.context.scene.render.film_transparent = True
+
+# Set frame range for animation
+bpy.context.scene.frame_start = 1
+bpy.context.scene.frame_end = 250
 """
 
 # Sidebar: Blender script examples
@@ -341,11 +345,10 @@ sun_light.data.energy = 5.0
 bpy.context.scene.render.engine = 'CYCLES'
 bpy.context.scene.cycles.device = 'CPU'
 
-print('Solar system animation setup complete.')"""
-}
+print('Solar system animation setup complete.')""",
 
-# Add a simple script example that's lightweight for testing
-script_examples["Simple Cube (Test)"] = """import bpy
+    "Simple Cube (Test)": """import bpy
+import math
 
 # Clear the scene
 bpy.ops.object.select_all(action='SELECT')
@@ -370,6 +373,169 @@ bpy.context.scene.camera = camera
 
 # Setup lighting
 bpy.ops.object.light_add(type='SUN', location=(5, -5, 5))
+
+# Set frame range
+bpy.context.scene.frame_start = 1
+bpy.context.scene.frame_end = 100
+"""
+}
+
+# Add a more animation-focused example
+script_examples["Animated Character"] = """import bpy
+import math
+
+# Clear existing objects
+bpy.ops.object.select_all(action='SELECT')
+bpy.ops.object.delete(use_global=False)
+
+# Create simple character with basic armature
+def create_simple_character():
+    # Create a body (cylinder)
+    bpy.ops.mesh.primitive_cylinder_add(radius=0.5, depth=2, location=(0, 0, 1))
+    body = bpy.context.active_object
+    body.name = "Body"
+    
+    # Create a head (sphere)
+    bpy.ops.mesh.primitive_uv_sphere_add(radius=0.5, location=(0, 0, 2.5))
+    head = bpy.context.active_object
+    head.name = "Head"
+    
+    # Create arms (cylinders)
+    bpy.ops.mesh.primitive_cylinder_add(radius=0.2, depth=1.5, location=(0.8, 0, 1.5))
+    arm_right = bpy.context.active_object
+    arm_right.name = "ArmRight"
+    arm_right.rotation_euler = (0, math.radians(90), 0)
+    
+    bpy.ops.mesh.primitive_cylinder_add(radius=0.2, depth=1.5, location=(-0.8, 0, 1.5))
+    arm_left = bpy.context.active_object
+    arm_left.name = "ArmLeft"
+    arm_left.rotation_euler = (0, math.radians(90), 0)
+    
+    # Create legs (cylinders)
+    bpy.ops.mesh.primitive_cylinder_add(radius=0.25, depth=1, location=(0.3, 0, 0))
+    leg_right = bpy.context.active_object
+    leg_right.name = "LegRight"
+    
+    bpy.ops.mesh.primitive_cylinder_add(radius=0.25, depth=1, location=(-0.3, 0, 0))
+    leg_left = bpy.context.active_object
+    leg_left.name = "LegLeft"
+    
+    return {
+        "body": body,
+        "head": head,
+        "arm_right": arm_right,
+        "arm_left": arm_left,
+        "leg_right": leg_right,
+        "leg_left": leg_left
+    }
+
+# Create character
+character = create_simple_character()
+
+# Create dance animation
+def create_dance_animation():
+    # Set frame range
+    bpy.context.scene.frame_start = 1
+    bpy.context.scene.frame_end = 60
+    
+    # Arm waving
+    # Frame 1
+    bpy.context.scene.frame_set(1)
+    character["arm_right"].rotation_euler = (0, math.radians(90), 0)
+    character["arm_left"].rotation_euler = (0, math.radians(90), 0)
+    character["arm_right"].keyframe_insert(data_path="rotation_euler")
+    character["arm_left"].keyframe_insert(data_path="rotation_euler")
+    
+    # Frame 15
+    bpy.context.scene.frame_set(15)
+    character["arm_right"].rotation_euler = (0, math.radians(90), math.radians(45))
+    character["arm_left"].rotation_euler = (0, math.radians(90), math.radians(-45))
+    character["arm_right"].keyframe_insert(data_path="rotation_euler")
+    character["arm_left"].keyframe_insert(data_path="rotation_euler")
+    
+    # Frame 30
+    bpy.context.scene.frame_set(30)
+    character["arm_right"].rotation_euler = (0, math.radians(90), math.radians(-45))
+    character["arm_left"].rotation_euler = (0, math.radians(90), math.radians(45))
+    character["arm_right"].keyframe_insert(data_path="rotation_euler")
+    character["arm_left"].keyframe_insert(data_path="rotation_euler")
+    
+    # Frame 45
+    bpy.context.scene.frame_set(45)
+    character["arm_right"].rotation_euler = (0, math.radians(90), math.radians(45))
+    character["arm_left"].rotation_euler = (0, math.radians(90), math.radians(-45))
+    character["arm_right"].keyframe_insert(data_path="rotation_euler")
+    character["arm_left"].keyframe_insert(data_path="rotation_euler")
+    
+    # Frame 60
+    bpy.context.scene.frame_set(60)
+    character["arm_right"].rotation_euler = (0, math.radians(90), 0)
+    character["arm_left"].rotation_euler = (0, math.radians(90), 0)
+    character["arm_right"].keyframe_insert(data_path="rotation_euler")
+    character["arm_left"].keyframe_insert(data_path="rotation_euler")
+    
+    # Body bounce
+    # Frame 1
+    bpy.context.scene.frame_set(1)
+    character["body"].location = (0, 0, 1)
+    character["body"].keyframe_insert(data_path="location")
+    character["head"].location = (0, 0, 2.5)
+    character["head"].keyframe_insert(data_path="location")
+    
+    # Frame 15
+    bpy.context.scene.frame_set(15)
+    character["body"].location = (0, 0, 1.2)
+    character["body"].keyframe_insert(data_path="location")
+    character["head"].location = (0, 0, 2.7)
+    character["head"].keyframe_insert(data_path="location")
+    
+    # Frame 30
+    bpy.context.scene.frame_set(30)
+    character["body"].location = (0, 0, 1)
+    character["body"].keyframe_insert(data_path="location")
+    character["head"].location = (0, 0, 2.5)
+    character["head"].keyframe_insert(data_path="location")
+    
+    # Frame 45
+    bpy.context.scene.frame_set(45)
+    character["body"].location = (0, 0, 1.2)
+    character["body"].keyframe_insert(data_path="location")
+    character["head"].location = (0, 0, 2.7)
+    character["head"].keyframe_insert(data_path="location")
+    
+    # Frame 60
+    bpy.context.scene.frame_set(60)
+    character["body"].location = (0, 0, 1)
+    character["body"].keyframe_insert(data_path="location")
+    character["head"].location = (0, 0, 2.5)
+    character["head"].keyframe_insert(data_path="location")
+    
+    # Set interpolation
+    for obj in character.values():
+        if obj.animation_data and obj.animation_data.action:
+            for fc in obj.animation_data.action.fcurves:
+                for kp in fc.keyframe_points:
+                    kp.interpolation = 'BEZIER'
+
+# Create the animation
+create_dance_animation()
+
+# Set up camera and lighting
+bpy.ops.object.camera_add(location=(0, -5, 2))
+camera = bpy.context.active_object
+camera.rotation_euler = (math.radians(80), 0, 0)
+bpy.context.scene.camera = camera
+
+# Add light
+bpy.ops.object.light_add(type='SUN', location=(2, -3, 5))
+sun = bpy.context.active_object
+sun.data.energy = 3.0
+
+# Set render settings
+bpy.context.scene.render.engine = 'CYCLES'
+bpy.context.scene.cycles.device = 'CPU'
+
+print('Character animation setup complete')
 """
 
 # Add example selector
@@ -607,11 +773,11 @@ print(f"Save operation completed, checking if file exists: {{os.path.exists(blen
                     logger.error(f"Alternative approach error: {str(e)}")
                     st.stop()
                 
-            # 6) Export GLB with animation - enhanced error handling
+            # 6) Export GLB with animation - enhanced error handling and animation support
             glb_path = os.path.join(tmp_dir, "animation.glb")
             
-            with st.status("Exporting to GLB format...") as status:
-                # Create a separate Python script for GLB export to avoid command line issues
+            with st.status("Exporting to GLB format with animations...") as status:
+                # Create a separate Python script for enhanced GLB export with better animation support
                 export_script = os.path.join(tmp_dir, "export_glb.py")
                 with open(export_script, "w") as f:
                     f.write(f"""
@@ -631,7 +797,14 @@ try:
     bpy.ops.wm.open_mainfile(filepath=r'{blend_path}')
     print("Blend file loaded successfully")
     
-    # Export to GLB
+    # Get animation info
+    scene = bpy.context.scene
+    frame_start = scene.frame_start
+    frame_end = scene.frame_end
+    fps = scene.render.fps
+    print(f"Animation frames: {{frame_start}}-{{frame_end}} at {{fps}} fps")
+    
+    # Export to GLB with enhanced animation options
     glb_path = r'{glb_path}'
     print(f"Exporting to GLB: {{glb_path}}")
     
@@ -640,7 +813,12 @@ try:
         bpy.ops.export_scene.gltf(
             filepath=glb_path,
             export_format='GLB',
-            export_animations=True
+            export_animations=True,
+            export_frame_range=True,
+            export_frame_step=1,
+            export_anim_single_armature=False,  # Export all animations
+            export_current_frame=False,
+            export_apply=False  # Keep animations intact
         )
         print(f"GLB export completed, file exists: {{os.path.exists(glb_path)}}")
     else:
@@ -654,7 +832,12 @@ try:
             bpy.ops.export_scene.gltf(
                 filepath=glb_path,
                 export_format='GLB',
-                export_animations=True
+                export_animations=True,
+                export_frame_range=True,
+                export_frame_step=1,
+                export_anim_single_armature=False,
+                export_current_frame=False,
+                export_apply=False
             )
             print(f"GLB export completed after enabling add-on")
         else:
@@ -678,7 +861,7 @@ except Exception as e:
                         text=True,
                         timeout=180  # 3 minute timeout
                     )
-                    status.update(label="GLB export completed successfully", state="complete")
+                    status.update(label="GLB export with animations completed successfully", state="complete")
                     st.text_area("Export output", r2.stdout + r2.stderr, height=100)
                     logger.info("GLB export completed successfully")
                 except Exception as e:
@@ -686,13 +869,13 @@ except Exception as e:
                     logger.error(f"GLB export error: {str(e)}")
                     st.stop()
 
-            # 7) Embed GLB inline if it exists
+            # 7) Embed GLB inline with enhanced animation viewer
             if os.path.exists(glb_path):
                 with open(glb_path, 'rb') as f:
                     data = f.read()
                 
                 file_size = len(data) / (1024 * 1024)  # Size in MB
-                st.success(f"Successfully created GLB file ({file_size:.1f} MB)")
+                st.success(f"Successfully created GLB file with animations ({file_size:.1f} MB)")
                 logger.info(f"Created GLB file, size: {file_size:.1f} MB")
                 
                 # Check if file isn't too large for embedding
@@ -702,25 +885,110 @@ except Exception as e:
                 
                 b64 = base64.b64encode(data).decode()
                 
-                # Display the 3D model viewer
-                st.subheader("3D Model Viewer")
+                # Display the 3D model viewer with animation controls
+                st.subheader("3D Model Viewer with Animation Controls")
                 html = f"""
-    <script type="module" src="https://unpkg.com/@google/model-viewer@latest/dist/model-viewer.min.js"></script>
-    <model-viewer 
-        src="data:model/gltf-binary;base64,{b64}" 
-        alt="3D Model" 
-        auto-rotate 
-        camera-controls 
-        ar
-        shadow-intensity="1"
-        style="width:100%; height:600px; background-color: #f0f0f0;">
-    </model-viewer>
-    """
-                st.components.v1.html(html, height=650)
+<script type="module" src="https://unpkg.com/@google/model-viewer@latest/dist/model-viewer.min.js"></script>
+<style>
+    .animation-controls {{
+        display: flex;
+        justify-content: center;
+        margin-top: 10px;
+        gap: 8px;
+    }}
+    .animation-btn {{
+        background-color: #4CAF50;
+        border: none;
+        color: white;
+        padding: 8px 16px;
+        text-align: center;
+        text-decoration: none;
+        display: inline-block;
+        font-size: 14px;
+        margin: 4px 2px;
+        cursor: pointer;
+        border-radius: 4px;
+    }}
+    #animation-name {{
+        font-weight: bold;
+        margin-right: 10px;
+    }}
+</style>
+
+<model-viewer id="model-viewer"
+    src="data:model/gltf-binary;base64,{b64}" 
+    alt="3D Model with Animation" 
+    camera-controls
+    auto-rotate
+    ar
+    shadow-intensity="1"
+    animation-name=""
+    autoplay
+    style="width:100%; height:500px; background-color: #f0f0f0;">
+    <div class="progress-bar hide" slot="progress-bar">
+        <div class="update-bar"></div>
+    </div>
+</model-viewer>
+
+<div class="animation-controls">
+    <span id="animation-name">No animation playing</span>
+    <button id="play-btn" class="animation-btn">Play</button>
+    <button id="pause-btn" class="animation-btn">Pause</button>
+    <button id="stop-btn" class="animation-btn">Stop</button>
+</div>
+
+<script>
+    const modelViewer = document.getElementById('model-viewer');
+    const playBtn = document.getElementById('play-btn');
+    const pauseBtn = document.getElementById('pause-btn');
+    const stopBtn = document.getElementById('stop-btn');
+    const animNameDisplay = document.getElementById('animation-name');
+    
+    // Wait for the model to load
+    modelViewer.addEventListener('load', () => {{
+        // Get available animations
+        const animationNames = modelViewer.availableAnimations;
+        console.log('Available animations:', animationNames);
+        
+        if (animationNames && animationNames.length > 0) {{
+            // Set first animation as default
+            modelViewer.animationName = animationNames[0];
+            animNameDisplay.textContent = 'Playing: ' + animationNames[0];
+            modelViewer.play();
+        }} else {{
+            animNameDisplay.textContent = 'No animations available';
+        }}
+    }});
+    
+    // Animation controls
+    playBtn.addEventListener('click', () => {{
+        modelViewer.play();
+        if (modelViewer.animationName) {{
+            animNameDisplay.textContent = 'Playing: ' + modelViewer.animationName;
+        }}
+    }});
+    
+    pauseBtn.addEventListener('click', () => {{
+        modelViewer.pause();
+        if (modelViewer.animationName) {{
+            animNameDisplay.textContent = 'Paused: ' + modelViewer.animationName;
+        }}
+    }});
+    
+    stopBtn.addEventListener('click', () => {{
+        modelViewer.pause();
+        modelViewer.currentTime = 0;
+        if (modelViewer.animationName) {{
+            animNameDisplay.textContent = 'Stopped: ' + modelViewer.animationName;
+        }}
+    }});
+</script>
+"""
+                st.components.v1.html(html, height=600)
                 
                 # Add download button
                 st.download_button(
-                    "⬇️ Download GLB File", 
+                    "⬇️ Download GLB File with Animation", 
                     data, 
                     file_name="animation.glb",
                     mime="model/gltf-binary"
@@ -797,6 +1065,37 @@ with st.expander("Script Tips"):
     - Try the "Simple Cube (Test)" example first to verify Blender is working
     """)
 
+with st.expander("Animation Tips"):
+    st.markdown("""
+    ### Tips for creating animations that show properly in GLB
+
+    1. **Set frame range properly**: Always define your animation frame range
+    ```python
+    bpy.context.scene.frame_start = 1
+    bpy.context.scene.frame_end = 60  # End frame of your animation
+    ```
+
+    2. **Use keyframes properly**: Add keyframes at specific frames
+    ```python
+    # Set current frame
+    bpy.context.scene.frame_set(1)
+    
+    # Set object properties
+    obj.location = (0, 0, 0)
+    
+    # Insert keyframe for that property
+    obj.keyframe_insert(data_path="location")
+    ```
+
+    3. **Animation export settings**: The app automatically handles GLB export with proper animation settings
+
+    4. **Animation playback**: Use the animation controls below the 3D viewer to play/pause/stop your animation
+
+    5. **Multiple animations**: If your GLB has multiple animations, they will be detected and can be selected in the viewer
+
+    6. **Looping animations**: By default, animations will loop in the viewer
+    """)
+
 # Add a section at the bottom for Hugging Face Spaces setup
 with st.expander("Hugging Face Spaces Setup"):
     st.markdown("""