From 0a703b5f8bf843fa10ab0134d8c27f1ea2c5293b Mon Sep 17 00:00:00 2001 From: Miguel Angel Astor Romero Date: Thu, 6 Mar 2014 03:23:40 -0430 Subject: [PATCH] Removed libisland files. --- Makefile | 2 +- include/island.h | 63 ----------------------------------------------- lib/libisland.a | Bin 4796 -> 0 bytes 3 files changed, 1 insertion(+), 64 deletions(-) delete mode 100644 include/island.h delete mode 100644 lib/libisland.a diff --git a/Makefile b/Makefile index 915c81d..2fb9cbb 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ OBJECTS = obj/main.o obj/game_state.o obj/in_game.o obj/map.o TARGET = bin/cyjam CFLAGS = -Wall -I./include -std=c99 LDFLAGS = -L./lib -LDLIBS = -lm -lisland -lfov -lncursesw +LDLIBS = -lm -lfov -lncursesw all: CFLAGS += -O3 all: $(TARGET) diff --git a/include/island.h b/include/island.h deleted file mode 100644 index f4b9bd4..0000000 --- a/include/island.h +++ /dev/null @@ -1,63 +0,0 @@ -/** - * Copyright (c) 2014, Miguel Angel Astor Romero. All rights reserved. - * See the file LICENSE for more details. - */ - -#ifndef ISLAND_H -#define ISLAND_H - -#ifdef __cplusplus -extern "C" { -#endif - -typedef enum TERRAIN_TYPE { DEEP_WATER, - SHALLOW_WATER, - SAND, - GRASS, - FOREST, - HILL, - MOUNTAIN - } terrain_t; - - /** - * Generate a diamond-square fractal map. - */ - extern void ds ( float ***, const unsigned int ); - - /** - * Generate a mask using particle deposition. - */ - extern void island ( int ***, unsigned int ); - - /** - * Normalize a float matrix between 0 and 1. - */ - extern void norm ( float ***, unsigned int ); - - /** - * Normalize an int matrix between 0 and 255. - */ - extern void normInt ( int ***, unsigned int ); - - /** - * Perform a 3x3 average blur. - */ - extern void smooth ( int ***, unsigned int ); - - /** - * Multiply the diamond square map with the island mask. - * Both matrices must have been normalized before. - */ - extern void mult ( float ***, int ***, unsigned int ); - - /** - * Given a sample from a heightmap, return the terrain - * type that correspond it. - */ - terrain_t terrainType( int ); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/lib/libisland.a b/lib/libisland.a deleted file mode 100644 index 7e247dc5b16630c1236d530d79e99e53e8dae0bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4796 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