bart/Ascent-of-Man
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

paden wisselen

Browse Source
This commit is contained in:
bart
2026-11-09 22:21:41 +01:00
parent eff6598555
commit ea0eedc0fb
7 changed files with 1084 additions and 781 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AGENTS.md
+1 -3
View File
@@ -28,10 +28,8 @@ This document serves as the primary technical specification, architecture refere
> [!IMPORTANT]
> **Strict Agent Directive:** Every session must adhere to an isolated Git workflow and never build without permission.
> - **Dedicated Session Branch:** Every session MUST work on its own git branch.
> - **Automatic Branch Creation:** If a session does not have its own branch yet upon starting, the agent MUST generate an appropriate branch name (e.g. `session/<topic-or-task>`) and check it out immediately (`git checkout -b <branch-name>`).
> - **Do NOT Build Without Explicit Permission:** The agent MUST NOT compile or build the application (never run `make`, `qmake`, `cmake`, `ninja`, compiler invocations, or build scripts) unless explicit permission has been granted by the user.
> - **Immediate Commits:** After making any change/edit to the project, the agent MUST immediately commit the changes to its current session branch with a clear and concise commit message (`git add <files>` and `git commit -m "..."`).
---
Makefile
+27 -39
View File
@@ -37,7 +37,7 @@ MOVE = mv -f
TAR = tar -cf
COMPRESS = gzip -9f
DISTNAME = tiletest1.0.0
DISTDIR = /home/bart/project/tiletest/.tmp/tiletest1.0.0
DISTDIR = /home/bart/git/Ascent-of-Man/.tmp/tiletest1.0.0
LINK = g++
LFLAGS = -Wl,-O1
LIBS = $(SUBLIBS) -L/usr/lib64 -lGLEW -lX11 -lGLU /usr/lib/x86_64-linux-gnu/libQt5Widgets.so /usr/lib/x86_64-linux-gnu/libQt5Gui.so /usr/lib/x86_64-linux-gnu/libQt5Core.so -lGL -lpthread
@@ -72,7 +72,8 @@ SOURCES = main.cpp \
localization.cpp \
terrainmovementmanager.cpp \
roadconfig.cpp \
actionneededmanager.cpp qrc_shaders.cpp \
actionneededmanager.cpp \
techconfig.cpp qrc_shaders.cpp \
moc_mainwindow.cpp
OBJECTS = main.o \
mainwindow.o \
@@ -95,6 +96,7 @@ OBJECTS = main.o \
terrainmovementmanager.o \
roadconfig.o \
actionneededmanager.o \
techconfig.o \
qrc_shaders.o \
moc_mainwindow.o
DIST = shaders/simple.vert \
@@ -110,13 +112,6 @@ DIST = shaders/simple.vert \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigCore.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigGui.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCoreAddons.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KDBusAddons.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KI18n.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KService.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWindowSystem.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_accessibility_support_private.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
@@ -148,8 +143,6 @@ DIST = shaders/simple.vert \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformcompositor_support_private.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_script.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_scripttools.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_service_support_private.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
@@ -209,7 +202,8 @@ DIST = shaders/simple.vert \
localization.h \
terrainmovementmanager.h \
roadconfig.h \
actionneededmanager.h main.cpp \
actionneededmanager.h \
techconfig.h main.cpp \
mainwindow.cpp \
qscenerenderer.cpp \
vertex.cpp \
@@ -229,7 +223,8 @@ DIST = shaders/simple.vert \
localization.cpp \
terrainmovementmanager.cpp \
roadconfig.cpp \
actionneededmanager.cpp
actionneededmanager.cpp \
techconfig.cpp
QMAKE_TARGET = tiletest
DESTDIR =
TARGET = tiletest
@@ -250,13 +245,6 @@ Makefile: tiletest.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.con
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigCore.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigGui.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCoreAddons.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KDBusAddons.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KI18n.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KService.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWindowSystem.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_accessibility_support_private.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
@@ -288,8 +276,6 @@ Makefile: tiletest.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.con
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformcompositor_support_private.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_script.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_scripttools.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_service_support_private.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
@@ -340,13 +326,6 @@ Makefile: tiletest.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.con
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf:
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf:
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri:
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigCore.pri:
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigGui.pri:
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCoreAddons.pri:
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KDBusAddons.pri:
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KI18n.pri:
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KService.pri:
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWindowSystem.pri:
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_accessibility_support_private.pri:
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri:
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri:
@@ -378,8 +357,6 @@ Makefile: tiletest.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.con
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformcompositor_support_private.pri:
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri:
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri:
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_script.pri:
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_scripttools.pri:
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_service_support_private.pri:
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri:
/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri:
@@ -436,8 +413,8 @@ distdir: FORCE
$(COPY_FILE) --parents $(DIST) $(DISTDIR)/
$(COPY_FILE) --parents shaders.qrc $(DISTDIR)/
$(COPY_FILE) --parents /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/data/dummy.cpp $(DISTDIR)/
$(COPY_FILE) --parents mainwindow.h qscenerenderer.h vertex.h tile.h terrain.h tilevertexinfo.h matrix2d.h face.h player.h yamlparser.h unitconfig.h buildingconfig.h pathfinder.h unit.h city.h terrainyieldmanager.h gamemanager.h unitrenderer.h localization.h terrainmovementmanager.h roadconfig.h actionneededmanager.h $(DISTDIR)/
$(COPY_FILE) --parents main.cpp mainwindow.cpp qscenerenderer.cpp vertex.cpp tile.cpp tilevertexinfo.cpp face.cpp player.cpp yamlparser.cpp unitconfig.cpp buildingconfig.cpp pathfinder.cpp unit.cpp city.cpp terrainyieldmanager.cpp gamemanager.cpp unitrenderer.cpp localization.cpp terrainmovementmanager.cpp roadconfig.cpp actionneededmanager.cpp $(DISTDIR)/
$(COPY_FILE) --parents mainwindow.h qscenerenderer.h vertex.h tile.h terrain.h tilevertexinfo.h matrix2d.h face.h player.h yamlparser.h unitconfig.h buildingconfig.h pathfinder.h unit.h city.h terrainyieldmanager.h gamemanager.h unitrenderer.h localization.h terrainmovementmanager.h roadconfig.h actionneededmanager.h techconfig.h $(DISTDIR)/
$(COPY_FILE) --parents main.cpp mainwindow.cpp qscenerenderer.cpp vertex.cpp tile.cpp tilevertexinfo.cpp face.cpp player.cpp yamlparser.cpp unitconfig.cpp buildingconfig.cpp pathfinder.cpp unit.cpp city.cpp terrainyieldmanager.cpp gamemanager.cpp unitrenderer.cpp localization.cpp terrainmovementmanager.cpp roadconfig.cpp actionneededmanager.cpp techconfig.cpp $(DISTDIR)/
$(COPY_FILE) --parents mainwindow.ui $(DISTDIR)/
@@ -483,7 +460,7 @@ compiler_moc_header_clean:
moc_mainwindow.cpp: mainwindow.h \
moc_predefs.h \
/usr/lib/qt5/bin/moc
/usr/lib/qt5/bin/moc $(DEFINES) --include /home/bart/project/tiletest/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/bart/project/tiletest -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/c++/13 -I/usr/include/x86_64-linux-gnu/c++/13 -I/usr/include/c++/13/backward -I/usr/lib/gcc/x86_64-linux-gnu/13/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include mainwindow.h -o moc_mainwindow.cpp
/usr/lib/qt5/bin/moc $(DEFINES) --include /home/bart/git/Ascent-of-Man/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/bart/git/Ascent-of-Man -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/c++/13 -I/usr/include/x86_64-linux-gnu/c++/13 -I/usr/include/c++/13/backward -I/usr/lib/gcc/x86_64-linux-gnu/13/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include mainwindow.h -o moc_mainwindow.cpp
compiler_moc_objc_header_make_all:
compiler_moc_objc_header_clean:
@@ -511,7 +488,8 @@ ui_mainwindow.h: mainwindow.ui \
gamemanager.h \
buildingconfig.h \
terrainyieldmanager.h \
actionneededmanager.h
actionneededmanager.h \
techconfig.h
/usr/lib/qt5/bin/uic mainwindow.ui -o ui_mainwindow.h
compiler_yacc_decl_make_all:
@@ -546,7 +524,8 @@ mainwindow.o: mainwindow.cpp mainwindow.h \
gamemanager.h \
buildingconfig.h \
terrainyieldmanager.h \
actionneededmanager.h
actionneededmanager.h \
techconfig.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o mainwindow.cpp
qscenerenderer.o: qscenerenderer.cpp qscenerenderer.h \
@@ -567,6 +546,7 @@ qscenerenderer.o: qscenerenderer.cpp qscenerenderer.h \
buildingconfig.h \
terrainyieldmanager.h \
actionneededmanager.h \
techconfig.h \
pathfinder.h \
yamlparser.h \
localization.h
@@ -594,7 +574,8 @@ tile.o: tile.cpp tile.h \
gamemanager.h \
buildingconfig.h \
terrainyieldmanager.h \
actionneededmanager.h
actionneededmanager.h \
techconfig.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o tile.o tile.cpp
tilevertexinfo.o: tilevertexinfo.cpp tilevertexinfo.h \
@@ -636,7 +617,8 @@ unit.o: unit.cpp unit.h \
terrainmovementmanager.h \
terrain.h \
matrix2d.h \
pathfinder.h
pathfinder.h \
localization.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o unit.o unit.cpp
city.o: city.cpp city.h \
@@ -663,6 +645,7 @@ gamemanager.o: gamemanager.cpp gamemanager.h \
city.h \
terrainyieldmanager.h \
actionneededmanager.h \
techconfig.h \
pathfinder.h \
yamlparser.h \
localization.h
@@ -697,7 +680,8 @@ terrainmovementmanager.o: terrainmovementmanager.cpp terrainmovementmanager.h \
unit.h \
city.h \
terrainyieldmanager.h \
actionneededmanager.h
actionneededmanager.h \
techconfig.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o terrainmovementmanager.o terrainmovementmanager.cpp
roadconfig.o: roadconfig.cpp roadconfig.h \
@@ -714,6 +698,10 @@ actionneededmanager.o: actionneededmanager.cpp actionneededmanager.h \
city.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o actionneededmanager.o actionneededmanager.cpp
techconfig.o: techconfig.cpp techconfig.h \
yamlparser.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o techconfig.o techconfig.cpp
qrc_shaders.o: qrc_shaders.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o qrc_shaders.o qrc_shaders.cpp
agents.md
-1
View File
@@ -1 +0,0 @@
/home/bart/project/tiletest/AGENTS.md
generate_rivers.py
+5 -5
View File
@@ -56,7 +56,7 @@ def trace_river(start_tile, edge_steps):
path.append((curr, in_edge, None))
return path
def build_rivermap(output_path="/home/bart/project/tiletest/images/rivermap.png", preview_path="/home/bart/project/tiletest/images/rivermap_preview.png"):
def build_rivermap(output_path="/home/bart/git/Ascent-of-Man/images/rivermap.png", preview_path="/home/bart/git/Ascent-of-Man/images/rivermap_preview.png"):
river_img = Image.new('RGB', (WIDTH, HEIGHT), (0, 0, 0))
draw = ImageDraw.Draw(river_img)
@@ -93,7 +93,7 @@ def build_rivermap(output_path="/home/bart/project/tiletest/images/rivermap.png"
# Build an overlay preview on top of typemap.png
try:
type_img = Image.open("/home/bart/project/tiletest/images/typemap.png").convert("RGBA")
type_img = Image.open("/home/bart/git/Ascent-of-Man/images/typemap.png").convert("RGBA")
r_arr = np.array(river_img)
t_arr = np.array(type_img)
mask = (r_arr[:, :, 2] > 120) & (r_arr[:, :, 0] < 100)
@@ -103,7 +103,7 @@ def build_rivermap(output_path="/home/bart/project/tiletest/images/rivermap.png"
print(f"Saved preview to {preview_path}")
# Build orthographic hex-tile minimap.png
h_arr = np.array(Image.open("/home/bart/project/tiletest/images/heightmap.jpg"))
h_arr = np.array(Image.open("/home/bart/git/Ascent-of-Man/images/heightmap.jpg"))
R = 8.0
W = 3608
H = 1740
@@ -169,8 +169,8 @@ def build_rivermap(output_path="/home/bart/project/tiletest/images/rivermap.png"
hdraw.line([(mpx, mpy), (cx, cy)], fill=(0, 220, 255), width=3)
hdraw.ellipse([mpx - 2, mpy - 2, mpx + 2, mpy + 2], fill=(0, 240, 255))
hex_img.save("/home/bart/project/tiletest/images/minimap.png")
print("Saved orthographic hex minimap to /home/bart/project/tiletest/images/minimap.png")
hex_img.save("/home/bart/git/Ascent-of-Man/images/minimap.png")
print("Saved orthographic hex minimap to /home/bart/git/Ascent-of-Man/images/minimap.png")
except Exception as ex:
print(f"Minimap/preview generation skipped: {ex}")
qrc_shaders.cpp
+1049 -731
View File
File diff suppressed because it is too large Load Diff
tiletest
BIN
View File
Binary file not shown.
unitrenderer.cpp
+2 -2
View File
@@ -28,8 +28,8 @@ void UnitRenderer::initialize()
initializeOpenGLFunctions();
m_program = new QOpenGLShaderProgram();
m_program->addShaderFromSourceFile(QOpenGLShader::Vertex, "/home/bart/project/tiletest/shaders/unit.vert");
m_program->addShaderFromSourceFile(QOpenGLShader::Fragment, "/home/bart/project/tiletest/shaders/unit.frag");
m_program->addShaderFromSourceFile(QOpenGLShader::Vertex, "/home/bart/git/Ascent-of-Man/shaders/unit.vert");
m_program->addShaderFromSourceFile(QOpenGLShader::Fragment, "/home/bart/git/Ascent-of-Man/shaders/unit.frag");
m_program->link();
buildCylinderMesh();