Skip to content

Commit

Permalink
Updating authorship
Browse files Browse the repository at this point in the history
Former-commit-id: 3d6cfb7
  • Loading branch information
ftomassetti committed Feb 13, 2015
1 parent 12fe17a commit 43c2f8f
Show file tree
Hide file tree
Showing 34 changed files with 17 additions and 81 deletions.
2 changes: 1 addition & 1 deletion LICENSE.txt
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2013-2014 Federico Tomassetti
Copyright (c) 2013-2014 Federico Tomassetti and Bret Curtis

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
22 changes: 11 additions & 11 deletions README.md
Expand Up @@ -10,7 +10,7 @@ We started a [google group](https://groups.google.com/forum/?hl=en#!forum/lands_
Lands - a world generator
=========================

[![Build Status](https://travis-ci.org/ftomassetti/lands.svg?branch=master)](https://travis-ci.org/ftomassetti/lands)
[![Build Status](https://travis-ci.org/Mindwerks/lands.svg?branch=master)](https://travis-ci.org/Mindwerks/lands)

_Last Lands version: 0.5.3, Last WorldSynth version: 0.11_

Expand Down Expand Up @@ -40,7 +40,7 @@ lands ancient_map -w seed1.world
python lands/generator.py ancient_map -w seed1.world
```

![](https://raw.githubusercontent.com/ftomassetti/lands/master/examples/ancient_map_seed1.png)
![](https://raw.githubusercontent.com/Mindwerks/lands/master/examples/ancient_map_seed1.png)

Gui
===
Expand Down Expand Up @@ -77,11 +77,11 @@ python setup.py install

### _On Windows_

Executable file is available under [releases](https://github.com/ftomassetti/lands/releases)
Executable file is available under [releases](https://github.com/Mindwerks/lands/releases)

Note: you need also a copy of the lands src directory in the same folder as the exe.

If you want to build Lands on Windows you can read these [instructions](https://github.com/ftomassetti/lands/wiki/Lands-on-Windows).
If you want to build Lands on Windows you can read these [instructions](https://github.com/Mindwerks/lands/wiki/Lands-on-Windows).

Note: the problem could crash after generating the files, it is a known problem but you should have anyway your nice maps generated! We are working on a fix for that

Expand All @@ -97,23 +97,23 @@ The program produces a binary format with all the data of the generated world an

## Elevation Map

![](https://raw.githubusercontent.com/ftomassetti/lands/master/examples/world_seed_1_elevation.png)
![](https://raw.githubusercontent.com/Mindwerks/lands/master/examples/world_seed_1_elevation.png)

## Precipitation Map

![](https://raw.githubusercontent.com/ftomassetti/lands/master/examples/world_seed_1_precipitation.png)
![](https://raw.githubusercontent.com/Mindwerks/lands/master/examples/world_seed_1_precipitation.png)

## Temperature Map

![](https://raw.githubusercontent.com/ftomassetti/lands/master/examples/world_seed_1_temperature.png)
![](https://raw.githubusercontent.com/Mindwerks/lands/master/examples/world_seed_1_temperature.png)

## Biome Map

![](https://raw.githubusercontent.com/ftomassetti/lands/master/examples/world_seed_1_biome.png)
![](https://raw.githubusercontent.com/Mindwerks/lands/master/examples/world_seed_1_biome.png)

## Ocean Map

![](https://raw.githubusercontent.com/ftomassetti/lands/master/examples/world_seed_1_ocean.png)
![](https://raw.githubusercontent.com/Mindwerks/lands/master/examples/world_seed_1_ocean.png)

Usage
=====
Expand Down Expand Up @@ -242,13 +242,13 @@ This is the corresponding ancient map
python lands/generator.py ancient_map -w an_example.world
```

![](https://raw.githubusercontent.com/ftomassetti/lands/master/examples/ancient_map_large.png)
![](https://raw.githubusercontent.com/Mindwerks/lands/master/examples/ancient_map_large.png)

Algorithm
=========

The world generation algorithm goes through different phases:
* plates simulation: it is the best way to get proper mountain chains. For this [pyplatec](https://github.com/ftomassetti/pyplatec) is used
* plates simulation: it is the best way to get proper mountain chains. For this [pyplatec](https://github.com/Mindwerks/pyplatec) is used
* noise techniques are used at different steps
* precipitations are calculated considering latitude and rain shadow effects
* erosion is calculated
Expand Down
3 changes: 0 additions & 3 deletions lands/__init__.py
@@ -1,3 +0,0 @@
__author__ = 'Federico Tomassetti'

# Removing references to modules including C extensions
2 changes: 0 additions & 2 deletions lands/basic_map_operations.py
@@ -1,5 +1,3 @@
__author__ = 'Federico Tomassetti'

import math
import random

Expand Down
1 change: 0 additions & 1 deletion lands/biome.py
@@ -1,7 +1,6 @@
"""
This file contains all possible Biome as separate classes.
"""
__author__ = 'Federico Tomassetti'

import re

Expand Down
2 changes: 1 addition & 1 deletion lands/cli/__init__.py
@@ -1 +1 @@
__author__ = 'ftomassetti'

4 changes: 1 addition & 3 deletions lands/cli/main.py
@@ -1,5 +1,3 @@
__author__ = 'Federico Tomassetti'

import sys
from PIL import Image
from optparse import OptionParser, OptionGroup
Expand Down Expand Up @@ -293,7 +291,7 @@ def main():

def usage(error=None):
print(' -------------------------------------------------------------------------')
print(' Federico Tomassetti, 2013-2015')
print(' Federico Tomassetti and Bret Curtis, 2011-2015')
print(' Lands - a world generator (v. %s)' % VERSION)
print(' ')
print(' generator <world_name> [operation] [options]')
Expand Down
2 changes: 0 additions & 2 deletions lands/common.py
@@ -1,5 +1,3 @@
__author__ = 'Federico Tomassetti'

import math
import sys
import copy
Expand Down
2 changes: 0 additions & 2 deletions lands/draw.py
@@ -1,5 +1,3 @@
__author__ = 'Federico Tomassetti'

from PIL import Image

from lands.drawing_functions import *
Expand Down
2 changes: 0 additions & 2 deletions lands/drawing_functions.py
Expand Up @@ -4,8 +4,6 @@
Jython
"""

__author__ = 'Federico Tomassetti'

import random
import math
import sys
Expand Down
2 changes: 0 additions & 2 deletions lands/generation.py
@@ -1,5 +1,3 @@
__author__ = 'Federico Tomassetti'

from lands.world import *
from lands.simulations.WatermapSimulation import *
from lands.simulations.IrrigationSimulation import *
Expand Down
2 changes: 0 additions & 2 deletions lands/gui/view.py
@@ -1,5 +1,3 @@
__author__ = 'Federico Tomassetti'

from PyQt4 import QtGui
from lands.draw import elevation_color
import lands.drawing_functions
Expand Down
2 changes: 0 additions & 2 deletions lands/plates.py
@@ -1,5 +1,3 @@
__author__ = 'Federico Tomassetti'

# Every reference to platec has to be kept separated because it is a C extension
# which is not available when using this project from jython

Expand Down
3 changes: 0 additions & 3 deletions lands/simulations/BiomeSimulation.py
@@ -1,6 +1,3 @@
__author__ = 'Federico Tomassetti'


class BiomeSimulation(object):

def is_applicable(self, world):
Expand Down
2 changes: 0 additions & 2 deletions lands/simulations/ErosionSimulation.py
@@ -1,5 +1,3 @@
__author__ = 'Federico Tomassetti'

from lands.simulations.basic import *
import math

Expand Down
2 changes: 0 additions & 2 deletions lands/simulations/HumiditySimulation.py
@@ -1,5 +1,3 @@
__author__ = 'Federico Tomassetti'

from lands.simulations.basic import *

class HumiditySimulation(object):
Expand Down
2 changes: 0 additions & 2 deletions lands/simulations/IrrigationSimulation.py
@@ -1,5 +1,3 @@
__author__ = 'Federico Tomassetti'

from lands.simulations.basic import *
import math

Expand Down
2 changes: 0 additions & 2 deletions lands/simulations/PermeabilitySimulation.py
@@ -1,5 +1,3 @@
__author__ = 'Federico Tomassetti'

from lands.simulations.basic import *
import random

Expand Down
2 changes: 0 additions & 2 deletions lands/simulations/PrecipitationSimulation.py
@@ -1,5 +1,3 @@
__author__ = 'Federico Tomassetti'

import random
import time
from noise import snoise2
Expand Down
2 changes: 0 additions & 2 deletions lands/simulations/TemperatureSimulation.py
@@ -1,5 +1,3 @@
__author__ = 'Federico Tomassetti'

from lands.simulations.basic import *
import random

Expand Down
2 changes: 0 additions & 2 deletions lands/simulations/WatermapSimulation.py
@@ -1,5 +1,3 @@
__author__ = 'Federico Tomassetti'

from lands.simulations.basic import *

class WatermapSimulation(object):
Expand Down
3 changes: 0 additions & 3 deletions lands/simulations/basic.py
@@ -1,6 +1,3 @@
__author__ = 'Federico Tomassetti'


def find_threshold(elevation, land_perc, ocean=None):
width = len(elevation[0])
height = len(elevation)
Expand Down
3 changes: 0 additions & 3 deletions lands/step.py
@@ -1,6 +1,3 @@
__author__ = 'Federico Tomassetti'


class Step(object):
""" A Step in the world generation process.
The process starts with plates simulation and go on through different intermediate
Expand Down
2 changes: 0 additions & 2 deletions lands/views/PrecipitationsView.py
@@ -1,5 +1,3 @@
__author__ = 'Federico Tomassetti'

from lands.simulations.basic import *
import random
from lands.views.basic import color_prop
Expand Down
2 changes: 0 additions & 2 deletions lands/views/WatermapView.py
@@ -1,5 +1,3 @@
__author__ = 'Federico Tomassetti'

from lands.simulations.basic import *
import random
from lands.views.basic import color_prop
Expand Down
3 changes: 0 additions & 3 deletions lands/views/basic.py
@@ -1,6 +1,3 @@
__author__ = 'ftomassetti'


def color_prop(color_a, color_b, value_a, value_b, v):
ip = (v - value_a)/(value_b - value_a)
p = 1.0 - ip
Expand Down
2 changes: 0 additions & 2 deletions lands/world.py
@@ -1,5 +1,3 @@
__author__ = 'Federico Tomassetti'

import pickle

from lands.biome import *
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Expand Up @@ -13,9 +13,9 @@

config = {
'description' : 'World generator simulating plate tectonics, erosion, etc.',
'author' : 'Federico Tomassetti',
'url' : 'http://github.com/ftomassetti/lands',
'download_url' : 'http://github.com/ftomassetti/lands',
'author' : 'Federico Tomassetti, Bret Curtis',
'url' : 'http://github.com/Mindwerks/lands',
'download_url' : 'https://github.com/Mindwerks/lands/releases',
'author_email' : 'f.tomassetti@gmail.com',
'version' : __version__,
'install_requires' : ['nose'],
Expand Down
2 changes: 0 additions & 2 deletions tests/basic_map_operations_test.py
@@ -1,5 +1,3 @@
__author__ = 'Federico Tomassetti'

import unittest
from lands.basic_map_operations import *

Expand Down
2 changes: 0 additions & 2 deletions tests/biome_test.py
@@ -1,5 +1,3 @@
__author__ = 'Federico Tomassetti'

import unittest
from lands.biome import *

Expand Down
2 changes: 0 additions & 2 deletions tests/blessed_images/generated_blessed_images.py
@@ -1,5 +1,3 @@
__author__ = 'Federico Tomassetti'

# Please refer to README.md in this directory

import os
Expand Down
2 changes: 0 additions & 2 deletions tests/common_test.py
@@ -1,5 +1,3 @@
__author__ = 'Federico Tomassetti'

import unittest
from lands.common import *

Expand Down
2 changes: 0 additions & 2 deletions tests/draw_test.py
@@ -1,5 +1,3 @@
__author__ = 'Federico Tomassetti'

import unittest
import os
from PIL import Image
Expand Down
2 changes: 0 additions & 2 deletions tests/drawing_functions_test.py
@@ -1,5 +1,3 @@
__author__ = 'Federico Tomassetti'

import unittest

from lands.drawing_functions import *
Expand Down

0 comments on commit 43c2f8f

Please sign in to comment.