Skip to content

Update to latest Godex and fix related compile errors #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cooperra wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update to latest Godex and fix related compile errors #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/godot
Open in desktop
Submodule godot updated 2688 files
2 changes: 1 addition & 1 deletion source/modules/godex
Open in desktop
Submodule godex updated 225 files
18 changes: 5 additions & 13 deletions source/modules/test_nodes_and_systems/ecs_stuff.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,18 @@
#include "ecs_stuff.h"

void random_teleport_system(Query<const RandomTeleport, TransformComponent> &p_query) {
while (p_query.is_done() == false) {
auto [tag, transf] = p_query.get();

transf->get_transform_mut().origin = Vector3(
for (auto [tag, transf] : p_query) {
transf->transform.origin = Vector3(
Math::random(-10.0, 10.0),
Math::random(-10.0, 10.0),
Math::random(-10.0, 10.0));

p_query.next();
}
}

void debris_system(const FrameTime *p_frame_time, Query<Debris, TransformComponent> &p_query) {
while (p_query.is_done() == false) {
auto [debris, transf] = p_query.get();

const Vector3 distance_to_center = transf->get_transform().origin * -1.0;
for (auto [debris, transf] : p_query) {
const Vector3 distance_to_center = transf->transform.origin * -1.0;
debris->velocity += distance_to_center * p_frame_time->get_delta();
transf->get_transform_mut().origin += debris->velocity * p_frame_time->get_delta();

p_query.next();
transf->transform.origin += debris->velocity * p_frame_time->get_delta();
}
}
11 changes: 5 additions & 6 deletions source/modules/test_nodes_and_systems/ecs_stuff.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,15 @@
#pragma once

#include "../godex/components/component.h"
#include "../godex/godot/components/transform_component.h"
#include "../godex/godot/databags/godot_engine_databags.h"
#include "../godex/systems/system.h"
#include "core/config/engine.h"
#include "../godex/storage/dense_vector_storage.h"
#include "../godex/modules/godot/components/transform_component.h"
#include "../godex/modules/godot/databags/godot_engine_databags.h"

class RandomTeleport : public godex::Component {
struct RandomTeleport {
COMPONENT(RandomTeleport, DenseVectorStorage)
};

class Debris : public godex::Component {
struct Debris {
COMPONENT(Debris, DenseVectorStorage)

static void _bind_methods() {
Expand Down