search

Mindwerks / worldengine

World generator using simulation of plates, rain shadow, erosion, etc.
MIT License
981 stars 127 forks source link

Satellite map #176

Closed j-coppola closed 8 years ago

j-coppola commented 8 years ago

This branch adds functionality for creating a "Satellite map" of the generated world. This is currently an option, default false, toggled on with the --sat command when running.

Additional work may need to be done in selecting more appropriate biome colors and tuning the algorithm to display elevation / shading, to get a more realistic result.

Some sample outputs are attached here:

seed_35066_satellite seed_53057_satellite

esampson commented 8 years ago

Looks pretty nice. It probably needs to be able to identify ocean that is cold enough to freeze and color that as well but beyond that it is probably just a matter of tweaking values.

ftomassetti commented 8 years ago

Thank you so much for sending this patch: it looks great! Now shadows are very beatiful and contribute a lot to make the map look real.

I just think there were a few changes in the master branch since you created yours so now I see some changes which I think are unrelated to you patch. Probably you need to rebase your branch on master. If you are not very familiar with git I would glad to do that for you.

Thanks a lot!

j-coppola commented 8 years ago

This is my first pull request. I'd be delighted to have you rebase with master; I'd also love it if you can point me to how I should be doing this! I tried rebasing it myself but it still says I'm up to date.

ftomassetti commented 8 years ago

Yeah, I tried to rebase it but it seems to be already up to date. Looking at the commits is like the first one ("Add 'satellite map' - a way to visualize the world as it may...") is the one containing all these differences. Git is very mysterious from time to time...

Normally I would expect a rebase to fix this, but in this case I would fix it manually. Let me see what I can do.

j-coppola commented 8 years ago

I think I know the issue then. I was originally working on a cloned branch direct from your repo, but I had to manually copy my changed files after I officially forked this repo -- those changes from master must have happened then since I didn't try to pull from master before I copied.

I can probably sort it out myself and make another pull request if you can't manually fix it easily.

ftomassetti commented 8 years ago

Ok, I updated the first commit and it is now in the branch pangal-satellite_map on this repository. If you want you can take it in your branch and push it on your fork. This would automatically update the pull-request. If you need help with that let me know.

My role as one of the maintainer is helping taking the more bits out of the way so that contributors like you can focus on providing great features like this one :)

j-coppola commented 8 years ago

Just tried to do this - it's still showing some things I didn't change in the diff.

ftomassetti commented 8 years ago

perhaps you have merged my branch while you should reset your branch to mine. This is because I "rewrote the history", so I changed the commits that were already part of your branch.

To do so you could for example to this:

# now the name "upstream" refer to this repository
git remote add upstream https://github.com/Mindwerks/worldengine.git
# copy the data from this repository on your computer
git fetch upstream
# move to the branch
git checkout satellite_map
# throw away all your stuff in the branch and make it exactly the same as the branch with 
# the same name on this repository. Note that this change only data on your computer not on your
# forked repository
git reset --hard upstream/satellite_map
# now sends the data to your forked repository: the pull request is updated automatically
git push origin satellite_map -f
tcld commented 8 years ago

My first contribution was only a couple of weeks ago. I followed the guides on git to get started: https://help.github.com/articles/fork-a-repo/ And it seems that worked out ok.

I guess I am still going to look over your code, even though things might be a bit messy right now?

tcld commented 8 years ago

I only breezed through the code, I don't have the time for a full check right now. And the regressions make it a bit hard to read anyway.

But: I love your results and your code.^^ Lots of comments, the code just looks tidy - this is a great point to start work for whoever might decide to do so (in case you were abducted by aliens). (Of course that doesn't mean that I wouldn't want to see a couple small changes. Some I already mentioned. ;) )

j-coppola commented 8 years ago

Thanks for the feedback all!

I started from scratch and created an entirely new pull request - https://github.com/Mindwerks/worldengine/pull/181

I think it would be easier if we forget this one ever existed :)