Merge branch 'editor_v05' into dev

Author: Gallasko

.gitignore

@@ -24,4 +24,5 @@ global.sz
 *.serialization.cpp
 src/**/temp.pgc
 test/pgcompiler/scripts/*compiled.pgc
-.vscode/.intellisense-cache
+.vscode/.intellisense-cache
+graph.dot

.vscode/tasks.json

@@ -134,7 +134,7 @@
                 "showOutput": "always",
                 "args": [
                     "-c",
-                    "cd ${workspaceFolder}/em; emcmake cmake .; cmake --build . --config Release --target InvadersBreaker -j 10 --"
+                    "cd ${workspaceFolder}/em; emcmake cmake .; cmake --build . --config Release --target BoxBouncer -j 10 --"
                 ]
             },
             "linux": {

CMakeLists.txt

@@ -1,6 +1,7 @@
 #include "application.h"
 
 #include "ECS/entitysystem.h"
+#include "ECS/entitysystem_vm_modules.h"
 
 #include "ECS/standardsystem.h"
 
@@ -14,6 +15,9 @@
 
 #include "window.h"
 
+#include "particle_system.h"
+#include "particlemodule.h"
+
 using namespace pg;
 
 namespace
@@ -190,6 +194,11 @@ GameApp::GameApp(const std::string &appName) : engine(appName)
         ttfSys->registerFont("res/font/Inter/static/Inter_28pt-Bold.ttf", "bold");
         ttfSys->registerFont("res/font/Inter/static/Inter_28pt-Italic.ttf", "italic");
 
+        ecs.succeed<MasterRenderer, TTFTextSystem>();
+
+        // Register custom VM modules for scripts
+        ecs.registerCustomVmModule("particle", ParticleModule{&ecs});
+
         VM vm;
         ecs.setupVm(vm);
 
@@ -208,6 +217,9 @@ GameApp::GameApp(const std::string &appName) : engine(appName)
 
         ecs.registerSystem(createFPSSystem());
 
+        // Create particle system
+        ecs.createSystem<ParticleSystem>();
+
         // Register collision handler for Bullet-Asteroid collisions
         makeCollisionHandleScript(&ecs, "res/asteroid/bullet_asteroid_collision.pg",
             [](Entity* ent) { return ent->has("Bullet"); },

exemples/Asteroid/application.cpp examples/Asteroid/application.cppexemples/Asteroid/application.cpp renamed to examples/Asteroid/application.cpp

@@ -0,0 +1,77 @@
+#pragma once
+
+#include "ECS/entitysystem.h"
+#include "ECS/standardsystem.h"
+#include "Systems/coresystems.h"
+#include "2D/simple2dobject.h"
+
+using namespace pg;
+
+// Particle component to track lifetime
+struct Particle : public Component
+{
+    DEFAULT_COMPONENT_MEMBERS(Particle)
+
+    float lifetime = 500.0f;  // milliseconds
+    float elapsed = 0.0f;
+};
+
+// Velocity component for particle movement
+struct ParticleVelocity : public Component
+{
+    DEFAULT_COMPONENT_MEMBERS(ParticleVelocity)
+
+    float dx = 0.0f;
+    float dy = 0.0f;
+};
+
+// Particle system that updates and manages particles
+class ParticleSystem : public System<InitSys, DeltaTime>
+{
+public:
+    void init() override
+    {
+        registerGroup<Particle, PositionComponent, ParticleVelocity>();
+    }
+
+    void onExecute(float deltaTime) override
+    {
+        std::vector<EntityRef> toDestroy;
+
+        for (auto entity : viewGroup<Particle, PositionComponent, ParticleVelocity>())
+        {
+            auto particle = entity->get<Particle>();
+            auto pos = entity->get<PositionComponent>();
+            auto vel = entity->get<ParticleVelocity>();
+
+            particle->elapsed += deltaTime * 1000.0f;  // deltaTime is in seconds
+
+            // Update position
+            pos->setX(pos->x + vel->dx * deltaTime);
+            pos->setY(pos->y + vel->dy * deltaTime);
+
+            // Fade out over lifetime
+            if (auto shape = entity->get<Simple2DObject>())
+            {
+                float alpha = 1.0f - (particle->elapsed / particle->lifetime);
+                alpha = std::max(0.0f, std::min(1.0f, alpha));  // Clamp to [0, 1]
+
+                auto colors = shape->colors;
+                colors.w = (uint8_t)(255 * alpha);
+                shape->setColors(colors);
+            }
+
+            // Mark for destruction when lifetime expires
+            if (particle->elapsed >= particle->lifetime)
+            {
+                toDestroy.push_back(entity->entity);
+            }
+        }
+
+        // Clean up dead particles
+        for (auto& entity : toDestroy)
+        {
+            ecsRef->removeEntity(entity);
+        }
+    }
+};

exemples/Asteroid/application.h examples/Asteroid/application.hexemples/Asteroid/application.h renamed to examples/Asteroid/application.h

@@ -0,0 +1,78 @@
+#pragma once
+
+#include "Compiler/native_module.h"
+#include "ECS/entitysystem.h"
+#include "2D/simple2dobject.h"
+#include "particle_system.h"
+#include <cmath>
+#include <cstdlib>
+
+namespace pg
+{
+    /**
+     * Particle Module for Asteroid game
+     * Provides function to spawn particle effects
+     */
+    class ParticleModule : public NativeModule
+    {
+    public:
+        ParticleModule(EntitySystem* ecsRef)
+        {
+            // Capture ecsRef for use in native functions
+            auto ecsRefCopy = ecsRef;
+
+            // Add spawnParticles function
+            // Usage: spawnParticles(x, y, count, colorHex, size)
+            // Example: spawnParticles(100, 200, 8, 0x333333, 3)
+            addNativeFunction("spawnParticles", [ecsRefCopy](VM* vm, int argCount, Value* args) -> Value {
+                if (argCount != 5)
+                {
+                    throw std::runtime_error("spawnParticles expects 5 arguments (x, y, count, colorHex, size)");
+                }
+
+                // Validate all arguments are numbers
+                if (!IS_DOUBLE(args[0]) || !IS_DOUBLE(args[1]) || !IS_INT(args[2]) || !IS_INT(args[3]) || !IS_DOUBLE(args[4]))
+                {
+                    throw std::runtime_error("spawnParticles expects (float x, float y, int count, int colorHex, float size)");
+                }
+
+                float posX = AS_DOUBLE(args[0]);
+                float posY = AS_DOUBLE(args[1]);
+                int particleCount = static_cast<int>(AS_INT(args[2]));
+                int64_t color = AS_INT(args[3]);
+                float particleSize = AS_DOUBLE(args[4]);
+
+                // Extract RGB from packed integer (0xRRGGBB format)
+                uint8_t r = (color >> 16) & 0xFF;
+                uint8_t g = (color >> 8) & 0xFF;
+                uint8_t b = color & 0xFF;
+
+                // Spawn particles in random directions
+                for (int i = 0; i < particleCount; i++)
+                {
+                    auto particle = makeSimple2DShape(ecsRefCopy, Shape2D::Square, particleSize, particleSize, {r, g, b, 255});
+
+                    auto pos = particle.get<PositionComponent>();
+                    pos->setX(posX);
+                    pos->setY(posY);
+
+                    auto vel = particle.attach<ParticleVelocity>();
+
+                    // Random angle (0 to 2π)
+                    float angle = ((float)rand() / RAND_MAX) * 6.28318f;
+                    // Random speed between 50 and 150 pixels/second
+                    float speed = 50.0f + ((float)rand() / RAND_MAX) * 100.0f;
+
+                    vel->dx = cos(angle) * speed;
+                    vel->dy = sin(angle) * speed;
+
+                    auto particleComp = particle.attach<Particle>();
+                    // Random lifetime between 300ms and 700ms
+                    particleComp->lifetime = 300.0f + ((float)rand() / RAND_MAX) * 400.0f;
+                }
+
+                return makeIntValue(particleCount);
+            });
+        }
+    };
+}

