Tidied up animations folder

Author: daustin305

calc-backend/.gitignore

@@ -4,3 +4,6 @@ dist
 
 .venv
 prisma/client
+
+animation-gen/__pycache__
+animation-gen/media

…nd/src/Animations/derivativeAnimation.py …end/animation-gen/derivativeAnimation.pycalc-frontend/src/Animations/derivativeAnimation.py renamed to calc-backend/animation-gen/derivativeAnimation.py calc-frontend/src/Animations/derivativeAnimation.py renamed to calc-backend/animation-gen/derivativeAnimation.py

@@ -11,18 +11,18 @@ def construct(self):
                 axis_config={"include_numbers": True, "include_tip": False}
             )
             .to_edge(DL)
-            .set_color(GREY)
+            .set_color(GRAY_A)
         )
 
-        axes_labels = axes.get_axis_labels(x_label="x",y_label="y")
+        axes_labels = axes.get_axis_labels(x_label="x",y_label="y").set_color(GRAY_A)
 
         func = axes.plot(
             lambda x: .5 * x * (x-3) * (x-4) + .6, 
             x_range = (0,5)
         )
 
-        x = ValueTracker(7)
-        dx = ValueTracker(2)
+        x = ValueTracker(5.5)
+        dx = ValueTracker(.33)
 
         secant = always_redraw(
             lambda: axes.get_secant_slope_group(
@@ -34,7 +34,7 @@ def construct(self):
                 dx_label = "dx",
                 dy_label = "dy",
                 secant_line_color=GREEN,
-                secant_line_length=8
+                secant_line_length=5
             )
         )
 
@@ -57,16 +57,23 @@ def construct(self):
 
         tangent_label = always_redraw(
             lambda: MathTex("y = f'(x)")
-            .scale(0.6)
-            .next_to(secant, UP, buff=0.1)
+            .scale(0.75)
+            .next_to(dot1, UL, buff=0.5)
             .set_color(GREEN)
         )
 
-        self.add(axes, axes_labels,func)
+        self.add(axes, axes_labels, func)
         self.add(dot1,dot2,secant,tangent_label)
+<<<<<<< HEAD:calc-frontend/src/Animations/derivativeAnimation.py
         self.play(dx.animate.set_value(.001), run_time=1)
         self.play(x.animate.set_value(1), run_time = 4)
         self.play(x.animate.set_value(7), run_time = 4)
         self.play(dx.animate.set_value(2), run_time = 1)
 
-        self.wait(3)
+        self.wait(3)
+=======
+        self.play(x.animate(rate_func=linear).set_value(3), run_time = 1.5)
+        self.play(x.animate(rate_func=rush_from).set_value(1), run_time = 2)
+        self.play(x.animate(rate_func=rush_into).set_value(3), run_time = 2)
+        self.play(x.animate(rate_func=linear).set_value(5.5), run_time = 1.5)
+>>>>>>> fabfda6e62f84d1215fa9f2e0e846c48e9fbb0ed:calc-backend/animation-gen/derivativeAnimation.py

…end/src/Animations/integralAnimations.py …ckend/animation-gen/integralAnimation.pycalc-frontend/src/Animations/integralAnimations.py renamed to calc-backend/animation-gen/integralAnimation.py calc-frontend/src/Animations/integralAnimations.py renamed to calc-backend/animation-gen/integralAnimation.py

@@ -2,21 +2,35 @@
 
 class RightRiemannSum(Scene):
     def construct(self):
+<<<<<<< HEAD:calc-frontend/src/Animations/integralAnimations.py
         axes = Axes(
+=======
+        # Create axes
+        axes = (Axes(
+>>>>>>> fabfda6e62f84d1215fa9f2e0e846c48e9fbb0ed:calc-backend/animation-gen/integralAnimation.py
             x_range=[0, 2.5, 1],
             y_range=[0, 5, 1],
             x_length=10,
             y_length=5,
             axis_config={"include_numbers": True}
-        ).to_edge(LEFT)
+          )
+          .to_edge(LEFT)
+          .set_color(GRAY_A)
+        )
 
+<<<<<<< HEAD:calc-frontend/src/Animations/integralAnimations.py
         x_label = axes.get_x_axis_label("x")
         y_label = axes.get_y_axis_label("y")
+=======
+        # Axis labels
+        x_label = axes.get_x_axis_label("x").set_color(GRAY_A)
+        y_label = axes.get_y_axis_label("y").set_color(GRAY_A)
+>>>>>>> fabfda6e62f84d1215fa9f2e0e846c48e9fbb0ed:calc-backend/animation-gen/integralAnimation.py
 
-        self.play(Create(axes), Write(x_label), Write(y_label))
+        self.add(axes, x_label, y_label)
 
         graph = axes.plot(lambda x: 0.6 * x**2, x_range=[0, 2.3], color=WHITE)
-        self.play(Create(graph), run_time=2)
+        self.play(Create(graph), run_time=1)
 
         a, b = 0, 2
         n = 10
@@ -43,8 +57,12 @@ def construct(self):
             rect.align_to(rect_corner, DOWN + LEFT)
             rectangles.add(rect)
 
+<<<<<<< HEAD:calc-frontend/src/Animations/integralAnimations.py
+=======
+        # Animate rectangles fading in one-by-one
+>>>>>>> fabfda6e62f84d1215fa9f2e0e846c48e9fbb0ed:calc-backend/animation-gen/integralAnimation.py
         for rect in rectangles:
-            self.play(FadeIn(rect, run_time=0.2))
+            self.play(FadeIn(rect, run_time=0.15))
 
         area_text = Text(f"Area ≈ {area_sum:.2f}", font_size=36)
         area_text.to_edge(UP).shift(DOWN*2.4 + LEFT * 3.5)
@@ -56,9 +74,6 @@ def construct(self):
             FadeOut(rectangles),
             FadeOut(area_text),
             FadeOut(graph),
-            FadeOut(axes),
-            FadeOut(x_label),
-            FadeOut(y_label),
             run_time=1
         )
 

…ontend/src/Animations/limitsAnimation.py …backend/animation-gen/limitsAnimation.pycalc-frontend/src/Animations/limitsAnimation.py renamed to calc-backend/animation-gen/limitsAnimation.py calc-frontend/src/Animations/limitsAnimation.py renamed to calc-backend/animation-gen/limitsAnimation.py

@@ -1,19 +1,52 @@
+av==13.1.0
+beautifulsoup4==4.13.3
 certifi==2024.7.4
 charset-normalizer==3.3.2
+click==8.1.8
+cloup==3.0.7
+Cython==3.0.12
+decorator==5.2.1
+glcontext==3.0.0
 idna==3.7
+isosurfaces==0.1.2
+manim==0.19.0
+ManimPango==0.6.0
+mapbox_earcut==1.0.3
+markdown-it-py==3.0.0
+mdurl==0.1.2
+moderngl==5.12.0
+moderngl-window==3.1.1
 mpmath==1.3.0
 narwhals==1.28.0
-numpy==2.0.1
+networkx==3.4.2
+numpy==2.2.4
 packaging==24.2
 pandas==2.2.2
+pillow==11.2.1
 plotly==6.0.0
 plusminus==0.8.1
+pycairo==1.28.0
+pydub==0.25.1
+pyglet==2.1.3
+pyglm==2.8.2
+Pygments==2.19.1
+pyobjc-core==11.0
+pyobjc-framework-Cocoa==11.0
 pyparsing==3.2.1
 python-dateutil==2.9.0.post0
 pytz==2024.1
 requests==2.32.3
+rich==14.0.0
 scipy==1.15.2
+screeninfo==0.8.1
 six==1.16.0
+skia-pathops==0.8.0.post2
+soupsieve==2.6
+srt==3.5.3
+svgelements==1.9.6
 sympy==1.13.3
+tqdm==4.67.1
+typing_extensions==4.13.2
 tzdata==2024.1
 urllib3==2.2.2
+watchdog==6.0.0