update print to python3
This commit is contained in:
parent
cec747e423
commit
4b2c5245e1
4 changed files with 171 additions and 8 deletions
163
.gitignore
vendored
Normal file
163
.gitignore
vendored
Normal file
|
@ -0,0 +1,163 @@
|
||||||
|
|
||||||
|
# ---> Python
|
||||||
|
# Byte-compiled / optimized / DLL files
|
||||||
|
__pycache__/
|
||||||
|
*.py[cod]
|
||||||
|
*$py.class
|
||||||
|
|
||||||
|
# C extensions
|
||||||
|
*.so
|
||||||
|
|
||||||
|
# Distribution / packaging
|
||||||
|
.Python
|
||||||
|
build/
|
||||||
|
develop-eggs/
|
||||||
|
dist/
|
||||||
|
downloads/
|
||||||
|
eggs/
|
||||||
|
.eggs/
|
||||||
|
lib/
|
||||||
|
lib64/
|
||||||
|
parts/
|
||||||
|
sdist/
|
||||||
|
var/
|
||||||
|
wheels/
|
||||||
|
share/python-wheels/
|
||||||
|
*.egg-info/
|
||||||
|
.installed.cfg
|
||||||
|
*.egg
|
||||||
|
MANIFEST
|
||||||
|
|
||||||
|
# PyInstaller
|
||||||
|
# Usually these files are written by a python script from a template
|
||||||
|
# before PyInstaller builds the exe, so as to inject date/other infos into it.
|
||||||
|
*.manifest
|
||||||
|
*.spec
|
||||||
|
|
||||||
|
# Installer logs
|
||||||
|
pip-log.txt
|
||||||
|
pip-delete-this-directory.txt
|
||||||
|
|
||||||
|
# Unit test / coverage reports
|
||||||
|
htmlcov/
|
||||||
|
.tox/
|
||||||
|
.nox/
|
||||||
|
.coverage
|
||||||
|
.coverage.*
|
||||||
|
.cache
|
||||||
|
nosetests.xml
|
||||||
|
coverage.xml
|
||||||
|
*.cover
|
||||||
|
*.py,cover
|
||||||
|
.hypothesis/
|
||||||
|
.pytest_cache/
|
||||||
|
cover/
|
||||||
|
|
||||||
|
# Translations
|
||||||
|
*.mo
|
||||||
|
*.pot
|
||||||
|
|
||||||
|
# Django stuff:
|
||||||
|
*.log
|
||||||
|
local_settings.py
|
||||||
|
db.sqlite3
|
||||||
|
db.sqlite3-journal
|
||||||
|
|
||||||
|
# Flask stuff:
|
||||||
|
instance/
|
||||||
|
.webassets-cache
|
||||||
|
|
||||||
|
# Scrapy stuff:
|
||||||
|
.scrapy
|
||||||
|
|
||||||
|
# Sphinx documentation
|
||||||
|
docs/_build/
|
||||||
|
|
||||||
|
# PyBuilder
|
||||||
|
.pybuilder/
|
||||||
|
target/
|
||||||
|
|
||||||
|
# Jupyter Notebook
|
||||||
|
.ipynb_checkpoints
|
||||||
|
|
||||||
|
# IPython
|
||||||
|
profile_default/
|
||||||
|
ipython_config.py
|
||||||
|
|
||||||
|
# pyenv
|
||||||
|
# For a library or package, you might want to ignore these files since the code is
|
||||||
|
# intended to run in multiple environments; otherwise, check them in:
|
||||||
|
# .python-version
|
||||||
|
|
||||||
|
# pipenv
|
||||||
|
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
|
||||||
|
# However, in case of collaboration, if having platform-specific dependencies or dependencies
|
||||||
|
# having no cross-platform support, pipenv may install dependencies that don't work, or not
|
||||||
|
# install all needed dependencies.
|
||||||
|
#Pipfile.lock
|
||||||
|
|
||||||
|
# poetry
|
||||||
|
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
|
||||||
|
# This is especially recommended for binary packages to ensure reproducibility, and is more
|
||||||
|
# commonly ignored for libraries.
|
||||||
|
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
|
||||||
|
#poetry.lock
|
||||||
|
|
||||||
|
# pdm
|
||||||
|
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
|
||||||
|
#pdm.lock
|
||||||
|
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
|
||||||
|
# in version control.
|
||||||
|
# https://pdm.fming.dev/#use-with-ide
|
||||||
|
.pdm.toml
|
||||||
|
|
||||||
|
# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
|
||||||
|
__pypackages__/
|
||||||
|
|
||||||
|
# Celery stuff
|
||||||
|
celerybeat-schedule
|
||||||
|
celerybeat.pid
|
||||||
|
|
||||||
|
# SageMath parsed files
|
||||||
|
*.sage.py
|
||||||
|
|
||||||
|
# Environments
|
||||||
|
.env
|
||||||
|
.venv
|
||||||
|
env/
|
||||||
|
venv/
|
||||||
|
ENV/
|
||||||
|
env.bak/
|
||||||
|
venv.bak/
|
||||||
|
|
||||||
|
# Spyder project settings
|
||||||
|
.spyderproject
|
||||||
|
.spyproject
|
||||||
|
|
||||||
|
# Rope project settings
|
||||||
|
.ropeproject
|
||||||
|
|
||||||
|
# mkdocs documentation
|
||||||
|
/site
|
||||||
|
|
||||||
|
# mypy
|
||||||
|
.mypy_cache/
|
||||||
|
.dmypy.json
|
||||||
|
dmypy.json
|
||||||
|
|
||||||
|
# Pyre type checker
|
||||||
|
.pyre/
|
||||||
|
|
||||||
|
# pytype static type analyzer
|
||||||
|
.pytype/
|
||||||
|
|
||||||
|
# Cython debug symbols
|
||||||
|
cython_debug/
|
||||||
|
|
||||||
|
# PyCharm
|
||||||
|
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
|
||||||
|
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
|
||||||
|
# and can be added to the global gitignore or merged into this file. For a more nuclear
|
||||||
|
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
||||||
|
#.idea/
|
||||||
|
|
|
@ -75,10 +75,10 @@ class StarSys(object):
|
||||||
self.draw_dirty = False
|
self.draw_dirty = False
|
||||||
def update(self):
|
def update(self):
|
||||||
#if self.startype.size == "Dwarf" and self.startype.color == "White":
|
#if self.startype.size == "Dwarf" and self.startype.color == "White":
|
||||||
#print gametimer.elapsed()
|
#print(gametimer.elapsed())
|
||||||
#print self.frame_timer
|
#print(self.frame_timer)
|
||||||
#print self.frame_timer - gametimer.elapsed()
|
#print(self.frame_timer - gametimer.elapsed())
|
||||||
#print self.delays
|
#print(self.delays)
|
||||||
#sys.exit(0)
|
#sys.exit(0)
|
||||||
self.frame_timer -= gametimer.elapsed()
|
self.frame_timer -= gametimer.elapsed()
|
||||||
oldframe = self.frame
|
oldframe = self.frame
|
||||||
|
|
|
@ -117,7 +117,7 @@ def starmap_generate():
|
||||||
mapy = params.size[1] - 2
|
mapy = params.size[1] - 2
|
||||||
map = Galaxy(params.size[0], params.size[1])
|
map = Galaxy(params.size[0], params.size[1])
|
||||||
i = 0
|
i = 0
|
||||||
print numstars
|
print(numstars)
|
||||||
while True:
|
while True:
|
||||||
if i >= numstars:
|
if i >= numstars:
|
||||||
break
|
break
|
||||||
|
@ -134,7 +134,7 @@ def starmap_generate():
|
||||||
star = map.get_nearest_star(x, y)
|
star = map.get_nearest_star(x, y)
|
||||||
dist = map.get_distance(x, y, star.x, star.y)
|
dist = map.get_distance(x, y, star.x, star.y)
|
||||||
if dist < mindist:
|
if dist < mindist:
|
||||||
print "Dist (%s, %s): %s, Mindist (%s, %s): %s" % (star.x, star.y, dist, int(x), int(y), mindist)
|
print("Dist (%s, %s): %s, Mindist (%s, %s): %s" % (star.x, star.y, dist, int(x), int(y), mindist))
|
||||||
mindist -= 2
|
mindist -= 2
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
@ -164,7 +164,7 @@ def starmap_generate():
|
||||||
hab = hab.random()
|
hab = hab.random()
|
||||||
min = min.random()
|
min = min.random()
|
||||||
|
|
||||||
print "Generated star %s %s %s at (%s, %s)" % (startype.name, hab, min, int(x), int(y))
|
print("Generated star %s %s %s at (%s, %s)" % (startype.name, hab, min, int(x), int(y)))
|
||||||
|
|
||||||
star = StarSys(int(x), int(y), startype, hab, min)
|
star = StarSys(int(x), int(y), startype, hab, min)
|
||||||
star.set_frame_timers([0.6 + (random.random() * 1.5), 0.2 + (random.random() * 0.5)])
|
star.set_frame_timers([0.6 + (random.random() * 1.5), 0.2 + (random.random() * 0.5)])
|
||||||
|
|
2
video.py
2
video.py
|
@ -45,7 +45,7 @@ def next_frame():
|
||||||
global updatelist, force_full
|
global updatelist, force_full
|
||||||
|
|
||||||
if force_full:
|
if force_full:
|
||||||
print "Doing FULL redraw!"
|
print("Doing FULL redraw!")
|
||||||
pygame.display.flip()
|
pygame.display.flip()
|
||||||
else:
|
else:
|
||||||
pygame.display.update(updatelist)
|
pygame.display.update(updatelist)
|
||||||
|
|
Loading…
Add table
Reference in a new issue