exemples/Asteroid/main.cpp examples/Asteroid/main.cppexemples/Asteroid/main.cpp renamed to examples/Asteroid/main.cpp

@@ -537,7 +537,7 @@ void initGame() {
 
     printf("Engine initialized ...\n");
 
-    auto ttfSys = mainWindow->ecs.createSystem<TTFTextSystem>(mainWindow->masterRenderer);
+    auto ttfSys = mainWindow->ecs->createSystem<TTFTextSystem>(mainWindow->masterRenderer);
 
     // Need to fix this
     ttfSys->registerFont("res/font/Inter/static/Inter_28pt-Light.ttf", "light");
@@ -546,19 +546,17 @@ void initGame() {
 
     // mainWindow->masterRenderer->processTextureRegister();
 
-    mainWindow->ecs.createSystem<FpsSystem>();
+    mainWindow->ecs->succeed<MasterRenderer, TTFTextSystem>();
 
-    mainWindow->ecs.succeed<MasterRenderer, TTFTextSystem>();
+    mainWindow->ecs->createSystem<TextHandlingSys>();
 
-    mainWindow->ecs.createSystem<TextHandlingSys>();
-
-    mainWindow->ecs.dumbTaskflow();
+    mainWindow->ecs->dumbTaskflow();
 
     mainWindow->render();
 
     mainWindow->resize(820, 640);
 
-    mainWindow->ecs.start();
+    mainWindow->ecs->start();
 
     printf("Engine initialized\n");
 }