Skip to content

Commit

Permalink
One less TODO file
Browse files Browse the repository at this point in the history
  • Loading branch information
daid committed Nov 1, 2024
1 parent 6e3cdb0 commit 787db69
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 158 deletions.
157 changes: 0 additions & 157 deletions src/spaceObjects/planet.cpp

This file was deleted.

9 changes: 9 additions & 0 deletions src/systems/planet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,15 @@ void PlanetRenderSystem::render3D(sp::ecs::Entity e, sp::Transform& transform, P
}
}

void PlanetRenderSystem::renderOnRadar(sp::RenderTarget& renderer, sp::ecs::Entity e, glm::vec2 screen_position, float scale, float rotation, PlanetRender& component)
{
auto physics = e.getComponent<sp::Physics>();
if (physics)
{
renderer.fillCircle(screen_position, physics->getSize().x * scale, glm::u8vec4(component.atmosphere_color * 255.f, 128));
}
}

void PlanetTransparentRenderSystem::update(float delta)
{
}
Expand Down
4 changes: 3 additions & 1 deletion src/systems/planet.h
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
#pragma once

#include "systems/rendering.h"
#include "systems/radar.h"


class PlanetRenderSystem : public sp::ecs::System, public Render3DInterface<PlanetRender, false>
class PlanetRenderSystem : public sp::ecs::System, public Render3DInterface<PlanetRender, false>, public RenderRadarInterface<PlanetRender, 11, RadarRenderSystem::FlagNone>
{
public:
void update(float delta) override;
void render3D(sp::ecs::Entity e, sp::Transform& transform, PlanetRender& pr) override;
void renderOnRadar(sp::RenderTarget& renderer, sp::ecs::Entity e, glm::vec2 screen_position, float scale, float rotation, PlanetRender& component) override;
};
class PlanetTransparentRenderSystem : public sp::ecs::System, public Render3DInterface<PlanetRender, true>
{
Expand Down

1 comment on commit 787db69

@daid-tinyci
Copy link

@daid-tinyci daid-tinyci bot commented on 787db69 Nov 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TinyCI build failure:

[/home/tinyci/builds/daid/EmptyEpsilon/_build_native:ninja -j 10 package] returned [1]:


Reading api/all.lua

Reading api/modelData.lua

Reading api/shipTemplate.lua

Reading api/entity/spaceobject.lua

Reading api/entity/factioninfo.lua

Reading api/entity/shiptemplatebasedobject.lua

Reading api/entity/spaceship.lua

Reading api/entity/playerspaceship.lua

Reading api/entity/cpuship.lua

Reading api/entity/spacestation.lua

Reading api/entity/warpjammer.lua

Reading api/entity/artifact.lua

Reading api/entity/asteroid.lua

Reading api/entity/mine.lua

Reading api/entity/nebula.lua

Reading api/entity/blackhole.lua

Reading api/entity/planet.lua

Reading api/entity/sciencedatabase.lua

Reading api/entity/multiuse.lua

Reading api/entity/scanprobe.lua

Reading api/entity/supplydrop.lua

Reading api/entity/zone.lua

Reading api/gm.lua

Reading api/callsign.lua

[2/5] Building CXX object CMakeFiles/EmptyEpsilon.dir/src/systems/planet.cpp.o

[3/5] Building CXX object CMakeFiles/EmptyEpsilon.dir/src/init/ecs.cpp.o

[4/5] Linking CXX executable EmptyEpsilon

lto-wrapper: warning: using serial compilation of 93 LTRANS jobs

lto-wrapper: note: see the ‘-flto’ option documentation for more information

[4/5] Run CPack packaging tool...

CPack: Create package using DEB

CPack: Install projects

CPack: - Install project: EmptyEpsilon []

CMake Error at /data/tinyci_builds/daid/EmptyEpsilon/_build_native/cmake_install.cmake:82 (file):

  file INSTALL cannot find

  "/data/tinyci_builds/daid/EmptyEpsilon/io.github.daid.EmptyEpsilon.metainfo.xml":

  No such file or directory.





CPack Error: Error when generating package: EmptyEpsilon

FAILED: CMakeFiles/package.util 

cd /data/tinyci_builds/daid/EmptyEpsilon/_build_native && /usr/bin/cpack --config ./CPackConfig.cmake

ninja: build stopped: subcommand failed.

Please sign in to comment.