Andrew Chin
a6baf5b6e8
Added missing import
2011-03-25 20:45:25 -04:00
Andrew Chin
2be2a48d7c
Merge remote-tracking branch 'origin/dtt-c-render' into dtt-c-render
2011-03-25 20:43:04 -04:00
Andrew Chin
82e0bf53b9
Added a new 'listify' parameter to the config file parser
...
Specifying listify on an option will cause it to be parsed as a list.
Use listdelim to specify the delimiter (defaults to ',')
Examples, assuming you had the following option:
add_option("--test","test", type="int", listify=True)
Command line:
--test 1 results in [1]
--test 1,2,3 results in [1,2,3]
Config file:
test=1 results in [1]
test="1,2,3" results in [1,2,3]
test=[1,4,9] results in [1,4,9]
2011-03-25 20:42:05 -04:00
Aaron Griffith
84988aa2f6
0-byte region files no longer crash the whole program
2011-03-25 19:48:55 -04:00
Aaron Griffith
8fcc0a993e
Merge commit 'fenixin/dtt-c-render-fences-fix' into dtt-c-render
2011-03-25 19:29:00 -04:00
Alejandro Aguilera
593c475e98
Fix problem loading adjacent chunks in some maps.
2011-03-25 17:46:52 +01:00
Xon
6c9bbc25da
Better error messages, removed import which triggered a failure
2011-03-25 21:42:18 +08:00
Xon
1d5b338d56
Check PyImport_ImportModule return result
2011-03-25 21:34:06 +08:00
Andrew Chin
172198558a
Moved helper function out of overviewer.py and into util.py
...
Solves a dependency problem where you can't import overviewer unless the extension is built
2011-03-24 22:45:26 -04:00
Andrew Chin
8dc66083e0
Merge branch 'version_stuff' into dtt-c-render
2011-03-24 22:30:49 -04:00
Andrew Chin
c25e2cce0f
Implement a --version option to overviewer
...
Should also work with py2exe binary kits
2011-03-24 22:27:50 -04:00
Andrew Chin
df6124b425
Remove windows-style newlines
2011-03-24 19:51:33 -04:00
Aaron Griffith
d84af9fa4b
changed lighting rendermode to use new state variables
2011-03-24 19:44:21 -04:00
Aaron Griffith
2d64d2d84d
changed 0b(...) constants into (1 << n) equivalents
...
0b(...) isn't supported by GCC :(
2011-03-24 19:41:08 -04:00
Alejandro Aguilera
4f5bf93b49
Fix "that NULL should be Py_None"
2011-03-24 23:54:58 +01:00
Alejandro Aguilera
3fdf70b61d
Fix problem with get_lvldata in chunk.py: filename = None doesn't mean chunk corrupt.
2011-03-24 23:47:17 +01:00
Alejandro Aguilera
d04bea2b66
Add functions generate_pseudo_data and check_adjacent_blocks to iterate.c
...
Fences working.
2011-03-24 23:43:11 +01:00
Alejandro Aguilera
4da53b4f9c
Load the 4 adjacent blocks in iterate.c
2011-03-24 23:40:01 +01:00
Andrew Chin
7daa1bac9d
Now supports both MSVC and mingw32
2011-03-23 22:59:33 -04:00
Andrew Chin
57e99725df
Removed noise leftover from last commit
2011-03-23 21:31:51 -04:00
Andrew Chin
977bf09a12
Bunch of changes to make VS happy
...
Mostly variable declarations moved to the top of blocks.
is_transparent can't be inline, since it's needed in several places
2011-03-23 20:34:49 -04:00
Aaron Griffith
c18d6924ea
fixed transparent block lighting
2011-03-23 03:27:42 -04:00
Aaron Griffith
d36bd20e6a
fixed lighting for half-step blocks
2011-03-23 02:52:19 -04:00
Aaron Griffith
ccddba2d81
ported spawn render mode to C
2011-03-23 02:31:09 -04:00
Aaron Griffith
69bb56dcb4
added night rendermode
2011-03-23 00:33:59 -04:00
Aaron Griffith
19a2eafcd5
fixed black lines showing up on lit maps, at chunk boundaries
2011-03-23 00:19:54 -04:00
Aaron Griffith
ff464bde3c
removed lighting/night/spawn bools, now we just reference rendermode directly
2011-03-23 00:13:17 -04:00
Aaron Griffith
f5264e9306
rewrote get_lighting_coefficient in C
2011-03-23 00:03:26 -04:00
Aaron Griffith
24950f6024
moved rendermode_normal into a separate file, like rendermode_lighting
2011-03-22 23:09:12 -04:00
Andrew Chin
a885568d4e
Added missing DECREF
...
memory usage is stable and constant over a 7 minute execution
2011-03-21 23:23:35 -04:00
Andrew Chin
97d708106a
Fixed typo preventing build
2011-03-21 23:18:34 -04:00
Aaron Griffith
0e85f87fa7
removed NULL checks on render mode interface
...
all the functions are required to exist, now
2011-03-21 20:46:30 -04:00
Aaron Griffith
e9b30cf780
changed PyArray_GETPTR3 to getByteArray3D
2011-03-21 20:34:48 -04:00
Aaron Griffith
b312cef52e
put lighting render mode in its own file; it's about to get *way* more complicated
2011-03-21 19:53:20 -04:00
Aaron Griffith
4a01a5fb7b
separated normal and lighting render modes
2011-03-21 19:53:20 -04:00
Andrew Chin
1872ccd690
remove swap files from repo, updated .gitingore to ignore them
...
how did they get there :/
2011-03-21 09:00:08 -04:00
Aaron Griffith
b908c6e07c
separated iterate and rendermode code, rendermodes are now defined by interface structs
2011-03-21 07:41:10 -04:00
Aaron Griffith
7b7f97d6c5
moved important render state into a struct, to prepare for modular render modes
...
(making the code look worse, so it can look better!)
2011-03-21 06:40:37 -04:00
Aaron Griffith
da58be569f
C code style fixes for lighting/normal code merge (woops...)
2011-03-21 06:21:55 -04:00
Aaron Griffith
cd34d6052b
renamed is_transparent (more like other function names), and exposed it to other C files
2011-03-21 06:18:51 -04:00
Aaron Griffith
88d5f15131
fixed blockid memory leak
2011-03-21 06:05:06 -04:00
Aaron Griffith
2881324084
merged lighting and non-lighting render code
2011-03-21 06:02:47 -04:00
Aaron Griffith
fd0924a93b
moved lighting check from world object to quadtree object, where it should be now
2011-03-21 05:35:11 -04:00
Aaron Griffith
c603f2344f
Merge branch 'dtt-c-render' into lighting
2011-03-21 05:32:10 -04:00
Aaron Griffith
56f6218ea8
updated .gitignore to include settings.py
2011-03-20 21:45:13 -04:00
Aaron Griffith
04ef95e4d6
renamed gmap.py to overviewer.py
2011-03-20 21:43:18 -04:00
Aaron Griffith
0e87368a06
moved google map related code int googlemap.py (from quadtree.py)
...
basic support in googlemap.py for handling multiple QuadtreeGens
2011-03-20 21:43:18 -04:00
Andrew Chin
61819a7f30
Merged in dtt-c-render
...
Conflicts:
src/overviewer.h
2011-03-20 21:29:05 -04:00
Andrew Chin
329c7557f6
Move some code out of the render_loop function and into a 1-time init
...
routine
2011-03-20 21:13:17 -04:00
Aaron Griffith
4e9985c611
changed web_assets_hook to use new config-file function support
2011-03-20 00:46:56 -04:00