update slike.cpp

random/slike.cpp

@@ -3,109 +3,116 @@
 #include <cmath>
 #include <vector>
 
-float len = 300;
+Vector2 newPoint(Vector2 start, float len, float angleD){
-float angleD = 100;
+  float angleR = (angleD * PI) / 180; // radian
-float angleR = (angleD * PI) / 180; // radian
+  return {start.x + len * cos(angleR), start.y - len * sin(angleR)};
-Vector2 start = {250, 400};
+}
-Vector2 end = {250, start.y - len};
+
-Vector2 end_kot = {};
+void drawBranch(Vector2 startV, Vector2 endV, Color startC, Color endC, int startR, int endR){
-float radius = 20;
+  float fstep = 0.05;
-float radiusS = 80;
+  for (float i = 0; i < 1.05; i += fstep)
-float radiusE = 60;
+  {
-Color colorS = RED;
+    Vector2 point = Vector2Lerp(startV, endV, i);
-Color colorE = GREEN;
+    Color color = ColorLerp(startC, endC, i);
+    int size = Lerp(startR, endR, i);
+    DrawCircleV(point, size, color);
+  }
+}
+
+constexpr float screenWidth = 800;
+constexpr float screenHeight = 800;
+
+constexpr float len = 300;
+constexpr float angleD = 100;
+constexpr Vector2 start = {screenWidth / 2, screenHeight - 100};
+constexpr float radius = 20;
+constexpr float radiusS = 80;
+constexpr float radiusE = 60;
+constexpr Color colorS = RED;
+constexpr Color colorE = GREEN;
 
 typedef void (*slika)();
 
-Vector2 tstart = {10, 10};
-int tsize = 30;
-
 int idx = 0;
 
 std::vector<slika> v_slik = {
     []()
     {
-      DrawText("Zacetna tocka", tstart.x, tstart.y, tsize, BLACK);
       DrawCircleV(start, radius, BLACK);
     },
 
     []()
     {
-      DrawText("Dolzina", tstart.x, tstart.y, tsize, BLACK);
+      Vector2 end = {start.x, start.y - len};
       DrawCircleV(start, radius, BLACK);
       DrawLineEx(start, end, 10, BLACK);
     },
 
     []()
     {
-      DrawText("Kot in Koncna tocka", tstart.x, tstart.y, tsize, BLACK);
+      Vector2 end = newPoint(start, len, angleD);
       DrawCircleV(start, radius, BLACK);
-      DrawLineEx(start, end_kot, 10, BLACK);
+      DrawLineEx(start, end, 10, BLACK);
-      DrawCircleV(end_kot, radius, BLACK);
+      DrawCircleV(end, radius, BLACK);
       DrawCircleSectorLines(start, len / 3, 360 - angleD, 360, 30, BLACK);
     },
 
     []()
     {
-      DrawText("Zacetna debelina", tstart.x, tstart.y, tsize, BLACK);
+      Vector2 end = newPoint(start, len, angleD);
       DrawCircleV(start, radius, BLACK);
-      DrawLineEx(start, end_kot, 10, BLACK);
+      DrawLineEx(start, end, 10, BLACK);
-      DrawCircleV(end_kot, radius, BLACK);
+      DrawCircleV(end, radius, BLACK);
       DrawCircleLinesV(start, radiusS, BLACK);
-    },
+      DrawCircleLinesV(end, radiusE, BLACK);
-   
-    []()
-    {
-      DrawText("Koncna debelina", tstart.x, tstart.y, tsize, BLACK);
-      DrawCircleV(start, radius, BLACK);
-      DrawLineEx(start, end_kot, 10, BLACK);
-      DrawCircleV(end_kot, radius, BLACK);
-      DrawCircleLinesV(start, radiusS, BLACK);
-      DrawCircleLinesV(end_kot, radiusE, BLACK);
     },
 
     []()
     {
-      DrawText("Zacetna barva", tstart.x, tstart.y, tsize, BLACK);
+      Vector2 end = newPoint(start, len, angleD);
-      DrawLineEx(start, end_kot, 10, BLACK);
+      DrawLineEx(start, end, 10, BLACK);
-      DrawCircleV(end_kot, radius, BLACK);
       DrawCircleV(start, radiusS, colorS);
-      DrawCircleLinesV(end_kot, radiusE, BLACK);
+      DrawCircleV(end, radiusE, colorE);
     },
 
     []()
     {
-      DrawText("Koncna barva", tstart.x, tstart.y, tsize, BLACK);
+      Vector2 end = newPoint(start, len, angleD);
-      DrawLineEx(start, end_kot, 10, BLACK);
+      drawBranch(start, end, colorS, colorE, radiusS, radiusE);
-      DrawCircleV(start, radiusS, colorS);
-      DrawCircleV(end_kot, radiusE, colorE);
     },
 
     []()
     {
-      DrawText("Veja", tstart.x, tstart.y, tsize, BLACK);
+      Vector2 p = newPoint(start, len, angleD);
-      float fstep = 0.05;
+      drawBranch(start, p, colorS, colorE, radiusS, radiusE);
-      for (float i = 0; i < 1.05; i += fstep)
+      Vector2 p1 = newPoint(p, len, 135);
-      {
+      Vector2 p2 = newPoint(p, len, 90);
-        Vector2 point = Vector2Lerp(start, end_kot, i);
+      Vector2 p3 = newPoint(p, len, 45);
-        Color color = ColorLerp(colorS, colorE, i);
+      DrawLineEx(p, p1, 10, BLACK);
-        int size = Lerp(radiusS, radiusE, i);
+      DrawLineEx(p, p2, 10, BLACK);
-        DrawCircleV(point, size, color);
+      DrawLineEx(p, p3, 10, BLACK);
-      }
+      DrawCircleV(p, radius, BLACK);
-    }
+      DrawCircleV(p1, radius, BLACK);
+      DrawCircleV(p2, radius, BLACK);
+      DrawCircleV(p3, radius, BLACK);
+    },
+
+    []()
+    {
+      Vector2 p = newPoint(start, len, angleD);
+      drawBranch(start, p, colorS, colorE, radiusS, radiusE);
+      Vector2 p1 = newPoint(p, len, 135);
+      Vector2 p2 = newPoint(p, len, 90);
+      Vector2 p3 = newPoint(p, len, 45);
+      drawBranch(p, p1, colorE, BLUE, radiusE, 50);
+      drawBranch(p, p2, colorE, ORANGE, radiusE, 50);
+      drawBranch(p, p3, colorE, PURPLE, radiusE, 50);
+    },
 
   };
 
 int main(int argc, char *argv[])
 {
-  int screenWidth = 500;
-  int screenHeight = 500;
-
-  float ny = len * sin(angleR);
-  float nx = len * cos(angleR);
-  end_kot.x = start.x + nx;
-  end_kot.y = start.y - ny;
-
   InitWindow(screenWidth, screenHeight, "Slike");
   SetTargetFPS(60);