Pre-release 0.3 "A little wet"
See this link for changelog > https://forum.minetest.net/viewtopic.php?f=55&t=20478&start=50#p328560master
azekillDIABLO
parent
fc87988742
commit
b93c213897
|
|
@ -66,7 +66,7 @@ CMAKE_BINARY_DIR = "/home/tux/Dev ++/Omicron"
|
|||
CMakeFiles/omicron.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
|
||||
$(MAKE) -f CMakeFiles/omicron.dir/build.make CMakeFiles/omicron.dir/depend
|
||||
$(MAKE) -f CMakeFiles/omicron.dir/build.make CMakeFiles/omicron.dir/build
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76 "Built target omicron"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76 "Built target omicron"
|
||||
.PHONY : CMakeFiles/omicron.dir/all
|
||||
|
||||
# Include target in all.
|
||||
|
|
@ -76,7 +76,7 @@ all: CMakeFiles/omicron.dir/all
|
|||
|
||||
# Build rule for subdir invocation for target.
|
||||
CMakeFiles/omicron.dir/rule: cmake_check_build_system
|
||||
$(CMAKE_COMMAND) -E cmake_progress_start "/home/tux/Dev ++/Omicron/CMakeFiles" 41
|
||||
$(CMAKE_COMMAND) -E cmake_progress_start "/home/tux/Dev ++/Omicron/CMakeFiles" 42
|
||||
$(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/omicron.dir/all
|
||||
$(CMAKE_COMMAND) -E cmake_progress_start "/home/tux/Dev ++/Omicron/CMakeFiles" 0
|
||||
.PHONY : CMakeFiles/omicron.dir/rule
|
||||
|
|
@ -178,7 +178,7 @@ deps/glfw/src/preinstall:
|
|||
deps/glfw/src/CMakeFiles/glfw.dir/all:
|
||||
$(MAKE) -f deps/glfw/src/CMakeFiles/glfw.dir/build.make deps/glfw/src/CMakeFiles/glfw.dir/depend
|
||||
$(MAKE) -f deps/glfw/src/CMakeFiles/glfw.dir/build.make deps/glfw/src/CMakeFiles/glfw.dir/build
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=19,20,21,22,23,24,25,26,27,28,29,30,31,32 "Built target glfw"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=18,19,20,21,22,23,24,25,26,27,28,29,30,31 "Built target glfw"
|
||||
.PHONY : deps/glfw/src/CMakeFiles/glfw.dir/all
|
||||
|
||||
# Include target in all.
|
||||
|
|
@ -245,7 +245,7 @@ deps/glfw/examples/preinstall:
|
|||
deps/glfw/examples/CMakeFiles/heightmap.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
|
||||
$(MAKE) -f deps/glfw/examples/CMakeFiles/heightmap.dir/build.make deps/glfw/examples/CMakeFiles/heightmap.dir/depend
|
||||
$(MAKE) -f deps/glfw/examples/CMakeFiles/heightmap.dir/build.make deps/glfw/examples/CMakeFiles/heightmap.dir/build
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=36,37,38 "Built target heightmap"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=35,36,37 "Built target heightmap"
|
||||
.PHONY : deps/glfw/examples/CMakeFiles/heightmap.dir/all
|
||||
|
||||
# Include target in all.
|
||||
|
|
@ -282,7 +282,7 @@ clean: deps/glfw/examples/CMakeFiles/heightmap.dir/clean
|
|||
deps/glfw/examples/CMakeFiles/gears.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
|
||||
$(MAKE) -f deps/glfw/examples/CMakeFiles/gears.dir/build.make deps/glfw/examples/CMakeFiles/gears.dir/depend
|
||||
$(MAKE) -f deps/glfw/examples/CMakeFiles/gears.dir/build.make deps/glfw/examples/CMakeFiles/gears.dir/build
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=17,18 "Built target gears"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=16,17 "Built target gears"
|
||||
.PHONY : deps/glfw/examples/CMakeFiles/gears.dir/all
|
||||
|
||||
# Include target in all.
|
||||
|
|
@ -393,7 +393,7 @@ clean: deps/glfw/examples/CMakeFiles/wave.dir/clean
|
|||
deps/glfw/examples/CMakeFiles/boing.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
|
||||
$(MAKE) -f deps/glfw/examples/CMakeFiles/boing.dir/build.make deps/glfw/examples/CMakeFiles/boing.dir/depend
|
||||
$(MAKE) -f deps/glfw/examples/CMakeFiles/boing.dir/build.make deps/glfw/examples/CMakeFiles/boing.dir/build
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=1,2 "Built target boing"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=1 "Built target boing"
|
||||
.PHONY : deps/glfw/examples/CMakeFiles/boing.dir/all
|
||||
|
||||
# Include target in all.
|
||||
|
|
@ -403,7 +403,7 @@ all: deps/glfw/examples/CMakeFiles/boing.dir/all
|
|||
|
||||
# Build rule for subdir invocation for target.
|
||||
deps/glfw/examples/CMakeFiles/boing.dir/rule: cmake_check_build_system
|
||||
$(CMAKE_COMMAND) -E cmake_progress_start "/home/tux/Dev ++/Omicron/CMakeFiles" 16
|
||||
$(CMAKE_COMMAND) -E cmake_progress_start "/home/tux/Dev ++/Omicron/CMakeFiles" 15
|
||||
$(MAKE) -f CMakeFiles/Makefile2 deps/glfw/examples/CMakeFiles/boing.dir/all
|
||||
$(CMAKE_COMMAND) -E cmake_progress_start "/home/tux/Dev ++/Omicron/CMakeFiles" 0
|
||||
.PHONY : deps/glfw/examples/CMakeFiles/boing.dir/rule
|
||||
|
|
@ -700,7 +700,7 @@ clean: deps/glfw/tests/CMakeFiles/threads.dir/clean
|
|||
deps/glfw/tests/CMakeFiles/empty.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
|
||||
$(MAKE) -f deps/glfw/tests/CMakeFiles/empty.dir/build.make deps/glfw/tests/CMakeFiles/empty.dir/depend
|
||||
$(MAKE) -f deps/glfw/tests/CMakeFiles/empty.dir/build.make deps/glfw/tests/CMakeFiles/empty.dir/build
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=8,9,10 "Built target empty"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=7,8,9 "Built target empty"
|
||||
.PHONY : deps/glfw/tests/CMakeFiles/empty.dir/all
|
||||
|
||||
# Include target in all.
|
||||
|
|
@ -737,7 +737,7 @@ clean: deps/glfw/tests/CMakeFiles/empty.dir/clean
|
|||
deps/glfw/tests/CMakeFiles/msaa.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
|
||||
$(MAKE) -f deps/glfw/tests/CMakeFiles/msaa.dir/build.make deps/glfw/tests/CMakeFiles/msaa.dir/depend
|
||||
$(MAKE) -f deps/glfw/tests/CMakeFiles/msaa.dir/build.make deps/glfw/tests/CMakeFiles/msaa.dir/build
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=47,48,49 "Built target msaa"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=46,47,48 "Built target msaa"
|
||||
.PHONY : deps/glfw/tests/CMakeFiles/msaa.dir/all
|
||||
|
||||
# Include target in all.
|
||||
|
|
@ -811,7 +811,7 @@ clean: deps/glfw/tests/CMakeFiles/tearing.dir/clean
|
|||
deps/glfw/tests/CMakeFiles/events.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
|
||||
$(MAKE) -f deps/glfw/tests/CMakeFiles/events.dir/build.make deps/glfw/tests/CMakeFiles/events.dir/depend
|
||||
$(MAKE) -f deps/glfw/tests/CMakeFiles/events.dir/build.make deps/glfw/tests/CMakeFiles/events.dir/build
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=11,12,13 "Built target events"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=10,11,12 "Built target events"
|
||||
.PHONY : deps/glfw/tests/CMakeFiles/events.dir/all
|
||||
|
||||
# Include target in all.
|
||||
|
|
@ -848,7 +848,7 @@ clean: deps/glfw/tests/CMakeFiles/events.dir/clean
|
|||
deps/glfw/tests/CMakeFiles/gamma.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
|
||||
$(MAKE) -f deps/glfw/tests/CMakeFiles/gamma.dir/build.make deps/glfw/tests/CMakeFiles/gamma.dir/depend
|
||||
$(MAKE) -f deps/glfw/tests/CMakeFiles/gamma.dir/build.make deps/glfw/tests/CMakeFiles/gamma.dir/build
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=14,15,16 "Built target gamma"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=13,14,15 "Built target gamma"
|
||||
.PHONY : deps/glfw/tests/CMakeFiles/gamma.dir/all
|
||||
|
||||
# Include target in all.
|
||||
|
|
@ -885,7 +885,7 @@ clean: deps/glfw/tests/CMakeFiles/gamma.dir/clean
|
|||
deps/glfw/tests/CMakeFiles/glfwinfo.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
|
||||
$(MAKE) -f deps/glfw/tests/CMakeFiles/glfwinfo.dir/build.make deps/glfw/tests/CMakeFiles/glfwinfo.dir/depend
|
||||
$(MAKE) -f deps/glfw/tests/CMakeFiles/glfwinfo.dir/build.make deps/glfw/tests/CMakeFiles/glfwinfo.dir/build
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=33,34,35 "Built target glfwinfo"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=32,33,34 "Built target glfwinfo"
|
||||
.PHONY : deps/glfw/tests/CMakeFiles/glfwinfo.dir/all
|
||||
|
||||
# Include target in all.
|
||||
|
|
@ -922,7 +922,7 @@ clean: deps/glfw/tests/CMakeFiles/glfwinfo.dir/clean
|
|||
deps/glfw/tests/CMakeFiles/iconify.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
|
||||
$(MAKE) -f deps/glfw/tests/CMakeFiles/iconify.dir/build.make deps/glfw/tests/CMakeFiles/iconify.dir/depend
|
||||
$(MAKE) -f deps/glfw/tests/CMakeFiles/iconify.dir/build.make deps/glfw/tests/CMakeFiles/iconify.dir/build
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=39,40,41 "Built target iconify"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=38,39,40 "Built target iconify"
|
||||
.PHONY : deps/glfw/tests/CMakeFiles/iconify.dir/all
|
||||
|
||||
# Include target in all.
|
||||
|
|
@ -959,7 +959,7 @@ clean: deps/glfw/tests/CMakeFiles/iconify.dir/clean
|
|||
deps/glfw/tests/CMakeFiles/monitors.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
|
||||
$(MAKE) -f deps/glfw/tests/CMakeFiles/monitors.dir/build.make deps/glfw/tests/CMakeFiles/monitors.dir/depend
|
||||
$(MAKE) -f deps/glfw/tests/CMakeFiles/monitors.dir/build.make deps/glfw/tests/CMakeFiles/monitors.dir/build
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=44,45,46 "Built target monitors"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=43,44,45 "Built target monitors"
|
||||
.PHONY : deps/glfw/tests/CMakeFiles/monitors.dir/all
|
||||
|
||||
# Include target in all.
|
||||
|
|
@ -996,7 +996,7 @@ clean: deps/glfw/tests/CMakeFiles/monitors.dir/clean
|
|||
deps/glfw/tests/CMakeFiles/cursor.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
|
||||
$(MAKE) -f deps/glfw/tests/CMakeFiles/cursor.dir/build.make deps/glfw/tests/CMakeFiles/cursor.dir/depend
|
||||
$(MAKE) -f deps/glfw/tests/CMakeFiles/cursor.dir/build.make deps/glfw/tests/CMakeFiles/cursor.dir/build
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=6,7 "Built target cursor"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=5,6 "Built target cursor"
|
||||
.PHONY : deps/glfw/tests/CMakeFiles/cursor.dir/all
|
||||
|
||||
# Include target in all.
|
||||
|
|
@ -1033,7 +1033,7 @@ clean: deps/glfw/tests/CMakeFiles/cursor.dir/clean
|
|||
deps/glfw/tests/CMakeFiles/joysticks.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
|
||||
$(MAKE) -f deps/glfw/tests/CMakeFiles/joysticks.dir/build.make deps/glfw/tests/CMakeFiles/joysticks.dir/depend
|
||||
$(MAKE) -f deps/glfw/tests/CMakeFiles/joysticks.dir/build.make deps/glfw/tests/CMakeFiles/joysticks.dir/build
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=42,43 "Built target joysticks"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=41,42 "Built target joysticks"
|
||||
.PHONY : deps/glfw/tests/CMakeFiles/joysticks.dir/all
|
||||
|
||||
# Include target in all.
|
||||
|
|
@ -1070,7 +1070,7 @@ clean: deps/glfw/tests/CMakeFiles/joysticks.dir/clean
|
|||
deps/glfw/tests/CMakeFiles/clipboard.dir/all: deps/glfw/src/CMakeFiles/glfw.dir/all
|
||||
$(MAKE) -f deps/glfw/tests/CMakeFiles/clipboard.dir/build.make deps/glfw/tests/CMakeFiles/clipboard.dir/depend
|
||||
$(MAKE) -f deps/glfw/tests/CMakeFiles/clipboard.dir/build.make deps/glfw/tests/CMakeFiles/clipboard.dir/build
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=3,4,5 "Built target clipboard"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=2,3,4 "Built target clipboard"
|
||||
.PHONY : deps/glfw/tests/CMakeFiles/clipboard.dir/all
|
||||
|
||||
# Include target in all.
|
||||
|
|
|
|||
|
|
@ -297,6 +297,8 @@ string.h
|
|||
-
|
||||
time.h
|
||||
-
|
||||
unistd.h
|
||||
-
|
||||
attrib.h
|
||||
/home/tux/Dev ++/Omicron/src/attrib.h
|
||||
auth.h
|
||||
|
|
@ -498,6 +500,20 @@ noise.h
|
|||
world.h
|
||||
/home/tux/Dev ++/Omicron/src/worldgen/world.h
|
||||
|
||||
/home/tux/Dev ++/Omicron/src/worldgen/biome_ocean.c
|
||||
biome_ocean.h
|
||||
/home/tux/Dev ++/Omicron/src/worldgen/biome_ocean.h
|
||||
noise.h
|
||||
/home/tux/Dev ++/Omicron/src/worldgen/noise.h
|
||||
../config.h
|
||||
/home/tux/Dev ++/Omicron/src/config.h
|
||||
../item.h
|
||||
/home/tux/Dev ++/Omicron/src/item.h
|
||||
|
||||
/home/tux/Dev ++/Omicron/src/worldgen/biome_ocean.h
|
||||
world.h
|
||||
/home/tux/Dev ++/Omicron/src/worldgen/world.h
|
||||
|
||||
/home/tux/Dev ++/Omicron/src/worldgen/biome_rainforest.c
|
||||
biome_rainforest.h
|
||||
/home/tux/Dev ++/Omicron/src/worldgen/biome_rainforest.h
|
||||
|
|
@ -541,6 +557,14 @@ world.h
|
|||
/home/tux/Dev ++/Omicron/src/worldgen/world.h
|
||||
|
||||
/home/tux/Dev ++/Omicron/src/worldgen/world.c
|
||||
math.h
|
||||
-
|
||||
stdio.h
|
||||
-
|
||||
stdlib.h
|
||||
-
|
||||
string.h
|
||||
-
|
||||
../config.h
|
||||
/home/tux/Dev ++/Omicron/src/config.h
|
||||
../item.h
|
||||
|
|
@ -563,8 +587,6 @@ biome_taiga.h
|
|||
/home/tux/Dev ++/Omicron/src/worldgen/biome_taiga.h
|
||||
biome_mesa.h
|
||||
/home/tux/Dev ++/Omicron/src/worldgen/biome_mesa.h
|
||||
math.h
|
||||
-
|
||||
|
||||
/home/tux/Dev ++/Omicron/src/worldgen/world.h
|
||||
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ set(CMAKE_DEPENDS_CHECK_C
|
|||
"/home/tux/Dev ++/Omicron/src/worldgen/base_terrain.c" "/home/tux/Dev ++/Omicron/CMakeFiles/omicron.dir/src/worldgen/base_terrain.c.o"
|
||||
"/home/tux/Dev ++/Omicron/src/worldgen/biome_desert.c" "/home/tux/Dev ++/Omicron/CMakeFiles/omicron.dir/src/worldgen/biome_desert.c.o"
|
||||
"/home/tux/Dev ++/Omicron/src/worldgen/biome_mesa.c" "/home/tux/Dev ++/Omicron/CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.o"
|
||||
"/home/tux/Dev ++/Omicron/src/worldgen/biome_ocean.c" "/home/tux/Dev ++/Omicron/CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o"
|
||||
"/home/tux/Dev ++/Omicron/src/worldgen/biome_rainforest.c" "/home/tux/Dev ++/Omicron/CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o"
|
||||
"/home/tux/Dev ++/Omicron/src/worldgen/biome_taiga.c" "/home/tux/Dev ++/Omicron/CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o"
|
||||
"/home/tux/Dev ++/Omicron/src/worldgen/biome_temperate.c" "/home/tux/Dev ++/Omicron/CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o"
|
||||
|
|
|
|||
|
|
@ -465,9 +465,33 @@ CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.o.provides: CMakeFiles/omicron.
|
|||
CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.o.provides.build: CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.o
|
||||
|
||||
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o: CMakeFiles/omicron.dir/flags.make
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o: src/worldgen/biome_ocean.c
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_18) "Building C object CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o"
|
||||
/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o -c "/home/tux/Dev ++/Omicron/src/worldgen/biome_ocean.c"
|
||||
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.i: cmake_force
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing C source to CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.i"
|
||||
/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -E "/home/tux/Dev ++/Omicron/src/worldgen/biome_ocean.c" > CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.i
|
||||
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.s: cmake_force
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling C source to assembly CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.s"
|
||||
/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -S "/home/tux/Dev ++/Omicron/src/worldgen/biome_ocean.c" -o CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.s
|
||||
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o.requires:
|
||||
|
||||
.PHONY : CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o.requires
|
||||
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o.provides: CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o.requires
|
||||
$(MAKE) -f CMakeFiles/omicron.dir/build.make CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o.provides.build
|
||||
.PHONY : CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o.provides
|
||||
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o.provides.build: CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o
|
||||
|
||||
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o: CMakeFiles/omicron.dir/flags.make
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o: src/worldgen/biome_rainforest.c
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_18) "Building C object CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_19) "Building C object CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o"
|
||||
/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o -c "/home/tux/Dev ++/Omicron/src/worldgen/biome_rainforest.c"
|
||||
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.i: cmake_force
|
||||
|
|
@ -491,7 +515,7 @@ CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o.provides.build: CMakeFi
|
|||
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o: CMakeFiles/omicron.dir/flags.make
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o: src/worldgen/biome_taiga.c
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_19) "Building C object CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_20) "Building C object CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o"
|
||||
/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o -c "/home/tux/Dev ++/Omicron/src/worldgen/biome_taiga.c"
|
||||
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.i: cmake_force
|
||||
|
|
@ -515,7 +539,7 @@ CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o.provides.build: CMakeFiles/o
|
|||
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o: CMakeFiles/omicron.dir/flags.make
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o: src/worldgen/biome_temperate.c
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_20) "Building C object CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_21) "Building C object CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o"
|
||||
/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o -c "/home/tux/Dev ++/Omicron/src/worldgen/biome_temperate.c"
|
||||
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.i: cmake_force
|
||||
|
|
@ -539,7 +563,7 @@ CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o.provides.build: CMakeFil
|
|||
|
||||
CMakeFiles/omicron.dir/src/worldgen/world.c.o: CMakeFiles/omicron.dir/flags.make
|
||||
CMakeFiles/omicron.dir/src/worldgen/world.c.o: src/worldgen/world.c
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_21) "Building C object CMakeFiles/omicron.dir/src/worldgen/world.c.o"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_22) "Building C object CMakeFiles/omicron.dir/src/worldgen/world.c.o"
|
||||
/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/omicron.dir/src/worldgen/world.c.o -c "/home/tux/Dev ++/Omicron/src/worldgen/world.c"
|
||||
|
||||
CMakeFiles/omicron.dir/src/worldgen/world.c.i: cmake_force
|
||||
|
|
@ -563,7 +587,7 @@ CMakeFiles/omicron.dir/src/worldgen/world.c.o.provides.build: CMakeFiles/omicron
|
|||
|
||||
CMakeFiles/omicron.dir/deps/glew/src/glew.c.o: CMakeFiles/omicron.dir/flags.make
|
||||
CMakeFiles/omicron.dir/deps/glew/src/glew.c.o: deps/glew/src/glew.c
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_22) "Building C object CMakeFiles/omicron.dir/deps/glew/src/glew.c.o"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_23) "Building C object CMakeFiles/omicron.dir/deps/glew/src/glew.c.o"
|
||||
/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/omicron.dir/deps/glew/src/glew.c.o -c "/home/tux/Dev ++/Omicron/deps/glew/src/glew.c"
|
||||
|
||||
CMakeFiles/omicron.dir/deps/glew/src/glew.c.i: cmake_force
|
||||
|
|
@ -587,7 +611,7 @@ CMakeFiles/omicron.dir/deps/glew/src/glew.c.o.provides.build: CMakeFiles/omicron
|
|||
|
||||
CMakeFiles/omicron.dir/deps/lodepng/lodepng.c.o: CMakeFiles/omicron.dir/flags.make
|
||||
CMakeFiles/omicron.dir/deps/lodepng/lodepng.c.o: deps/lodepng/lodepng.c
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_23) "Building C object CMakeFiles/omicron.dir/deps/lodepng/lodepng.c.o"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_24) "Building C object CMakeFiles/omicron.dir/deps/lodepng/lodepng.c.o"
|
||||
/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/omicron.dir/deps/lodepng/lodepng.c.o -c "/home/tux/Dev ++/Omicron/deps/lodepng/lodepng.c"
|
||||
|
||||
CMakeFiles/omicron.dir/deps/lodepng/lodepng.c.i: cmake_force
|
||||
|
|
@ -611,7 +635,7 @@ CMakeFiles/omicron.dir/deps/lodepng/lodepng.c.o.provides.build: CMakeFiles/omicr
|
|||
|
||||
CMakeFiles/omicron.dir/deps/noise/noise.c.o: CMakeFiles/omicron.dir/flags.make
|
||||
CMakeFiles/omicron.dir/deps/noise/noise.c.o: deps/noise/noise.c
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_24) "Building C object CMakeFiles/omicron.dir/deps/noise/noise.c.o"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_25) "Building C object CMakeFiles/omicron.dir/deps/noise/noise.c.o"
|
||||
/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/omicron.dir/deps/noise/noise.c.o -c "/home/tux/Dev ++/Omicron/deps/noise/noise.c"
|
||||
|
||||
CMakeFiles/omicron.dir/deps/noise/noise.c.i: cmake_force
|
||||
|
|
@ -635,7 +659,7 @@ CMakeFiles/omicron.dir/deps/noise/noise.c.o.provides.build: CMakeFiles/omicron.d
|
|||
|
||||
CMakeFiles/omicron.dir/deps/sqlite/sqlite3.c.o: CMakeFiles/omicron.dir/flags.make
|
||||
CMakeFiles/omicron.dir/deps/sqlite/sqlite3.c.o: deps/sqlite/sqlite3.c
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_25) "Building C object CMakeFiles/omicron.dir/deps/sqlite/sqlite3.c.o"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_26) "Building C object CMakeFiles/omicron.dir/deps/sqlite/sqlite3.c.o"
|
||||
/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/omicron.dir/deps/sqlite/sqlite3.c.o -c "/home/tux/Dev ++/Omicron/deps/sqlite/sqlite3.c"
|
||||
|
||||
CMakeFiles/omicron.dir/deps/sqlite/sqlite3.c.i: cmake_force
|
||||
|
|
@ -659,7 +683,7 @@ CMakeFiles/omicron.dir/deps/sqlite/sqlite3.c.o.provides.build: CMakeFiles/omicro
|
|||
|
||||
CMakeFiles/omicron.dir/deps/tinycthread/tinycthread.c.o: CMakeFiles/omicron.dir/flags.make
|
||||
CMakeFiles/omicron.dir/deps/tinycthread/tinycthread.c.o: deps/tinycthread/tinycthread.c
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_26) "Building C object CMakeFiles/omicron.dir/deps/tinycthread/tinycthread.c.o"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_27) "Building C object CMakeFiles/omicron.dir/deps/tinycthread/tinycthread.c.o"
|
||||
/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/omicron.dir/deps/tinycthread/tinycthread.c.o -c "/home/tux/Dev ++/Omicron/deps/tinycthread/tinycthread.c"
|
||||
|
||||
CMakeFiles/omicron.dir/deps/tinycthread/tinycthread.c.i: cmake_force
|
||||
|
|
@ -700,6 +724,7 @@ omicron_OBJECTS = \
|
|||
"CMakeFiles/omicron.dir/src/worldgen/base_terrain.c.o" \
|
||||
"CMakeFiles/omicron.dir/src/worldgen/biome_desert.c.o" \
|
||||
"CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.o" \
|
||||
"CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o" \
|
||||
"CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o" \
|
||||
"CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o" \
|
||||
"CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o" \
|
||||
|
|
@ -730,6 +755,7 @@ omicron: CMakeFiles/omicron.dir/src/util.c.o
|
|||
omicron: CMakeFiles/omicron.dir/src/worldgen/base_terrain.c.o
|
||||
omicron: CMakeFiles/omicron.dir/src/worldgen/biome_desert.c.o
|
||||
omicron: CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.o
|
||||
omicron: CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o
|
||||
omicron: CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o
|
||||
omicron: CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o
|
||||
omicron: CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o
|
||||
|
|
@ -762,7 +788,7 @@ omicron: /usr/lib/x86_64-linux-gnu/libXcursor.so
|
|||
omicron: /usr/lib/x86_64-linux-gnu/libGL.so
|
||||
omicron: /usr/lib/x86_64-linux-gnu/libcurl.so
|
||||
omicron: CMakeFiles/omicron.dir/link.txt
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_27) "Linking C executable omicron"
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir="/home/tux/Dev ++/Omicron/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_28) "Linking C executable omicron"
|
||||
$(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/omicron.dir/link.txt --verbose=$(VERBOSE)
|
||||
|
||||
# Rule to build all files generated by this target.
|
||||
|
|
@ -787,6 +813,7 @@ CMakeFiles/omicron.dir/requires: CMakeFiles/omicron.dir/src/util.c.o.requires
|
|||
CMakeFiles/omicron.dir/requires: CMakeFiles/omicron.dir/src/worldgen/base_terrain.c.o.requires
|
||||
CMakeFiles/omicron.dir/requires: CMakeFiles/omicron.dir/src/worldgen/biome_desert.c.o.requires
|
||||
CMakeFiles/omicron.dir/requires: CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.o.requires
|
||||
CMakeFiles/omicron.dir/requires: CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o.requires
|
||||
CMakeFiles/omicron.dir/requires: CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o.requires
|
||||
CMakeFiles/omicron.dir/requires: CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o.requires
|
||||
CMakeFiles/omicron.dir/requires: CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o.requires
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ file(REMOVE_RECURSE
|
|||
"CMakeFiles/omicron.dir/src/worldgen/base_terrain.c.o"
|
||||
"CMakeFiles/omicron.dir/src/worldgen/biome_desert.c.o"
|
||||
"CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.o"
|
||||
"CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o"
|
||||
"CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o"
|
||||
"CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o"
|
||||
"CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o"
|
||||
|
|
|
|||
|
|
@ -247,6 +247,13 @@ CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.o
|
|||
/home/tux/Dev ++/Omicron/src/worldgen/biome_mesa.h
|
||||
/home/tux/Dev ++/Omicron/src/worldgen/world.h
|
||||
deps/noise/noise.h
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o
|
||||
/home/tux/Dev ++/Omicron/src/config.h
|
||||
/home/tux/Dev ++/Omicron/src/item.h
|
||||
/home/tux/Dev ++/Omicron/src/worldgen/biome_ocean.c
|
||||
/home/tux/Dev ++/Omicron/src/worldgen/biome_ocean.h
|
||||
/home/tux/Dev ++/Omicron/src/worldgen/world.h
|
||||
deps/noise/noise.h
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o
|
||||
/home/tux/Dev ++/Omicron/src/config.h
|
||||
/home/tux/Dev ++/Omicron/src/item.h
|
||||
|
|
|
|||
|
|
@ -247,6 +247,13 @@ CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.o: src/worldgen/biome_mesa.h
|
|||
CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.o: src/worldgen/world.h
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.o: deps/noise/noise.h
|
||||
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o: src/config.h
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o: src/item.h
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o: src/worldgen/biome_ocean.c
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o: src/worldgen/biome_ocean.h
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o: src/worldgen/world.h
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o: deps/noise/noise.h
|
||||
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o: src/config.h
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o: src/item.h
|
||||
CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o: src/worldgen/biome_rainforest.c
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
/usr/bin/cc CMakeFiles/omicron.dir/src/auth.c.o CMakeFiles/omicron.dir/src/client.c.o CMakeFiles/omicron.dir/src/cube.c.o CMakeFiles/omicron.dir/src/db.c.o CMakeFiles/omicron.dir/src/inventory.c.o CMakeFiles/omicron.dir/src/item.c.o CMakeFiles/omicron.dir/src/main.c.o CMakeFiles/omicron.dir/src/map.c.o CMakeFiles/omicron.dir/src/matrix.c.o CMakeFiles/omicron.dir/src/parser.c.o CMakeFiles/omicron.dir/src/rendering.c.o CMakeFiles/omicron.dir/src/ring.c.o CMakeFiles/omicron.dir/src/sign.c.o CMakeFiles/omicron.dir/src/util.c.o CMakeFiles/omicron.dir/src/worldgen/base_terrain.c.o CMakeFiles/omicron.dir/src/worldgen/biome_desert.c.o CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.o CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o CMakeFiles/omicron.dir/src/worldgen/world.c.o CMakeFiles/omicron.dir/deps/glew/src/glew.c.o CMakeFiles/omicron.dir/deps/lodepng/lodepng.c.o CMakeFiles/omicron.dir/deps/noise/noise.c.o CMakeFiles/omicron.dir/deps/sqlite/sqlite3.c.o CMakeFiles/omicron.dir/deps/tinycthread/tinycthread.c.o -o omicron -rdynamic -ldl deps/glfw/src/libglfw3.a -lrt -lm -lX11 -lpthread -lXrandr -lXinerama -lXi -lXxf86vm -lXcursor -lGL -ldl -lcurl -lrt -lm -lX11 -lpthread -lXrandr -lXinerama -lXi -lXxf86vm -lXcursor -lGL -lcurl
|
||||
/usr/bin/cc CMakeFiles/omicron.dir/src/auth.c.o CMakeFiles/omicron.dir/src/client.c.o CMakeFiles/omicron.dir/src/cube.c.o CMakeFiles/omicron.dir/src/db.c.o CMakeFiles/omicron.dir/src/inventory.c.o CMakeFiles/omicron.dir/src/item.c.o CMakeFiles/omicron.dir/src/main.c.o CMakeFiles/omicron.dir/src/map.c.o CMakeFiles/omicron.dir/src/matrix.c.o CMakeFiles/omicron.dir/src/parser.c.o CMakeFiles/omicron.dir/src/rendering.c.o CMakeFiles/omicron.dir/src/ring.c.o CMakeFiles/omicron.dir/src/sign.c.o CMakeFiles/omicron.dir/src/util.c.o CMakeFiles/omicron.dir/src/worldgen/base_terrain.c.o CMakeFiles/omicron.dir/src/worldgen/biome_desert.c.o CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.o CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o CMakeFiles/omicron.dir/src/worldgen/biome_rainforest.c.o CMakeFiles/omicron.dir/src/worldgen/biome_taiga.c.o CMakeFiles/omicron.dir/src/worldgen/biome_temperate.c.o CMakeFiles/omicron.dir/src/worldgen/world.c.o CMakeFiles/omicron.dir/deps/glew/src/glew.c.o CMakeFiles/omicron.dir/deps/lodepng/lodepng.c.o CMakeFiles/omicron.dir/deps/noise/noise.c.o CMakeFiles/omicron.dir/deps/sqlite/sqlite3.c.o CMakeFiles/omicron.dir/deps/tinycthread/tinycthread.c.o -o omicron -rdynamic -ldl deps/glfw/src/libglfw3.a -lrt -lm -lX11 -lpthread -lXrandr -lXinerama -lXi -lXxf86vm -lXcursor -lGL -ldl -lcurl -lrt -lm -lX11 -lpthread -lXrandr -lXinerama -lXi -lXxf86vm -lXcursor -lGL -lcurl
|
||||
|
|
|
|||
|
|
@ -1,28 +1,29 @@
|
|||
CMAKE_PROGRESS_1 = 50
|
||||
CMAKE_PROGRESS_2 = 51
|
||||
CMAKE_PROGRESS_3 = 52
|
||||
CMAKE_PROGRESS_4 = 53
|
||||
CMAKE_PROGRESS_5 = 54
|
||||
CMAKE_PROGRESS_6 = 55
|
||||
CMAKE_PROGRESS_7 = 56
|
||||
CMAKE_PROGRESS_8 = 57
|
||||
CMAKE_PROGRESS_9 = 58
|
||||
CMAKE_PROGRESS_10 = 59
|
||||
CMAKE_PROGRESS_11 = 60
|
||||
CMAKE_PROGRESS_12 = 61
|
||||
CMAKE_PROGRESS_13 = 62
|
||||
CMAKE_PROGRESS_14 = 63
|
||||
CMAKE_PROGRESS_15 = 64
|
||||
CMAKE_PROGRESS_16 = 65
|
||||
CMAKE_PROGRESS_17 = 66
|
||||
CMAKE_PROGRESS_18 = 67
|
||||
CMAKE_PROGRESS_19 = 68
|
||||
CMAKE_PROGRESS_20 = 69
|
||||
CMAKE_PROGRESS_21 = 70
|
||||
CMAKE_PROGRESS_22 = 71
|
||||
CMAKE_PROGRESS_23 = 72
|
||||
CMAKE_PROGRESS_24 = 73
|
||||
CMAKE_PROGRESS_25 = 74
|
||||
CMAKE_PROGRESS_26 = 75
|
||||
CMAKE_PROGRESS_27 = 76
|
||||
CMAKE_PROGRESS_1 = 49
|
||||
CMAKE_PROGRESS_2 = 50
|
||||
CMAKE_PROGRESS_3 = 51
|
||||
CMAKE_PROGRESS_4 = 52
|
||||
CMAKE_PROGRESS_5 = 53
|
||||
CMAKE_PROGRESS_6 = 54
|
||||
CMAKE_PROGRESS_7 = 55
|
||||
CMAKE_PROGRESS_8 = 56
|
||||
CMAKE_PROGRESS_9 = 57
|
||||
CMAKE_PROGRESS_10 = 58
|
||||
CMAKE_PROGRESS_11 = 59
|
||||
CMAKE_PROGRESS_12 = 60
|
||||
CMAKE_PROGRESS_13 = 61
|
||||
CMAKE_PROGRESS_14 = 62
|
||||
CMAKE_PROGRESS_15 = 63
|
||||
CMAKE_PROGRESS_16 = 64
|
||||
CMAKE_PROGRESS_17 = 65
|
||||
CMAKE_PROGRESS_18 = 66
|
||||
CMAKE_PROGRESS_19 = 67
|
||||
CMAKE_PROGRESS_20 = 68
|
||||
CMAKE_PROGRESS_21 = 69
|
||||
CMAKE_PROGRESS_22 = 70
|
||||
CMAKE_PROGRESS_23 = 71
|
||||
CMAKE_PROGRESS_24 = 72
|
||||
CMAKE_PROGRESS_25 = 73
|
||||
CMAKE_PROGRESS_26 = 74
|
||||
CMAKE_PROGRESS_27 = 75
|
||||
CMAKE_PROGRESS_28 = 76
|
||||
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
30
Makefile
30
Makefile
|
|
@ -1075,6 +1075,33 @@ src/worldgen/biome_mesa.c.s:
|
|||
$(MAKE) -f CMakeFiles/omicron.dir/build.make CMakeFiles/omicron.dir/src/worldgen/biome_mesa.c.s
|
||||
.PHONY : src/worldgen/biome_mesa.c.s
|
||||
|
||||
src/worldgen/biome_ocean.o: src/worldgen/biome_ocean.c.o
|
||||
|
||||
.PHONY : src/worldgen/biome_ocean.o
|
||||
|
||||
# target to build an object file
|
||||
src/worldgen/biome_ocean.c.o:
|
||||
$(MAKE) -f CMakeFiles/omicron.dir/build.make CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.o
|
||||
.PHONY : src/worldgen/biome_ocean.c.o
|
||||
|
||||
src/worldgen/biome_ocean.i: src/worldgen/biome_ocean.c.i
|
||||
|
||||
.PHONY : src/worldgen/biome_ocean.i
|
||||
|
||||
# target to preprocess a source file
|
||||
src/worldgen/biome_ocean.c.i:
|
||||
$(MAKE) -f CMakeFiles/omicron.dir/build.make CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.i
|
||||
.PHONY : src/worldgen/biome_ocean.c.i
|
||||
|
||||
src/worldgen/biome_ocean.s: src/worldgen/biome_ocean.c.s
|
||||
|
||||
.PHONY : src/worldgen/biome_ocean.s
|
||||
|
||||
# target to generate assembly for a file
|
||||
src/worldgen/biome_ocean.c.s:
|
||||
$(MAKE) -f CMakeFiles/omicron.dir/build.make CMakeFiles/omicron.dir/src/worldgen/biome_ocean.c.s
|
||||
.PHONY : src/worldgen/biome_ocean.c.s
|
||||
|
||||
src/worldgen/biome_rainforest.o: src/worldgen/biome_rainforest.c.o
|
||||
|
||||
.PHONY : src/worldgen/biome_rainforest.o
|
||||
|
|
@ -1286,6 +1313,9 @@ help:
|
|||
@echo "... src/worldgen/biome_mesa.o"
|
||||
@echo "... src/worldgen/biome_mesa.i"
|
||||
@echo "... src/worldgen/biome_mesa.s"
|
||||
@echo "... src/worldgen/biome_ocean.o"
|
||||
@echo "... src/worldgen/biome_ocean.i"
|
||||
@echo "... src/worldgen/biome_ocean.s"
|
||||
@echo "... src/worldgen/biome_rainforest.o"
|
||||
@echo "... src/worldgen/biome_rainforest.i"
|
||||
@echo "... src/worldgen/biome_rainforest.s"
|
||||
|
|
|
|||
26
README.md
26
README.md
|
|
@ -1,6 +1,4 @@
|
|||
## Omicron by azekill_DIABLO > pre-release 0.2
|
||||
|
||||
This game is a voxelly sandbox-game with procedurally generated world!
|
||||
## Omicron by azekill_DIABLO
|
||||
|
||||
Fork of CraftNG by Twetzel59 which is also a Fork of Michael Fogleman's Minecraft clone for Windows, Mac OS X and Linux.
|
||||
|
||||
|
|
@ -13,14 +11,14 @@ https://github.com/twetzel59/CraftNG/
|
|||
### Features
|
||||
|
||||
* Simple but nice looking terrain generation using perlin / simplex noise.
|
||||
* Over 60 blocks and more can be added with ease.
|
||||
* Over 70 blocks and more can be added with ease.
|
||||
* Supports plants (grass, flowers, trees, cactus) and transparency (glass).
|
||||
* Simple fluffy clouds in the sky (they don't move... Yet!).
|
||||
* Day / night cycles and a textured sky dome.
|
||||
* World changes persisted in a sqlite3 database.
|
||||
* Multiplayer support! (Well. Needs server first.)
|
||||
* An horrendous water system. (Disabled by default for good reasons).
|
||||
* Various biomes. (Including the newly created Mesa-Biome!)
|
||||
* Lakes and Water caves
|
||||
|
||||
|
||||
### Download
|
||||
|
|
@ -44,15 +42,15 @@ Download and install [CMake](http://www.cmake.org/cmake/resources/software.html)
|
|||
if you don't already have it. You may use [Homebrew](http://brew.sh) to simplify
|
||||
the installation:
|
||||
|
||||
`brew install cmake`
|
||||
brew install cmake
|
||||
|
||||
#### Linux (Ubuntu)
|
||||
|
||||
`sudo apt-get install cmake libglew-dev xorg-dev libcurl4-openssl-dev
|
||||
sudo apt-get build-dep glfw`
|
||||
sudo apt-get install cmake libglew-dev xorg-dev libcurl4-openssl-dev
|
||||
sudo apt-get build-dep glfw
|
||||
|
||||
*Under debian (tested under AntiX) it seems you need to run each install
|
||||
of the first line separately in order to install without errors.*
|
||||
*Under debian (tested under AntiX) it seems you need to run each install
|
||||
of the first line separately in order to install without errors.*
|
||||
|
||||
#### Windows
|
||||
|
||||
|
|
@ -64,17 +62,17 @@ CURL/lib and CURL/include are in your Program Files directory.
|
|||
|
||||
Use the following commands in place of the ones described in the next section.
|
||||
|
||||
`cmake -G "MinGW Makefiles"
|
||||
mingw32-make`
|
||||
cmake -G "MinGW Makefiles"
|
||||
mingw32-make
|
||||
|
||||
### Compile and Run
|
||||
|
||||
Once you have the dependencies (see above), install the sources and open the
|
||||
terminal in the dowloaded source directory. Run the following commands :
|
||||
|
||||
`cmake .
|
||||
cmake .
|
||||
make
|
||||
./craft`
|
||||
./omicron
|
||||
|
||||
### Multiplayer
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ void main() {
|
|||
}
|
||||
else {
|
||||
float camera_distance = distance(camera, vec3(position));
|
||||
fog_factor = pow(clamp(camera_distance / fog_distance, 0.0, 1.0), 3.0);
|
||||
fog_factor = pow(clamp(camera_distance / fog_distance, 0.0, 1.0), 6.0);
|
||||
float dy = position.y - camera.y;
|
||||
float dx = distance(position.xz, camera.xz);
|
||||
fog_height = (atan(dy, dx) + pi / 2) / pi;
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@
|
|||
// advanced parameters
|
||||
#define CREATE_CHUNK_RADIUS 10
|
||||
#define RENDER_CHUNK_RADIUS 6
|
||||
#define RENDER_SIGN_RADIUS 4
|
||||
#define RENDER_SIGN_RADIUS 6
|
||||
#define DELETE_CHUNK_RADIUS 14
|
||||
#define CHUNK_SIZE 32
|
||||
#define COMMIT_INTERVAL 5
|
||||
|
|
|
|||
|
|
@ -234,8 +234,8 @@ int is_transparent(int w) {
|
|||
switch (w) {
|
||||
case Item_EMPTY:
|
||||
case Item_GLASS:
|
||||
//case Item_LEAVES: for better performance (8 fps -> 60fps OPTIMIZATION NEEDED!)
|
||||
case Item_WATER: //Just to stop Xray-ing
|
||||
//case Item_LEAVES: //for better performance (8 fps -> 60fps OPTIMIZATION NEEDED!)
|
||||
//case Item_WATER: //Just to stop Xray-ing
|
||||
return 1;
|
||||
default:
|
||||
return 0;
|
||||
|
|
|
|||
62
src/main.c
62
src/main.c
|
|
@ -6,6 +6,7 @@
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
//#include <gtk.h>
|
||||
#include "attrib.h"
|
||||
#include "auth.h"
|
||||
|
|
@ -774,6 +775,19 @@ void occlusion(
|
|||
#define XYZ(x, y, z) ((y) * XZ_SIZE * XZ_SIZE + (x) * XZ_SIZE + (z))
|
||||
#define XZ(x, z) ((x) * XZ_SIZE + (z))
|
||||
|
||||
/**
|
||||
int get_block(int x, int y, int z) {
|
||||
int p = chunked(x);
|
||||
int q = chunked(z);
|
||||
Chunk *chunk = find_chunk(p, q);
|
||||
if (chunk) {
|
||||
Map *map = &chunk->map;
|
||||
return map_get(map, x, y, z);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
**/
|
||||
|
||||
void light_fill(
|
||||
char *opaque, char *light,
|
||||
int x, int y, int z, int w, int force)
|
||||
|
|
@ -837,7 +851,7 @@ void compute_chunk(WorkerItem *item) {
|
|||
int z = ez - oz;
|
||||
int w = ew;
|
||||
|
||||
// TODO: this should be unnecessary
|
||||
// TODO: this should be unnecessary (but as long it works :3)
|
||||
if (x < 0 || y < 0 || z < 0) {
|
||||
continue;
|
||||
}
|
||||
|
|
@ -845,7 +859,11 @@ void compute_chunk(WorkerItem *item) {
|
|||
continue;
|
||||
}
|
||||
// END TODO
|
||||
opaque[XYZ(x, y, z)] = !is_transparent(w);
|
||||
|
||||
//if (!is_liquid(get_block(x, y+1, z))) {
|
||||
opaque[XYZ(x, y, z)] = !is_transparent(w);
|
||||
//}
|
||||
|
||||
if (opaque[XYZ(x, y, z)]) {
|
||||
highest[XZ(x, z)] = MAX(highest[XZ(x, z)], y);
|
||||
}
|
||||
|
|
@ -1467,6 +1485,7 @@ void record_block(int x, int y, int z, int w) {
|
|||
g->block0.w = w;
|
||||
}
|
||||
|
||||
// Get_block was here
|
||||
int get_block(int x, int y, int z) {
|
||||
int p = chunked(x);
|
||||
int q = chunked(z);
|
||||
|
|
@ -1478,6 +1497,7 @@ int get_block(int x, int y, int z) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
void builder_block(int x, int y, int z, int w) {
|
||||
if (y <= 0 || y >= BUILD_HEIGHT_LIMIT) {
|
||||
return;
|
||||
|
|
@ -2410,10 +2430,20 @@ void handle_movement(double dt) {
|
|||
dy = 0.0f;
|
||||
}
|
||||
}
|
||||
} else if (is_liquid(w)) {
|
||||
} else if (is_liquid(w)) {
|
||||
|
||||
//vy = vy;
|
||||
if (is_jump_pressed) {
|
||||
dy = 2.5f;
|
||||
//dy = 0;
|
||||
|
||||
} else if (is_descend_pressed) {
|
||||
dy = -0.5f;
|
||||
//dy = 0;
|
||||
|
||||
}
|
||||
|
||||
vx = vx/1.2;
|
||||
//vy = vy/1.6;
|
||||
vz = vz/1.2;
|
||||
|
||||
}
|
||||
|
|
@ -2575,12 +2605,28 @@ void reset_model() {
|
|||
Inventory_reset(&g->inventory);
|
||||
}
|
||||
|
||||
void advance_cursor() {
|
||||
static int pos=0;
|
||||
char cursor[4]={'/','-','\\','|'};
|
||||
printf("> The game is running %c\r", cursor[pos]);
|
||||
fflush(stdout);
|
||||
//sleep(1);
|
||||
pos = (pos+1) % 4;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
// INITIALIZATION //
|
||||
curl_global_init(CURL_GLOBAL_DEFAULT);
|
||||
srand(time(NULL));
|
||||
rand();
|
||||
|
||||
|
||||
// TERMINAL TEST GUI //
|
||||
|
||||
// Header generated using -> https://fsymbols.com/generators/tarty/
|
||||
printf("\n▒█▀▀▀█ ▒█▀▄▀█ ▀█▀ ▒█▀▀█ ▒█▀▀█ ▒█▀▀▀█ ▒█▄░▒█ \n▒█░░▒█ ▒█▒█▒█ ▒█░ ▒█░░░ ▒█▄▄▀ ▒█░░▒█ ▒█▒█▒█ \n▒█▄▄▄█ ▒█░░▒█ ▄█▄ ▒█▄▄█ ▒█░▒█ ▒█▄▄▄█ ▒█░░▀█ \n a game by azekill_DIABLO\n\n");
|
||||
printf("> Press RETURN to start");
|
||||
getchar();
|
||||
|
||||
// WINDOW INITIALIZATION //
|
||||
if (!glfwInit()) {
|
||||
return -1;
|
||||
|
|
@ -2768,6 +2814,7 @@ int main(int argc, char **argv) {
|
|||
}
|
||||
|
||||
// BEGIN MAIN LOOP //
|
||||
|
||||
double previous = glfwGetTime();
|
||||
while (1) {
|
||||
if (INFINI_STUFF == 1) {
|
||||
|
|
@ -2948,10 +2995,13 @@ int main(int argc, char **argv) {
|
|||
g->mode_changed = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
// OUTPUT IN TERMINAL //
|
||||
advance_cursor();
|
||||
}
|
||||
|
||||
// SHUTDOWN //
|
||||
printf("\nOmicron: Game closing ... \n");
|
||||
printf("\n\n[Omicron] The game is closing ... Have a good day!\n");
|
||||
db_save_state(s->x, s->y, s->z, s->rx, s->ry);
|
||||
db_close();
|
||||
db_disable();
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ void generateBaseTerrain(int dx, int dz, int x, int z, int start_h, int h, int f
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Caves
|
||||
for (int y = 1; y < 38; y++) {
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@
|
|||
|
||||
void generateDesert(int dx, int dz, int x, int z, int start_h, int h, int flag, world_func func, void *arg) {
|
||||
for (int y = start_h; y < h; y++) {
|
||||
//int y = y / 1;
|
||||
|
||||
func(x, y, z, 2 * flag, arg);
|
||||
}
|
||||
|
||||
|
|
@ -17,7 +19,8 @@ void generateDesert(int dx, int dz, int x, int z, int start_h, int h, int flag,
|
|||
if (simplex2(-x * 0.1, z * 0.1, 3, 0.9, 2) > 0.85) {
|
||||
func(x, h, z, 67 * flag, arg);
|
||||
}
|
||||
|
||||
|
||||
// cactus
|
||||
int ok = 1;
|
||||
if (dx - 4 < 0 || dz - 4 < 0 ||
|
||||
dx + 4 >= CHUNK_SIZE || dz + 4 >= CHUNK_SIZE)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
#include "biome_ocean.h"
|
||||
#include "noise.h"
|
||||
#include "../config.h"
|
||||
#include "../item.h"
|
||||
|
||||
void generateOcean(int dx, int dz, int x, int z, int start_h, int h, int flag, world_func func, void *arg) {
|
||||
|
||||
for (int y = start_h; y < h; y++) {
|
||||
func(x, y, z, 2 * flag, arg);
|
||||
}
|
||||
|
||||
for (int yw = 32; yw < 37; yw++) {
|
||||
func(x, yw, z, Item_WATER * flag, arg);
|
||||
|
||||
if (simplex3(
|
||||
x * 0.001, yw * 0.003, z * 0.001, 6, 1, 1) > 0.7)
|
||||
{
|
||||
func(x, yw, z, Item_WATER * flag, arg);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
#ifndef _biome_ocean_h_
|
||||
#define _biome_ocean_h_
|
||||
|
||||
#include "world.h"
|
||||
|
||||
void generateOcean(int dx, int dz, int x, int z, int start_h, int h, int flag, world_func func, void *arg);
|
||||
|
||||
#endif // _biome_ocean_h_
|
||||
|
|
@ -4,6 +4,7 @@
|
|||
#include "../item.h"
|
||||
|
||||
void generateTemperate(int dx, int dz, int x, int z, int start_h, int h, int flag, world_func func, void *arg) {
|
||||
|
||||
for (int y = start_h; y < h - 1; y++) {
|
||||
//for (int y = 30; y = 37; y++) {
|
||||
//func(x, 37, z, Item_WATER * flag, arg);
|
||||
|
|
@ -29,7 +30,7 @@ void generateTemperate(int dx, int dz, int x, int z, int start_h, int h, int fla
|
|||
}
|
||||
|
||||
// rocks
|
||||
if (simplex2(x * 0.02, -z * 0.02, 4, 0.8, 2) > 0.75) {
|
||||
if (simplex2(-x * 0.01, z * 0.01, 1, 1, 1) * (simplex2(-x * 0.1, z * 0.1, 1, 0.8, 2)) > 0.64) {
|
||||
if (h > 72) {
|
||||
func(x, h-1, z, Item_STONE * flag, arg);
|
||||
func(x, h, z, Item_STONE * flag, arg);
|
||||
|
|
@ -89,4 +90,14 @@ void generateTemperate(int dx, int dz, int x, int z, int start_h, int h, int fla
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
// some wip ugly river don't touch the water is lava
|
||||
/*
|
||||
if (simplex2(-x * 0.001, z * 0.001, 4, 0.8, 2) > 0.7) {
|
||||
//if (h < 38) {
|
||||
func(x, h, z, 42 * flag, arg);
|
||||
//}
|
||||
}
|
||||
*/
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
#include <math.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include "../config.h"
|
||||
#include "../item.h"
|
||||
#include "noise.h"
|
||||
|
|
@ -9,7 +13,6 @@
|
|||
#include "biome_rainforest.h"
|
||||
#include "biome_taiga.h"
|
||||
#include "biome_mesa.h"
|
||||
#include <math.h>
|
||||
|
||||
void create_world(int p, int q, world_func func, void *arg) {
|
||||
int pad = 1;
|
||||
|
|
@ -21,16 +24,25 @@ void create_world(int p, int q, world_func func, void *arg) {
|
|||
}
|
||||
int x = p * CHUNK_SIZE + dx;
|
||||
int z = q * CHUNK_SIZE + dz;
|
||||
//float random = (rand() % 1024);
|
||||
//random = random/512.0; // Eat my decimal in the face
|
||||
//printf("%.2f\n", random);
|
||||
float f = simplex2(x * 0.01, z * 0.01, 4, 0.5, 2);
|
||||
float g = simplex2(-x * 0.01, -z * 0.01, 2, 0.9, 2);
|
||||
|
||||
|
||||
|
||||
// mh
|
||||
int mh = g * simplex2(-x * 0.001, -z * 0.001, 2, 16.0, 2);
|
||||
|
||||
mh += simplex2(-x * 0.0005, -z * 0.0005, 2, 16.0, 2) * simplex2(-x * 0.005, -z * 0.005, 2, 16.0, 2) * 100;
|
||||
|
||||
mh += 16;
|
||||
|
||||
int h = f * mh;
|
||||
|
||||
|
||||
|
||||
//2 other values are needed : a high one for
|
||||
//mountain-like biomes and other for oceans.
|
||||
|
||||
Biome biome = biome_at_pos(q, x, z);
|
||||
|
||||
|
|
@ -44,11 +56,13 @@ void create_world(int p, int q, world_func func, void *arg) {
|
|||
generateTaiga(dx, dz, x, z, 32, 32 + h, flag, func, arg);
|
||||
} else if(biome == Biome_MESA) {
|
||||
generateMesa(dx, dz, x, z, 32, 32 + h, flag, func, arg);
|
||||
}
|
||||
} //else if(biome == Biome_OCEAN) {
|
||||
// generateOcean(dx, dz, x, z, 32, 32 + h, flag, func, arg);
|
||||
//}
|
||||
|
||||
generateBaseTerrain(dx, dz, x, z, 0, 32, flag, func, arg);
|
||||
//generateBaseTerrain(dx, dz, x, z, 32, 32 + h, flag, func, arg);
|
||||
|
||||
generateBaseTerrain(dx, dz, x, z, 0, 32, flag, func, arg); //the good
|
||||
//generateBaseTerrain(dx, dz, x, z, 32, 32 + h, flag, func, arg); //the evil
|
||||
|
||||
|
||||
// clouds
|
||||
for (int y = 120; y < 200; y++) {
|
||||
|
|
@ -58,17 +72,49 @@ void create_world(int p, int q, world_func func, void *arg) {
|
|||
func(x, y, z, 16 * flag, arg);
|
||||
}
|
||||
}
|
||||
|
||||
// Lakes
|
||||
|
||||
for (int y = 30; y < 37; y++) {
|
||||
float coef = 1.1 - y/62.0;
|
||||
if (simplex2(x * 0.00091, z * 0.00091, 6, 1, 2) > coef) {
|
||||
func(x, y, z, Item_WATER * flag, arg);
|
||||
}
|
||||
}
|
||||
|
||||
for (int y = 37; y < 45; y++) {
|
||||
float coef = y/70.0;
|
||||
if (simplex2(x * 0.00091, z * 0.00091, 6, 1, 2) > coef) {
|
||||
func(x, y, z, Item_EMPTY * flag, arg);
|
||||
}
|
||||
}
|
||||
|
||||
/* Ocean (upscaled lakes) Too big too much hills. need mapgen tweaks.
|
||||
|
||||
for (int y = 30; y < 37; y++) {
|
||||
float coef = (1.1 - y/62.0)+0.5;
|
||||
if (simplex2(x * 0.00008, z * 0.00008, 6, 1, 2) > coef) {
|
||||
func(x, y, z, Item_WATER * flag, arg);
|
||||
}
|
||||
}
|
||||
|
||||
for (int y = 37; y < 45; y++) {
|
||||
float coef = (y/70.0)+0.4;
|
||||
if (simplex2(x * 0.00008, z * 0.00008, 6, 1, 2) > coef) {
|
||||
func(x, y, z, Item_EMPTY * flag, arg);
|
||||
}
|
||||
} */
|
||||
|
||||
/* Flying dirt patches = bad idea
|
||||
for (int yb = 170; yb < 255; yb++) {
|
||||
/* rivers wip
|
||||
for (int yb = 30; yb < 37; yb++) {
|
||||
if (simplex3(
|
||||
x * 0.002, yb * 0.004, z * 0.002, 7, 0.5, 2) > 0.80)
|
||||
x * 0.02, yb * 0.004, z * 0.02, 8, 1.5, 1) > 0.6)
|
||||
{
|
||||
//if (x > 100 && x < -100 && z > 100 && z < -100) {
|
||||
func(x, yb, z, Item_DIRT * flag, arg);
|
||||
func(x, yb, z, Item_WATER * flag, arg);
|
||||
//}
|
||||
}
|
||||
}*/
|
||||
} */
|
||||
|
||||
// Unbreakable Core shell
|
||||
func(x, 0, z, Item_CORESHELL * flag, arg);
|
||||
|
|
@ -79,9 +125,19 @@ void create_world(int p, int q, world_func func, void *arg) {
|
|||
}
|
||||
|
||||
|
||||
|
||||
//for (int x = 0; x < 5; x++) {
|
||||
// for (int y = 37; y < 42; y++) {
|
||||
// func(42 + x, y, 42, Item_CORESHELL * flag, arg);
|
||||
// func(42 + x, y, 43, Item_CORESHELL * flag, arg);
|
||||
// }
|
||||
//}
|
||||
|
||||
|
||||
|
||||
// Buildings
|
||||
|
||||
// Brick Pyramid
|
||||
// Brick Mess
|
||||
//for (int b = 50; b < 100; b++) {
|
||||
// func(b, b, b, Item_BRICK * flag, arg);
|
||||
//}
|
||||
|
|
@ -106,8 +162,11 @@ Biome biome_at_pos(int q, int x, int z) {
|
|||
if(biomen > (4.0f/5.0f)) {
|
||||
biome = Biome_TAIGA;
|
||||
}
|
||||
if(biome == Biome_max) {
|
||||
if(biome == (Biome_max)) {
|
||||
biome = Biome_MESA;
|
||||
}
|
||||
//if(biome == (Biome_max)) {
|
||||
// biome = Biome_OCEAN;
|
||||
//}
|
||||
return biome;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue