Skip to content
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.

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

3D mapgen #74169

Merged
merged 19 commits into from
Jun 19, 2024
Merged
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
6efe406
Barely enough to get it to work
PatrikLundell May 28, 2024
94c17b0
Campus used as test subject. To be reverted.
PatrikLundell May 28, 2024
70ed363
Update data/json/mapgen/campus/buildings/admin_f0.json
PatrikLundell May 28, 2024
d47608e
Update data/json/mapgen/campus/open_areas/pedestrian_westside.json
PatrikLundell May 28, 2024
99ce761
Update data/json/mapgen/campus/open_areas/pedestrian_westside.json
PatrikLundell May 28, 2024
c3cb33f
demanded changes
PatrikLundell May 28, 2024
7e95cb3
improved merging and removed failures to save submaps
PatrikLundell May 29, 2024
acc2445
test data: place terrain &furniture at level below
PatrikLundell May 29, 2024
b469783
Improved generate + supported editmap usage
PatrikLundell May 30, 2024
fd8941a
missed the changed test file
PatrikLundell May 30, 2024
fa3812d
Moved uniform mapgen into generate & merged the loadn operations
PatrikLundell May 31, 2024
89d6de1
Documentation updated to reflect 3D mapgen functionality
PatrikLundell Jun 1, 2024
28273fa
Restored hacked mapgen maps
PatrikLundell Jun 1, 2024
f3aa1e8
Changed dermatik nest roof to match ground level
PatrikLundell Jun 1, 2024
4baf00c
3D relative apply corrections, fixes to 3D worldgen mapgen
PatrikLundell Jun 2, 2024
6ae834d
Merge branch 'master' into 3D_mapgen
PatrikLundell Jun 2, 2024
9f7e619
demanded changes + correction
PatrikLundell Jun 4, 2024
e6c5d77
Added cleanup for unsaved submaps
PatrikLundell Jun 6, 2024
86a14f6
Remove test commenting out of code
PatrikLundell Jun 15, 2024
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
Prev Previous commit
Next Next commit
Merge branch 'master' into 3D_mapgen
  • Loading branch information
PatrikLundell authored Jun 2, 2024
commit 6ae834de9a83d6348665dee3b1ad707a7f969776
2 changes: 2 additions & 0 deletions src/submap.cpp
Original file line number Diff line number Diff line change
@@ -17,6 +17,8 @@

static const furn_str_id furn_f_console( "f_console" );

static const trap_str_id tr_ledge( "tr_ledge" );

void maptile_soa::swap_soa_tile( const point &p1, const point &p2 )
{
std::swap( ter[p1.x][p1.y], ter[p2.x][p2.y] );
@@ -435,7 +437,7 @@
for( const submap::cosmetic_t &cos : copy_from->cosmetics ) {
bool found = false;

for( size_t i = 0; i < this->cosmetics.size(); ++i ) {

Check failure on line 440 in src/submap.cpp

GitHub Actions / build (src)

use range-based for loop instead [modernize-loop-convert,-warnings-as-errors]
if( this->cosmetics[i].pos == cos.pos &&
this->cosmetics[i].type == cos.type ) {
if( this->cosmetics[i].str == cos.str || !copy_from_is_overlay ) {
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.