commit b2acceb4b926c14a531dd1729f6800c39b039007 Author: Alan Youngblood Date: Fri Jan 29 21:14:20 2021 -0500 first commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3bef3bc --- /dev/null +++ b/.gitignore @@ -0,0 +1,92 @@ +# ---> KDevelop4 +*.kdev4 +.kdev4/ + +# ---> C++ +# Prerequisites +*.d + +# Compiled Object files +*.slo +*.lo +*.o +*.obj + +# Precompiled Headers +*.gch +*.pch + +# Compiled Dynamic libraries +*.so +*.dylib +*.dll + +# Fortran module files +*.mod +*.smod + +# Compiled Static libraries +*.lai +*.la +*.a +*.lib + +# Executables +*.exe +*.out +*.app + +# ---> C +# Prerequisites +*.d + +# Object files +*.o +*.ko +*.obj +*.elf + +# Linker output +*.ilk +#*.map +*.exp + +# Precompiled Headers +*.gch +*.pch + +# Libraries +*.lib +*.a +*.la +*.lo + +# Shared objects (inc. Windows DLLs) +*.dll +*.so +*.so.* +*.dylib + +# Executables +*.exe +*.out +*.app +*.i*86 +*.x86_64 +*.hex + +# Debug files +*.dSYM/ +*.su +*.idb +*.pdb + +# Kernel Module Compile Results +*.mod* +*.cmd +.tmp_versions/ +modules.order +Module.symvers +Mkfile.old +dkms.conf + diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..204b93d --- /dev/null +++ b/LICENSE @@ -0,0 +1,19 @@ +MIT License Copyright (c) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS +OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..42bcb3e --- /dev/null +++ b/Makefile @@ -0,0 +1,46 @@ +# Special Thanks to Job Vranish at Atomic Object for the base Makefile that was modified slightly to work with this project's needs +# https://spin.atomicobject.com/2016/08/26/makefile-c-projects/ +TARGET_EXEC ?= BeagleRescue + +BUILD_DIR ?= ./build +SRC_DIRS ?= ./src + +SRCS := $(shell find $(SRC_DIRS) -name *.cpp -or -name *.c -or -name *.s) +OBJS := $(SRCS:%=$(BUILD_DIR)/%.o) +DEPS := $(OBJS:.o=.d) + +INC_DIRS := $(shell find $(SRC_DIRS) -type d) +INC_FLAGS := $(addprefix -I,$(INC_DIRS)) + +CPPFLAGS ?= $(INC_FLAGS) -MMD -MP -w + +LINKER_FLAGS = -lSDL2 -lSDL2_image -lSDL2_mixer + +$(BUILD_DIR)/$(TARGET_EXEC): $(OBJS) +# $(CC) $(OBJS) -o $@ $(LDFLAGS) + $(CXX) $(OBJS) $(LINKER_FLAGS) -o $@ + +# assembly +$(BUILD_DIR)/%.s.o: %.s + $(MKDIR_P) $(dir $@) + $(AS) $(ASFLAGS) -c $< -o $@ + +# c source +$(BUILD_DIR)/%.c.o: %.c + $(MKDIR_P) $(dir $@) + $(CXX) $(CPPFLAGS) $(CFLAGS) $(LINKER_FLAGS) -c $< -o $@ + +# c++ source +$(BUILD_DIR)/%.cpp.o: %.cpp + $(MKDIR_P) $(dir $@) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LINKER_FLAGS) -c $< -o $@ + + +.PHONY: clean + +clean: + $(RM) -r $(BUILD_DIR) + +-include $(DEPS) + +MKDIR_P ?= mkdir -p diff --git a/README.md b/README.md new file mode 100644 index 0000000..c4f71af --- /dev/null +++ b/README.md @@ -0,0 +1,16 @@ +# README.md +=== + +<<<<<<< HEAD +# Beagle Rescue Game +--- +Global Game Jam 2021 theme: Lost and Found +A 2D platformer where you rescue lost puppies +By: +Alan Youngblood +Simon Zaleski +======= +# Graveyard Shift Game +--- +This is a project that was originally started with the Q3 2019 ClockworkPi Game Jam. The theme was "Shift" and this game idea is essentially a tower defense where you play as an owl that sets traps during the day then during the "Graveyard Shift" at night robber rodents try to steal treasure from the burial sites. The owl can also do a swoop attack to scare off the rodents during the night time. Traps can only be set during the day. +>>>>>>> origin/master diff --git a/assets/ColTex.png b/assets/ColTex.png new file mode 100644 index 0000000..4bb3142 Binary files /dev/null and b/assets/ColTex.png differ diff --git a/assets/CollisionLayer.txt b/assets/CollisionLayer.txt new file mode 100644 index 0000000..27abfcd --- /dev/null +++ b/assets/CollisionLayer.txt @@ -0,0 +1,69 @@ +tileswide 40 +tileshigh 30 +tilewidth 16 +tileheight 16 + +layer 0 +34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34, +34,34,34,34,34,34,34,34,34,34,34,43,52,52,52,52,52,44,34,34,34,34,34,43,52,52,52,52,52,52,52,52,44,34,34,34,34,34,34,34, +34,34,34,39,52,52,44,34,34,34,34,50,82,15,16,17,82,48,34,34,34,34,34,50,82,82,82,82,82,82,82,82,51,52,44,34,34,34,34,34, +34,34,39,38,82,82,36,52,52,44,34,50,82,18,19,20,82,48,34,34,34,34,34,50,82,82,82,82,82,82,82,82,82,82,48,34,34,34,34,34, +34,39,38,0,1,1,2,82,82,48,34,28,47,21,22,23,82,48,34,34,34,34,34,50,82,82,82,82,82,82,82,82,82,82,51,44,34,34,34,34, +34,50,82,3,4,4,11,2,82,51,44,34,41,46,47,82,30,29,34,34,34,34,39,38,82,82,82,82,82,82,82,82,82,82,82,48,34,34,34,34, +34,50,82,3,4,4,4,5,82,30,29,34,34,34,50,82,48,34,34,34,34,34,50,82,82,82,82,82,82,82,82,82,82,82,82,51,52,44,34,34, +34,50,82,6,7,7,7,8,30,29,34,34,34,34,50,82,48,34,34,34,39,52,38,82,82,82,82,82,82,82,82,82,82,82,82,82,82,48,34,34, +34,28,56,82,82,82,82,30,29,34,34,34,39,52,38,82,48,34,34,34,50,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,48,34,34, +34,34,59,82,82,82,30,29,34,34,34,39,38,82,82,82,51,44,34,34,28,56,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,51,44,34, +34,34,28,32,82,82,51,52,52,52,52,38,82,82,82,82,82,48,34,34,34,28,56,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,48,34, +34,34,34,28,46,46,46,46,46,56,82,82,82,82,82,82,30,29,34,34,34,34,28,56,82,82,82,82,82,82,82,82,82,82,82,82,82,30,29,34, +34,34,34,34,34,34,34,34,39,38,82,82,82,82,82,30,29,34,34,34,34,34,34,28,46,46,56,82,82,82,82,82,82,82,30,46,46,29,34,34, +34,34,34,34,34,34,34,34,28,46,46,46,56,30,46,29,34,34,34,34,34,34,34,34,34,34,28,46,46,46,46,46,46,46,29,34,34,34,34,34, +34,34,34,34,34,34,34,34,34,34,34,34,59,48,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34, +34,34,34,34,34,34,34,34,34,34,34,34,59,48,34,34,34,34,34,34,34,34,34,34,34,34,34,34,39,52,52,52,52,52,52,44,34,34,34,34, +34,34,34,34,34,34,34,34,34,39,52,52,38,51,52,52,52,52,44,34,34,34,34,34,34,39,52,52,38,82,82,82,82,82,82,51,44,34,34,34, +34,34,34,34,34,39,52,52,52,38,82,82,82,82,82,82,82,82,51,52,52,44,34,34,39,38,82,82,82,82,82,82,82,82,82,82,51,44,34,34, +34,34,34,39,52,38,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,51,52,52,38,82,82,82,82,82,82,82,82,82,82,82,82,51,44,34, +34,34,39,38,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,48,34, +34,39,38,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,48,34, +34,50,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,30,46,46,29,34, +34,50,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,30,29,34,34,34,34, +34,50,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,30,46,46,56,82,82,82,82,82,82,82,30,29,34,34,34,34,34, +34,28,32,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,30,46,46,29,34,34,28,46,46,46,56,82,82,30,29,34,34,34,34,34,34, +34,34,28,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,29,34,34,34,34,34,34,34,34,34,28,46,46,29,34,34,34,34,34,34,34, +34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34, +34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34, +34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34, +34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34, + +layer 1 +0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0 +0,0,0,1,1,1,1,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0 +0,0,1,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0 +0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0 +1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0 +1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0 +1,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0 +1,0,0,0,0,0,0,0,0,0,1,0,1,1,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0 +1,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0 +0,1,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +0,0,0,1,1,1,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0 +0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,1,1,1,0,0 +0,0,0,0,0,0,0,0,1,1,1,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0,0 +0,0,0,0,0,0,0,0,0,1,1,1,0,0,1,1,1,1,1,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,1,0,0,0 +0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0 +0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,1,1,1,1,0,0,0,0,1,0,0,0,0,0,0 +0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0 +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + diff --git a/assets/audio/music/sailing16.ogg b/assets/audio/music/sailing16.ogg new file mode 100644 index 0000000..b5e6c60 Binary files /dev/null and b/assets/audio/music/sailing16.ogg differ diff --git a/assets/audio/sfx/bwoop.wav b/assets/audio/sfx/bwoop.wav new file mode 100644 index 0000000..4d7e121 Binary files /dev/null and b/assets/audio/sfx/bwoop.wav differ diff --git a/assets/maps/GS-Day.txt b/assets/maps/GS-Day.txt new file mode 100644 index 0000000..0a53468 --- /dev/null +++ b/assets/maps/GS-Day.txt @@ -0,0 +1,33 @@ +50,48,48,48,48,48,48,49,44,43,46,44,47,48,48,48,48,48,48,48,52,45,45,45,45,45,45,45,45,50,48,48,48,48,48,48,49,44,46,43,44,47,48,48,48,48,48,52 +53,45,37,38,45,37,38,45,44,43,43,44,46,37,38,44,37,38,44,44,54,45,37,38,45,45,37,38,45,53,46,44,37,38,44,37,38,44,46,43,44,37,38,44,37,38,44,54 +53,45,18,19,45,18,19,45,46,43,43,44,46,18,19,46,18,19,46,44,54,44,18,19,44,44,18,19,44,53,46,44,18,19,44,18,19,44,43,43,44,18,19,44,18,19,44,54 +53,45,45,46,45,46,44,44,46,43,43,44,44,44,44,44,46,44,44,44,54,44,44,44,44,44,44,44,44,53,46,44,44,44,44,44,44,44,43,43,44,44,44,44,44,44,44,54 +53,45,44,44,44,44,44,44,44,43,43,46,46,44,44,44,44,44,44,44,47,48,48,48,48,48,48,48,48,49,44,45,44,44,45,44,44,45,43,43,45,44,44,45,44,44,45,54 +53,45,44,44,46,44,44,44,44,43,43,46,44,44,44,44,44,44,44,44,44,44,44,44,46,44,44,44,44,44,44,45,44,44,45,44,44,45,43,43,45,44,44,45,44,44,45,54 +53,43,43,43,43,43,43,43,43,43,46,43,43,43,43,43,43,43,43,44,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,54 +53,44,37,38,44,37,38,44,44,46,43,44,46,43,43,46,46,44,44,43,43,43,43,43,43,46,43,43,43,43,43,44,43,43,43,43,44,43,43,43,44,37,38,44,37,38,44,54 +53,44,18,19,44,18,19,44,44,44,46,44,46,46,44,44,44,44,59,56,56,56,56,56,56,56,56,56,56,56,58,44,44,44,44,44,44,43,46,43,44,18,19,44,18,19,44,54 +53,44,44,44,44,46,46,44,44,43,46,44,46,46,44,44,44,44,60,48,48,48,48,48,48,48,48,48,48,48,49,44,44,44,46,46,44,44,43,43,44,44,44,44,44,44,44,54 +53,44,44,44,46,46,46,44,44,43,43,44,44,44,46,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,46,46,44,44,44,44,43,43,44,44,44,44,44,44,44,54 +49,44,44,46,46,46,44,44,43,43,43,46,46,43,44,46,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,46,46,46,44,44,44,44,43,46,44,44,44,44,44,44,44,47 +44,46,46,44,44,46,46,44,44,43,43,43,43,46,43,43,43,46,43,44,44,44,44,44,44,44,44,44,44,44,44,44,46,44,44,44,44,44,43,43,44,44,44,44,44,44,44,44 +44,44,43,46,44,44,44,46,43,43,43,43,43,43,45,45,45,45,45,43,44,44,44,44,44,44,44,44,44,44,44,44,44,44,43,43,43,43,43,43,43,43,43,43,43,43,44,44 +43,43,43,43,43,43,43,43,43,43,43,43,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,43,43,43,43,43,43,43,43,43,43,43,43,43,43,44 +43,43,43,43,43,43,43,43,43,43,43,43,43,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,43,43,43,43,43,43,43,43,43,43,43,43,44 +46,44,44,43,46,43,46,44,43,43,43,44,44,44,44,44,44,44,44,45,45,45,45,45,45,45,45,45,45,44,44,44,44,44,44,44,44,44,43,43,44,44,44,44,44,43,44,44 +58,44,44,44,44,44,44,44,44,43,43,44,50,51,51,51,51,52,44,44,45,45,45,45,45,45,46,45,44,44,44,50,51,51,51,51,52,44,43,46,44,44,44,44,44,44,44,59 +53,44,44,44,44,44,44,44,44,43,44,44,53,44,44,44,44,54,44,44,46,46,44,44,44,44,46,46,44,44,44,53,44,44,44,44,54,44,43,43,44,44,44,44,44,44,44,54 +53,44,37,38,44,37,38,44,44,43,43,43,53,44,44,44,44,54,44,44,44,46,46,44,44,46,46,44,44,44,44,53,44,44,44,44,54,44,43,43,44,44,44,44,44,44,44,54 +53,44,18,19,44,18,19,44,44,43,43,44,55,56,58,44,44,54,44,44,44,44,44,44,46,44,44,44,44,44,44,53,44,44,59,56,57,44,43,43,43,44,37,38,44,37,38,54 +53,44,44,44,44,44,44,44,44,46,43,44,44,44,53,44,44,54,44,37,38,44,44,44,44,44,44,44,37,38,44,53,44,44,54,44,44,44,43,44,44,44,18,19,45,18,19,54 +53,44,44,44,44,44,44,44,44,43,44,44,44,44,55,56,56,57,44,18,19,44,37,38,44,37,38,44,18,19,44,55,56,56,57,44,44,44,43,43,44,45,45,45,45,45,45,54 +53,44,44,44,44,44,44,44,44,43,43,44,44,44,44,44,44,44,44,44,44,44,18,19,44,18,19,44,44,44,44,44,44,44,44,44,44,44,43,43,44,45,45,45,45,45,45,54 +53,44,44,44,44,44,44,44,44,43,43,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,46,43,44,45,45,45,45,45,45,54 +53,44,37,38,44,37,38,44,44,43,43,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,43,43,44,45,37,38,45,37,38,54 +53,44,18,19,43,18,19,44,44,46,43,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,43,43,43,44,45,18,19,45,18,19,54 +53,44,44,44,44,44,44,44,44,43,44,44,46,46,43,43,43,43,43,43,43,43,43,43,43,43,43,46,43,43,43,46,43,44,44,44,44,43,43,43,44,45,45,45,45,45,44,54 +53,44,44,44,44,44,44,44,44,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,44,44,44,44,44,44,44,54 +53,44,44,44,44,44,44,44,44,44,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,46,43,43,44,44,44,44,44,44,44,54 +53,44,44,43,44,44,44,44,44,43,43,44,44,44,44,44,43,43,43,43,43,44,44,46,46,46,43,43,43,43,43,44,44,44,46,44,44,46,43,43,44,44,44,44,44,44,44,54 +55,56,56,56,56,56,56,58,44,43,43,44,59,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,58,44,43,43,44,59,56,56,56,56,56,57 + diff --git a/assets/maps/GS-Night-Meta.txt b/assets/maps/GS-Night-Meta.txt new file mode 100644 index 0000000..bd14448 --- /dev/null +++ b/assets/maps/GS-Night-Meta.txt @@ -0,0 +1,6 @@ +tileswide 48 +tileshigh 32 +tilewidth 16 +tileheight 16 + +layer 1 diff --git a/assets/maps/GS-Night.map b/assets/maps/GS-Night.map new file mode 100644 index 0000000..40ccd7b --- /dev/null +++ b/assets/maps/GS-Night.map @@ -0,0 +1,65 @@ +00,01,01,01,01,01,01,06,07,03,09,07,08,01,01,01,01,01,01,01,02,14,14,14,14,14,14,14,14,00,01,01,01,01,01,01,06,07,09,03,07,08,01,01,01,01,01,02 +12,14,14,14,14,14,14,14,07,03,03,07,09,09,07,07,07,07,07,07,13,14,07,07,14,14,07,07,14,12,09,07,07,07,07,07,07,07,09,03,07,07,07,07,07,07,07,13 +12,14,14,14,14,07,07,14,09,03,03,07,09,07,07,09,07,07,09,07,13,07,07,07,07,07,07,07,07,12,09,07,07,07,07,07,07,07,03,03,07,07,07,07,07,07,07,13 +12,14,14,09,14,09,07,07,09,03,03,07,07,07,07,07,09,07,07,07,13,07,07,07,07,07,07,07,07,12,09,07,07,07,07,07,07,07,03,03,07,07,07,07,07,07,07,13 +12,14,07,07,07,07,07,07,07,03,03,09,09,07,07,07,07,07,07,07,08,01,01,01,01,01,01,01,01,06,07,14,07,07,14,07,07,14,03,03,14,07,07,14,07,07,14,13 +12,14,07,07,09,07,07,07,07,03,03,09,07,07,07,07,07,07,07,07,07,07,07,07,09,07,07,07,07,07,07,14,07,07,14,07,07,14,03,03,14,07,07,14,07,07,14,13 +12,03,03,03,03,03,03,03,03,03,09,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,13 +12,07,07,07,07,09,09,07,07,09,03,07,09,03,03,09,09,07,07,03,03,03,03,03,03,09,03,03,03,03,03,07,03,03,03,03,07,03,03,03,07,07,07,07,07,07,07,13 +12,07,07,07,07,07,07,07,07,07,09,07,09,09,07,07,07,07,19,24,24,24,24,24,24,24,24,24,24,24,18,07,07,07,07,07,07,03,09,03,07,07,07,07,07,07,07,13 +12,07,07,07,07,09,09,07,07,03,09,07,09,09,07,07,07,07,08,01,01,01,01,01,01,01,01,01,01,01,06,07,07,07,09,09,07,07,03,03,07,07,07,07,07,07,07,13 +12,07,07,07,09,09,09,07,07,03,03,07,07,07,09,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,09,09,07,07,07,07,03,03,07,07,07,07,07,07,07,13 +06,07,07,09,09,09,07,07,03,03,03,09,09,03,07,09,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,09,09,09,07,07,07,07,03,09,07,07,07,07,07,07,07,08 +07,09,09,07,07,09,09,07,07,03,03,03,03,09,03,03,03,09,03,07,07,07,07,07,07,07,07,07,07,07,07,07,09,07,07,07,07,07,03,03,07,07,07,07,07,07,07,07 +07,07,03,09,07,07,07,09,03,03,03,03,07,07,14,14,14,14,14,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,03,03,03,03,03,03,03,03,03,03,03,03,07,07 +03,03,03,03,03,03,03,03,03,03,03,03,03,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,03,03,03,03,03,03,03,03,03,03,03,03,03,03,07 +03,03,03,03,03,03,03,03,03,03,03,03,03,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,03,03,03,03,03,03,03,03,03,03,03,03,07 +09,07,07,03,09,03,09,07,03,03,03,07,07,07,07,07,07,07,07,14,14,14,14,14,14,14,14,14,14,07,07,07,07,07,07,07,07,07,03,03,07,07,07,07,07,03,07,07 +18,07,07,07,07,07,07,07,07,03,03,07,00,01,01,01,01,02,07,07,14,14,14,14,14,14,09,14,07,07,07,00,01,01,01,01,02,07,03,09,07,07,07,07,07,07,07,19 +12,07,07,07,07,07,07,07,07,03,07,07,12,07,07,07,07,13,07,07,09,09,07,07,07,07,09,09,07,07,07,12,07,07,07,07,13,07,03,03,07,07,07,07,07,07,07,13 +12,07,07,07,07,07,07,07,07,03,03,03,12,07,07,07,07,13,07,07,07,09,09,07,07,09,09,07,07,07,07,12,07,07,07,07,13,07,03,03,07,07,07,07,07,07,07,13 +12,07,07,07,07,07,07,07,07,03,03,07,17,24,18,07,07,13,07,07,07,07,07,07,09,07,07,07,07,07,07,12,07,07,19,24,20,07,03,03,03,07,07,07,07,07,07,13 +12,07,07,07,07,07,07,07,07,09,03,07,07,07,12,07,07,13,07,07,07,07,07,07,07,07,07,07,07,07,07,12,07,07,13,07,07,07,03,07,07,07,14,14,14,14,07,13 +12,07,07,07,07,07,07,07,07,03,07,07,07,07,17,24,24,20,07,07,07,07,07,07,07,07,07,07,07,07,07,17,24,24,20,07,07,07,03,03,07,14,14,14,14,14,14,13 +12,07,07,07,07,07,07,07,07,03,03,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,03,03,07,14,14,14,14,14,14,13 +12,07,07,07,07,07,07,07,07,03,03,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,09,03,07,14,14,14,14,14,14,13 +12,07,07,07,07,07,07,07,07,03,03,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,03,03,07,14,14,14,14,14,14,13 +12,07,07,07,03,07,07,07,07,09,03,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,03,03,03,07,14,14,14,14,14,14,13 +12,07,07,07,07,07,07,07,07,03,07,07,09,09,03,03,03,03,03,03,03,03,03,03,03,03,03,09,03,03,03,09,03,07,07,07,07,03,03,03,07,14,14,14,14,14,07,13 +12,07,07,07,07,07,07,07,07,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,07,07,07,07,07,07,07,13 +12,07,07,07,07,07,07,07,07,07,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,09,03,03,07,07,07,07,07,07,07,13 +12,07,07,03,07,07,07,07,07,03,03,07,07,07,07,07,03,03,03,03,03,07,07,09,09,09,03,03,03,03,03,07,07,07,09,07,07,09,03,03,07,07,07,07,07,07,07,13 +17,24,24,24,24,24,24,18,07,03,03,07,19,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,18,07,03,03,07,19,24,24,24,24,24,20 + +1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 +1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 diff --git a/assets/maps/GS-Night.txt b/assets/maps/GS-Night.txt new file mode 100644 index 0000000..84ce0a8 --- /dev/null +++ b/assets/maps/GS-Night.txt @@ -0,0 +1,33 @@ +61,62,62,62,62,62,62,65,66,64,68,66,67,62,62,62,62,62,62,62,63,10,10,10,10,10,10,10,10,61,62,62,62,62,62,62,65,66,68,64,66,67,62,62,62,62,62,63 +42,10,15,16,10,15,16,10,66,64,64,66,68,15,16,66,15,16,66,66,69,10,15,16,10,10,15,16,10,42,68,66,15,16,66,15,16,66,68,64,66,15,16,66,15,16,66,69 +42,10,18,19,10,18,19,10,68,64,64,66,68,18,19,68,18,19,68,66,69,66,18,19,66,66,18,19,66,42,68,66,18,19,66,18,19,66,64,64,66,18,19,66,18,19,66,69 +42,10,10,68,10,68,66,66,68,64,64,66,66,66,66,66,68,66,66,66,69,66,66,66,66,66,66,66,66,42,68,66,66,66,66,66,66,66,64,64,66,66,66,66,66,66,66,69 +42,10,66,66,66,66,66,66,66,64,64,68,68,66,66,66,66,66,66,66,67,62,62,62,62,62,62,62,62,65,66,10,66,66,10,66,66,10,64,64,10,66,66,10,66,66,10,69 +42,10,66,66,68,66,66,66,66,64,64,68,66,66,66,66,66,66,66,66,66,66,66,66,68,66,66,66,66,66,66,10,66,66,10,66,66,10,64,64,10,66,66,10,66,66,10,69 +42,64,64,64,64,64,64,64,64,64,68,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,69 +42,66,15,16,66,15,16,66,66,68,64,66,68,64,64,68,68,66,66,64,64,64,64,64,64,68,64,64,64,64,64,66,64,64,64,64,66,64,64,64,66,15,16,66,15,16,66,69 +42,66,18,19,66,18,19,66,66,66,68,66,68,68,66,66,66,66,13,17,17,17,17,17,17,17,17,17,17,17,12,66,66,66,66,66,66,64,68,64,66,18,19,66,18,19,66,69 +42,66,66,66,66,68,68,66,66,64,68,66,68,68,66,66,66,66,67,62,62,62,62,62,62,62,62,62,62,62,65,66,66,66,68,68,66,66,64,64,66,66,66,66,66,66,66,69 +42,66,66,66,68,68,68,66,66,64,64,66,66,66,68,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,68,68,66,66,66,66,64,64,66,66,66,66,66,66,66,69 +65,66,66,68,68,68,66,66,64,64,64,68,68,64,66,68,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,68,68,68,66,66,66,66,64,68,66,66,66,66,66,66,66,67 +66,68,68,66,66,68,68,66,66,64,64,64,64,68,64,64,64,68,64,66,66,66,66,66,66,66,66,66,66,66,66,66,68,66,66,66,66,66,64,64,66,66,66,66,66,66,66,66 +66,66,64,68,66,66,66,68,64,64,64,64,66,66,10,10,10,10,10,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,64,64,64,64,64,64,64,64,64,64,64,64,66,66 +64,64,64,64,64,64,64,64,64,64,64,64,64,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,64,64,64,64,64,64,64,64,64,64,64,64,64,64,66 +64,64,64,64,64,64,64,64,64,64,64,64,64,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,64,64,64,64,64,64,64,64,64,64,64,64,66 +68,66,66,64,68,64,68,66,64,64,64,66,66,66,66,66,66,66,66,10,10,10,10,10,10,10,10,10,10,66,66,66,66,66,66,66,66,66,64,64,66,66,66,66,66,64,66,66 +12,66,66,66,66,66,66,66,66,64,64,66,61,62,62,62,62,63,66,66,10,10,10,10,10,10,68,10,66,66,66,61,62,62,62,62,63,66,64,68,66,66,66,66,66,66,66,13 +42,66,66,66,66,66,66,66,66,64,66,66,42,66,66,66,66,69,66,66,68,68,66,66,66,66,68,68,66,66,66,42,66,66,66,66,69,66,64,64,66,66,66,66,66,66,66,69 +42,66,15,16,66,15,16,66,66,64,64,64,42,66,66,66,66,69,66,66,66,68,68,66,66,68,68,66,66,66,66,42,66,66,66,66,69,66,64,64,66,66,66,66,66,66,66,69 +42,66,18,19,66,18,19,66,66,64,64,66,11,17,12,66,66,69,66,66,66,66,66,66,68,66,66,66,66,66,66,42,66,66,13,17,14,66,64,64,64,66,15,16,66,15,16,69 +42,66,66,66,66,66,66,66,66,68,64,66,66,66,42,66,66,69,66,15,16,66,66,66,66,66,66,66,15,16,66,42,66,66,69,66,66,66,64,66,66,66,18,19,10,18,19,69 +42,66,66,66,66,66,66,66,66,64,66,66,66,66,11,17,17,14,66,18,19,66,15,16,66,15,16,66,18,19,66,11,17,17,14,66,66,66,64,64,66,10,10,10,10,10,10,69 +42,66,66,66,66,66,66,66,66,64,64,66,66,66,66,66,66,66,66,66,66,66,18,19,66,18,19,66,66,66,66,66,66,66,66,66,66,66,64,64,66,10,10,10,10,10,10,69 +42,66,66,66,66,66,66,66,66,64,64,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,68,64,66,10,10,10,10,10,10,69 +42,66,15,16,66,15,16,66,66,64,64,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,64,64,66,10,15,16,10,15,16,69 +42,66,18,19,64,18,19,66,66,68,64,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,64,64,64,66,10,18,19,10,18,19,69 +42,66,66,66,66,66,66,66,66,64,66,66,68,68,64,64,64,64,64,64,64,64,64,64,64,64,64,68,64,64,64,68,64,66,66,66,66,64,64,64,66,10,10,10,10,10,66,69 +42,66,66,66,66,66,66,66,66,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,66,66,66,66,66,66,66,69 +42,66,66,66,66,66,66,66,66,66,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,68,64,64,66,66,66,66,66,66,66,69 +42,66,66,64,66,66,66,66,66,64,64,66,66,66,66,66,64,64,64,64,64,66,66,68,68,68,64,64,64,64,64,66,66,66,68,66,66,68,64,64,66,66,66,66,66,66,66,69 +11,17,17,17,17,17,17,12,66,64,64,66,13,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,12,66,64,64,66,13,17,17,17,17,17,14 + diff --git a/assets/maps/GS-map.txt b/assets/maps/GS-map.txt new file mode 100644 index 0000000..69c3e8c --- /dev/null +++ b/assets/maps/GS-map.txt @@ -0,0 +1,107 @@ +tileswide 48 +tileshigh 32 +tilewidth 16 +tileheight 16 + +layer 0 +50,48,48,48,48,48,48,49,44,43,46,44,47,48,48,48,48,48,48,48,52,45,45,45,45,45,45,45,45,50,48,48,48,48,48,48,49,44,46,43,44,47,48,48,48,48,48,52, +53,45,37,38,45,37,38,45,44,43,43,44,46,37,38,44,37,38,44,44,54,45,37,38,45,45,37,38,45,53,46,44,37,38,44,37,38,44,46,43,44,37,38,44,37,38,44,54, +53,45,18,19,45,18,19,45,46,43,43,44,46,18,19,46,18,19,46,44,54,44,18,19,44,44,18,19,44,53,46,44,18,19,44,18,19,44,43,43,44,18,19,44,18,19,44,54, +53,45,45,46,45,46,44,44,46,43,43,44,44,44,44,44,46,44,44,44,54,44,44,44,44,44,44,44,44,53,46,44,44,44,44,44,44,44,43,43,44,44,44,44,44,44,44,54, +53,45,44,44,44,44,44,44,44,43,43,46,46,44,44,44,44,44,44,44,47,48,48,48,48,48,48,48,48,49,44,45,44,44,45,44,44,45,43,43,45,44,44,45,44,44,45,54, +53,45,44,44,46,44,44,44,44,43,43,46,44,44,44,44,44,44,44,44,44,44,44,44,46,44,44,44,44,44,44,45,44,44,45,44,44,45,43,43,45,44,44,45,44,44,45,54, +53,43,43,43,43,43,43,43,43,43,46,43,43,43,43,43,43,43,43,44,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,54, +53,44,37,38,44,37,38,44,44,46,43,44,46,43,43,46,46,44,44,43,43,43,43,43,43,46,43,43,43,43,43,44,43,43,43,43,44,43,43,43,44,37,38,44,37,38,44,54, +53,44,18,19,44,18,19,44,44,44,46,44,46,46,44,44,44,44,59,56,56,56,56,56,56,56,56,56,56,56,58,44,44,44,44,44,44,43,46,43,44,18,19,44,18,19,44,54, +53,44,44,44,44,46,46,44,44,43,46,44,46,46,44,44,44,44,60,48,48,48,48,48,48,48,48,48,48,48,49,44,44,44,46,46,44,44,43,43,44,44,44,44,44,44,44,54, +53,44,44,44,46,46,46,44,44,43,43,44,44,44,46,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,46,46,44,44,44,44,43,43,44,44,44,44,44,44,44,54, +49,44,44,46,46,46,44,44,43,43,43,46,46,43,44,46,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,46,46,46,44,44,44,44,43,46,44,44,44,44,44,44,44,47, +44,46,46,44,44,46,46,44,44,43,43,43,43,46,43,43,43,46,43,44,44,44,44,44,44,44,44,44,44,44,44,44,46,44,44,44,44,44,43,43,44,44,44,44,44,44,44,44, +44,44,43,46,44,44,44,46,43,43,43,43,43,43,45,45,45,45,45,43,44,44,44,44,44,44,44,44,44,44,44,44,44,44,43,43,43,43,43,43,43,43,43,43,43,43,44,44, +43,43,43,43,43,43,43,43,43,43,43,43,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,43,43,43,43,43,43,43,43,43,43,43,43,43,43,44, +43,43,43,43,43,43,43,43,43,43,43,43,43,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,43,43,43,43,43,43,43,43,43,43,43,43,44, +46,44,44,43,46,43,46,44,43,43,43,44,44,44,44,44,44,44,44,45,45,45,45,45,45,45,45,45,45,44,44,44,44,44,44,44,44,44,43,43,44,44,44,44,44,43,44,44, +58,44,44,44,44,44,44,44,44,43,43,44,50,51,51,51,51,52,44,44,45,45,45,45,45,45,46,45,44,44,44,50,51,51,51,51,52,44,43,46,44,44,44,44,44,44,44,59, +53,44,44,44,44,44,44,44,44,43,44,44,53,44,44,44,44,54,44,44,46,46,44,44,44,44,46,46,44,44,44,53,44,44,44,44,54,44,43,43,44,44,44,44,44,44,44,54, +53,44,37,38,44,37,38,44,44,43,43,43,53,44,44,44,44,54,44,44,44,46,46,44,44,46,46,44,44,44,44,53,44,44,44,44,54,44,43,43,44,44,44,44,44,44,44,54, +53,44,18,19,44,18,19,44,44,43,43,44,55,56,58,44,44,54,44,44,44,44,44,44,46,44,44,44,44,44,44,53,44,44,59,56,57,44,43,43,43,44,37,38,44,37,38,54, +53,44,44,44,44,44,44,44,44,46,43,44,44,44,53,44,44,54,44,37,38,44,44,44,44,44,44,44,37,38,44,53,44,44,54,44,44,44,43,44,44,44,18,19,45,18,19,54, +53,44,44,44,44,44,44,44,44,43,44,44,44,44,55,56,56,57,44,18,19,44,37,38,44,37,38,44,18,19,44,55,56,56,57,44,44,44,43,43,44,45,45,45,45,45,45,54, +53,44,44,44,44,44,44,44,44,43,43,44,44,44,44,44,44,44,44,44,44,44,18,19,44,18,19,44,44,44,44,44,44,44,44,44,44,44,43,43,44,45,45,45,45,45,45,54, +53,44,44,44,44,44,44,44,44,43,43,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,46,43,44,45,45,45,45,45,45,54, +53,44,37,38,44,37,38,44,44,43,43,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,43,43,44,45,37,38,45,37,38,54, +53,44,18,19,43,18,19,44,44,46,43,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,43,43,43,44,45,18,19,45,18,19,54, +53,44,44,44,44,44,44,44,44,43,44,44,46,46,43,43,43,43,43,43,43,43,43,43,43,43,43,46,43,43,43,46,43,44,44,44,44,43,43,43,44,45,45,45,45,45,44,54, +53,44,44,44,44,44,44,44,44,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,44,44,44,44,44,44,44,54, +53,44,44,44,44,44,44,44,44,44,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,46,43,43,44,44,44,44,44,44,44,54, +53,44,44,43,44,44,44,44,44,43,43,44,44,44,44,44,43,43,43,43,43,44,44,46,46,46,43,43,43,43,43,44,44,44,46,44,44,46,43,43,44,44,44,44,44,44,44,54, +55,56,56,56,56,56,56,58,44,43,43,44,59,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,58,44,43,43,44,59,56,56,56,56,56,57, + +layer 1 +61,62,62,62,62,62,62,65,66,64,68,66,67,62,62,62,62,62,62,62,63,10,10,10,10,10,10,10,10,61,62,62,62,62,62,62,65,66,68,64,66,67,62,62,62,62,62,63, +42,10,15,16,10,15,16,10,66,64,64,66,68,15,16,66,15,16,66,66,69,10,15,16,10,10,15,16,10,42,68,66,15,16,66,15,16,66,68,64,66,15,16,66,15,16,66,69, +42,10,18,19,10,18,19,10,68,64,64,66,68,18,19,68,18,19,68,66,69,66,18,19,66,66,18,19,66,42,68,66,18,19,66,18,19,66,64,64,66,18,19,66,18,19,66,69, +42,10,10,68,10,68,66,66,68,64,64,66,66,66,66,66,68,66,66,66,69,66,66,66,66,66,66,66,66,42,68,66,66,66,66,66,66,66,64,64,66,66,66,66,66,66,66,69, +42,10,66,66,66,66,66,66,66,64,64,68,68,66,66,66,66,66,66,66,67,62,62,62,62,62,62,62,62,65,66,10,66,66,10,66,66,10,64,64,10,66,66,10,66,66,10,69, +42,10,66,66,68,66,66,66,66,64,64,68,66,66,66,66,66,66,66,66,66,66,66,66,68,66,66,66,66,66,66,10,66,66,10,66,66,10,64,64,10,66,66,10,66,66,10,69, +42,64,64,64,64,64,64,64,64,64,68,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,69, +42,66,15,16,66,15,16,66,66,68,64,66,68,64,64,68,68,66,66,64,64,64,64,64,64,68,64,64,64,64,64,66,64,64,64,64,66,64,64,64,66,15,16,66,15,16,66,69, +42,66,18,19,66,18,19,66,66,66,68,66,68,68,66,66,66,66,13,17,17,17,17,17,17,17,17,17,17,17,12,66,66,66,66,66,66,64,68,64,66,18,19,66,18,19,66,69, +42,66,66,66,66,68,68,66,66,64,68,66,68,68,66,66,66,66,67,62,62,62,62,62,62,62,62,62,62,62,65,66,66,66,68,68,66,66,64,64,66,66,66,66,66,66,66,69, +42,66,66,66,68,68,68,66,66,64,64,66,66,66,68,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,68,68,66,66,66,66,64,64,66,66,66,66,66,66,66,69, +65,66,66,68,68,68,66,66,64,64,64,68,68,64,66,68,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,68,68,68,66,66,66,66,64,68,66,66,66,66,66,66,66,67, +66,68,68,66,66,68,68,66,66,64,64,64,64,68,64,64,64,68,64,66,66,66,66,66,66,66,66,66,66,66,66,66,68,66,66,66,66,66,64,64,66,66,66,66,66,66,66,66, +66,66,64,68,66,66,66,68,64,64,64,64,66,66,10,10,10,10,10,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,64,64,64,64,64,64,64,64,64,64,64,64,66,66, +64,64,64,64,64,64,64,64,64,64,64,64,64,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,64,64,64,64,64,64,64,64,64,64,64,64,64,64,66, +64,64,64,64,64,64,64,64,64,64,64,64,64,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,64,64,64,64,64,64,64,64,64,64,64,64,66, +68,66,66,64,68,64,68,66,64,64,64,66,66,66,66,66,66,66,66,10,10,10,10,10,10,10,10,10,10,66,66,66,66,66,66,66,66,66,64,64,66,66,66,66,66,64,66,66, +12,66,66,66,66,66,66,66,66,64,64,66,61,62,62,62,62,63,66,66,10,10,10,10,10,10,68,10,66,66,66,61,62,62,62,62,63,66,64,68,66,66,66,66,66,66,66,13, +42,66,66,66,66,66,66,66,66,64,66,66,42,66,66,66,66,69,66,66,68,68,66,66,66,66,68,68,66,66,66,42,66,66,66,66,69,66,64,64,66,66,66,66,66,66,66,69, +42,66,15,16,66,15,16,66,66,64,64,64,42,66,66,66,66,69,66,66,66,68,68,66,66,68,68,66,66,66,66,42,66,66,66,66,69,66,64,64,66,66,66,66,66,66,66,69, +42,66,18,19,66,18,19,66,66,64,64,66,11,17,12,66,66,69,66,66,66,66,66,66,68,66,66,66,66,66,66,42,66,66,13,17,14,66,64,64,64,66,15,16,66,15,16,69, +42,66,66,66,66,66,66,66,66,68,64,66,66,66,42,66,66,69,66,15,16,66,66,66,66,66,66,66,15,16,66,42,66,66,69,66,66,66,64,66,66,66,18,19,10,18,19,69, +42,66,66,66,66,66,66,66,66,64,66,66,66,66,11,17,17,14,66,18,19,66,15,16,66,15,16,66,18,19,66,11,17,17,14,66,66,66,64,64,66,10,10,10,10,10,10,69, +42,66,66,66,66,66,66,66,66,64,64,66,66,66,66,66,66,66,66,66,66,66,18,19,66,18,19,66,66,66,66,66,66,66,66,66,66,66,64,64,66,10,10,10,10,10,10,69, +42,66,66,66,66,66,66,66,66,64,64,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,68,64,66,10,10,10,10,10,10,69, +42,66,15,16,66,15,16,66,66,64,64,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,64,64,66,10,15,16,10,15,16,69, +42,66,18,19,64,18,19,66,66,68,64,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,64,64,64,66,10,18,19,10,18,19,69, +42,66,66,66,66,66,66,66,66,64,66,66,68,68,64,64,64,64,64,64,64,64,64,64,64,64,64,68,64,64,64,68,64,66,66,66,66,64,64,64,66,10,10,10,10,10,66,69, +42,66,66,66,66,66,66,66,66,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,66,66,66,66,66,66,66,69, +42,66,66,66,66,66,66,66,66,66,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,68,64,64,66,66,66,66,66,66,66,69, +42,66,66,64,66,66,66,66,66,64,64,66,66,66,66,66,64,64,64,64,64,66,66,68,68,68,64,64,64,64,64,66,66,66,68,66,66,68,64,64,66,66,66,66,66,66,66,69, +11,17,17,17,17,17,17,12,66,64,64,66,13,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,12,66,64,64,66,13,17,17,17,17,17,14, + +layer 4 +1,1,1,1,1,1,1,1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,-1,-1,-1,-1,1,1,1,1,1,1,1, +1,-1,1,1,-1,1,1,-1,-1,-1,-1,-1,-1,1,1,-1,1,1,-1,-1,1,-1,1,1,-1,-1,1,1,-1,1,-1,-1,1,1,-1,1,1,-1,-1,-1,-1,1,1,-1,1,1,-1,1, +1,-1,1,1,-1,1,1,-1,-1,-1,-1,-1,-1,1,1,-1,1,1,-1,-1,1,-1,1,1,-1,-1,1,1,-1,1,-1,-1,1,1,-1,1,1,-1,-1,-1,-1,1,1,-1,1,1,-1,1, +1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,-1,-1,-1,-1,-1,-1,-1,-1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, +1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, +1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, +1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, +1,-1,1,1,-1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,-1,1,1,-1,1, +1,-1,1,1,-1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,-1,1,1,-1,1, +1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, +1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, +1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, +-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, +-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, +-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, +-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, +-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, +1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,-1,-1,-1,-1,-1,1,1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, +1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,-1,-1,-1,-1,1,-1,-1,-1,-1,-1,1,1,1,-1,-1,-1,-1,-1,1,-1,-1,-1,-1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, +1,-1,1,1,-1,1,1,-1,-1,-1,-1,-1,1,-1,-1,-1,-1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,-1,-1,-1,-1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, +1,-1,1,1,-1,1,1,-1,-1,-1,-1,-1,1,1,1,-1,-1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,-1,-1,1,1,1,-1,-1,-1,-1,-1,1,1,-1,1,1,1, +1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,-1,-1,1,-1,1,1,-1,-1,-1,-1,-1,-1,-1,1,1,-1,1,-1,-1,1,-1,-1,-1,-1,-1,-1,-1,1,1,-1,1,1,1, +1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,-1,1,1,-1,1,1,-1,1,1,-1,1,1,-1,1,1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, +1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,-1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, +1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, +1,-1,1,1,-1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,-1,1,1,1, +1,-1,1,1,-1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,-1,1,1,1, +1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, +1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, +1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, +1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, +1,1,1,1,1,1,1,1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,-1,-1,-1,-1,1,1,1,1,1,1,1, + diff --git a/assets/maps/GraveyardShift-Tiles.pyxel b/assets/maps/GraveyardShift-Tiles.pyxel new file mode 100644 index 0000000..7bab00e Binary files /dev/null and b/assets/maps/GraveyardShift-Tiles.pyxel differ diff --git a/assets/screenshots/UI-preview.ase b/assets/screenshots/UI-preview.ase new file mode 100644 index 0000000..1230a43 Binary files /dev/null and b/assets/screenshots/UI-preview.ase differ diff --git a/assets/textures/actors/owl.aseprite b/assets/textures/actors/owl.aseprite new file mode 100644 index 0000000..6bb2c61 Binary files /dev/null and b/assets/textures/actors/owl.aseprite differ diff --git a/assets/textures/actors/owl_anim.json b/assets/textures/actors/owl_anim.json new file mode 100644 index 0000000..0ffb43f --- /dev/null +++ b/assets/textures/actors/owl_anim.json @@ -0,0 +1,68 @@ +{ "frames": [ + { + "filename": "0", + "frame": { "x": 0, "y": 0, "w": 40, "h": 40 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 }, + "sourceSize": { "w": 40, "h": 40 }, + "duration": 100 + }, + { + "filename": "1", + "frame": { "x": 40, "y": 0, "w": 40, "h": 40 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 }, + "sourceSize": { "w": 40, "h": 40 }, + "duration": 100 + }, + { + "filename": "2", + "frame": { "x": 80, "y": 0, "w": 40, "h": 40 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 }, + "sourceSize": { "w": 40, "h": 40 }, + "duration": 100 + }, + { + "filename": "3", + "frame": { "x": 120, "y": 0, "w": 40, "h": 40 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 }, + "sourceSize": { "w": 40, "h": 40 }, + "duration": 100 + }, + { + "filename": "4", + "frame": { "x": 160, "y": 0, "w": 40, "h": 40 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 }, + "sourceSize": { "w": 40, "h": 40 }, + "duration": 100 + }, + { + "filename": "5", + "frame": { "x": 200, "y": 0, "w": 40, "h": 40 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 }, + "sourceSize": { "w": 40, "h": 40 }, + "duration": 100 + } + ], + "meta": { + "app": "http://www.aseprite.org/", + "version": "1.2.25-x64", + "image": "owl_anim.png", + "format": "RGBA8888", + "size": { "w": 240, "h": 40 }, + "scale": "1", + "frameTags": [ + { "name": "S-Fly", "from": 0, "to": 5, "direction": "forward" } + ] + } +} diff --git a/assets/textures/actors/owl_anim.png b/assets/textures/actors/owl_anim.png new file mode 100644 index 0000000..b9277f0 Binary files /dev/null and b/assets/textures/actors/owl_anim.png differ diff --git a/assets/textures/actors/robberrodent.aseprite b/assets/textures/actors/robberrodent.aseprite new file mode 100644 index 0000000..61c7647 Binary files /dev/null and b/assets/textures/actors/robberrodent.aseprite differ diff --git a/assets/textures/actors/robberrodent.json b/assets/textures/actors/robberrodent.json new file mode 100644 index 0000000..7fb1943 --- /dev/null +++ b/assets/textures/actors/robberrodent.json @@ -0,0 +1,68 @@ +{ "frames": [ + { + "filename": "0", + "frame": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + { + "filename": "1", + "frame": { "x": 32, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + { + "filename": "2", + "frame": { "x": 64, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + { + "filename": "3", + "frame": { "x": 96, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + { + "filename": "4", + "frame": { "x": 128, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + { + "filename": "5", + "frame": { "x": 160, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + } + ], + "meta": { + "app": "http://www.aseprite.org/", + "version": "1.2.25-x64", + "image": "robberrodent.png", + "format": "RGBA8888", + "size": { "w": 192, "h": 32 }, + "scale": "1", + "frameTags": [ + { "name": "moveW", "from": 0, "to": 5, "direction": "forward" } + ] + } +} diff --git a/assets/textures/actors/robberrodent.png b/assets/textures/actors/robberrodent.png new file mode 100644 index 0000000..e9f5125 Binary files /dev/null and b/assets/textures/actors/robberrodent.png differ diff --git a/assets/textures/objects/beartrap.aseprite b/assets/textures/objects/beartrap.aseprite new file mode 100644 index 0000000..bc24dea Binary files /dev/null and b/assets/textures/objects/beartrap.aseprite differ diff --git a/assets/textures/objects/beartrap.gif b/assets/textures/objects/beartrap.gif new file mode 100644 index 0000000..00eb547 Binary files /dev/null and b/assets/textures/objects/beartrap.gif differ diff --git a/assets/textures/objects/beartrap.png b/assets/textures/objects/beartrap.png new file mode 100644 index 0000000..5b02e31 Binary files /dev/null and b/assets/textures/objects/beartrap.png differ diff --git a/assets/textures/objects/coffin.aseprite b/assets/textures/objects/coffin.aseprite new file mode 100644 index 0000000..34bb62e Binary files /dev/null and b/assets/textures/objects/coffin.aseprite differ diff --git a/assets/textures/objects/coffin.png b/assets/textures/objects/coffin.png new file mode 100644 index 0000000..bf051a8 Binary files /dev/null and b/assets/textures/objects/coffin.png differ diff --git a/assets/textures/objects/jewel.aseprite b/assets/textures/objects/jewel.aseprite new file mode 100644 index 0000000..a0013f5 Binary files /dev/null and b/assets/textures/objects/jewel.aseprite differ diff --git a/assets/textures/objects/jewel.png b/assets/textures/objects/jewel.png new file mode 100644 index 0000000..3e566f5 Binary files /dev/null and b/assets/textures/objects/jewel.png differ diff --git a/assets/textures/objects/tree.png b/assets/textures/objects/tree.png new file mode 100644 index 0000000..b463d64 Binary files /dev/null and b/assets/textures/objects/tree.png differ diff --git a/assets/textures/tiles/GS-tiles.png b/assets/textures/tiles/GS-tiles.png new file mode 100644 index 0000000..a75bcc1 Binary files /dev/null and b/assets/textures/tiles/GS-tiles.png differ diff --git a/assets/textures/tiles/GS-tiles2.png b/assets/textures/tiles/GS-tiles2.png new file mode 100644 index 0000000..6dcb070 Binary files /dev/null and b/assets/textures/tiles/GS-tiles2.png differ diff --git a/assets/textures/ui/day-night-icon.aseprite b/assets/textures/ui/day-night-icon.aseprite new file mode 100644 index 0000000..f44e3ca Binary files /dev/null and b/assets/textures/ui/day-night-icon.aseprite differ diff --git a/assets/textures/ui/day-night-icon.png b/assets/textures/ui/day-night-icon.png new file mode 100644 index 0000000..4be54bb Binary files /dev/null and b/assets/textures/ui/day-night-icon.png differ diff --git a/assets/textures/ui/font.ase b/assets/textures/ui/font.ase new file mode 100644 index 0000000..62faad7 Binary files /dev/null and b/assets/textures/ui/font.ase differ diff --git a/assets/textures/ui/tombstone-serif-render.png b/assets/textures/ui/tombstone-serif-render.png new file mode 100644 index 0000000..63b785a Binary files /dev/null and b/assets/textures/ui/tombstone-serif-render.png differ diff --git a/assets/textures/ui/ui-element-tombstone.png b/assets/textures/ui/ui-element-tombstone.png new file mode 100644 index 0000000..1a07123 Binary files /dev/null and b/assets/textures/ui/ui-element-tombstone.png differ diff --git a/assets/textures/ui/ui-font-tombstone-serif.png b/assets/textures/ui/ui-font-tombstone-serif.png new file mode 100644 index 0000000..39c40ba Binary files /dev/null and b/assets/textures/ui/ui-font-tombstone-serif.png differ diff --git a/src/assetmgr/AssetManager.cpp b/src/assetmgr/AssetManager.cpp new file mode 100644 index 0000000..f4ab6c0 --- /dev/null +++ b/src/assetmgr/AssetManager.cpp @@ -0,0 +1,69 @@ +/* + * AssetManager.cpp + * + * Created on: Apr 4, 2020 + * Author: ayoungblood + */ + +#include "AssetManager.h" +#include "../ecs/Components.h" +#include "../ecs/ECS.h" + + +class Manager; + +AssetManager::AssetManager(Manager* man) : manager(man) +{} + +AssetManager::~AssetManager() +{} + +// void AssetManager::CreateProjectile(Vector2D pos, Vector2D vel, int range, int speed, std::string id) +// { +// auto& projectile(manager->addEntity()); +// projectile.addComponent(pos.x, pos.y, 32, 32, 1); +// projectile.addComponent(id); +// projectile.addComponent(range,speed,vel); +// projectile.addComponent("projectile"); +// projectile.addGroup(Game::groupProjectiles); +// ;} + +//void AssetManager::CreateText(Vector2D pos, std::string textToDisplay, std::string id) +//{ +// auto& text(manager->addEntity()); +// text.addComponent(pos.x,pos.y,32,32,1); +// +// text.addGroup(Game::groupUI); +//} + + +void AssetManager::AddTexture(std::string id, const char* path) +{ + textures.emplace(id, TextureManager::LoadTexture(path)); +} + +SDL_Texture* AssetManager::GetTexture(std::string id) +{ + return textures[id]; +} + +//Sound Mixer +//Sound Clips +void AssetManager::AddSoundClip(std::string id, const char* path) +{ + soundClips.emplace(id, MusicManager::LoadSound(path)); +} +Mix_Chunk* AssetManager::GetSoundClip(std::string id) +{ + return soundClips[id]; +} + +//Music +void AssetManager::AddMusicTrack(std::string id, const char* path) +{ + musicTracks.emplace(id, MusicManager::LoadMusic(path)); +} +Mix_Music* AssetManager::GetMusicTrack(std::string id) +{ + return musicTracks[id]; +} diff --git a/src/assetmgr/AssetManager.h b/src/assetmgr/AssetManager.h new file mode 100644 index 0000000..e6f84b4 --- /dev/null +++ b/src/assetmgr/AssetManager.h @@ -0,0 +1,55 @@ +/* + * AssetManager.h + * + * Created on: Apr 4, 2020 + * Author: ayoungblood + */ + +#ifndef SRC_ASSETMANAGER_H_ +#define SRC_ASSETMANAGER_H_ + +#include +#include +#include "TextureManager.h" +#include "../game/Vector2D.h" +#include "../ecs/ECS.h" +#include "../game/Game.hpp" +//#include +#include "MusicManager.h" + +class AssetManager +{ +public: + AssetManager(Manager* man); + ~AssetManager(); + + + //gameobjects +// void CreateProjectile(Vector2D pos, Vector2D vel, int range, int speed, std::string id); + void CreateText(Vector2D pos, std::string textToDisplay, std::string id); + + //texture management + void AddTexture(std::string id, const char* path); + SDL_Texture* GetTexture(std::string id); + + //Sound Mixer + //Sound Clips + void AddSoundClip(std::string id, const char* path); + Mix_Chunk* GetSoundClip(std::string id); + + //Music + void AddMusicTrack(std::string id, const char* path); + Mix_Music* GetMusicTrack(std::string id); + + + +private: + Manager* manager; + std::map textures; + std::map soundClips; + std::map musicTracks; +}; + + + +#endif /* SRC_ASSETMANAGER_H_ */ diff --git a/src/assetmgr/GameObject.cpp b/src/assetmgr/GameObject.cpp new file mode 100644 index 0000000..2d9780b --- /dev/null +++ b/src/assetmgr/GameObject.cpp @@ -0,0 +1,41 @@ +/* + * GameObject.cpp + * + * Created on: Feb 11, 2020 + * Author: ayoungblood + */ + +#include "GameObject.h" +#include "TextureManager.h" + +GameObject::GameObject(const char* texturesheet, int x, int y) +{ + + objTexture = TextureManager::LoadTexture(texturesheet); + + xpos = x; + ypos = y; + +} + + +void GameObject::Update() +{ + xpos++; +// ypos = 0; + + srcRect.h = 40; + srcRect.w = 30; + srcRect.x = 0; + srcRect.y = 0; + + destRect.x = xpos; + destRect.y = ypos; + destRect.w = srcRect.w * 2; + destRect.h = srcRect.h * 2; +} + +void GameObject::Render() +{ + SDL_RenderCopy(Game::renderer, objTexture, &srcRect, &destRect); +} diff --git a/src/assetmgr/GameObject.h b/src/assetmgr/GameObject.h new file mode 100644 index 0000000..e5251a6 --- /dev/null +++ b/src/assetmgr/GameObject.h @@ -0,0 +1,34 @@ +/* + * GameObject.h + * + * Created on: Feb 11, 2020 + * Author: ayoungblood + */ + +#ifndef SRC_GAMEOBJECT_H_ +#define SRC_GAMEOBJECT_H_ + +#include "../game/Game.hpp" + +class GameObject +{ + +public: + GameObject(const char* texturesheet, int x, int y); + ~GameObject(); + + void Update(); + void Render(); + +private: + int xpos; + int ypos; + + SDL_Texture* objTexture; + SDL_Rect srcRect, destRect; + + +}; + + +#endif /* SRC_GAMEOBJECT_H_ */ diff --git a/src/assetmgr/Map.cpp b/src/assetmgr/Map.cpp new file mode 100644 index 0000000..8c47c32 --- /dev/null +++ b/src/assetmgr/Map.cpp @@ -0,0 +1,78 @@ +/* + * Map.cpp + * + * Created on: Feb 13, 2020 + * Author: ayoungblood + */ + +#include "Map.h" +#include "../game/Game.hpp" +#include +#include "../ecs/ECS.h" +#include "../ecs/Components.h" +#include +#include + +extern Manager manager; + +Map::Map(std::string tID, int ms, int ts) : texID(tID), mapScale(ms), tileSize(ts) +{ + scaledSize = ms* ts; + width = 0; + height = 0; + tSize = ts; +} + +Map::~Map() +{ +} + +void Map::LoadMap(std::string path, int sizeX, int sizeY, int scale) +{ + char c; + std::fstream mapFile; + mapFile.open(path); + int srcX, srcY; + + width = tSize*scale*sizeX; + height = tSize*scale*sizeY; + + for (int y = 0; y < sizeY; y++) + { + for (int x = 0; x < sizeX; x++) + { + mapFile.get(c); + srcY = atoi(&c) * tileSize; + mapFile.get(c); + srcX = atoi(&c) * tileSize; + AddTile(srcX, srcY, x*scaledSize, y*scaledSize); + mapFile.ignore(2,','); + } + } + + mapFile.ignore(); +// colliders + for (int y =0; y < sizeY; y++) + { + for (int x = 0; x < sizeX; x++) + { + mapFile.get(c); + if (c == '1') + { + auto& tcol(manager.addEntity()); + tcol.addComponent("terrain",x*scaledSize,y*scaledSize,tileSize,scale); + tcol.addGroup(Game::groupColliders); + mapFile.ignore(); + } + mapFile.ignore(2,','); + } + } + mapFile.close(); +} + +void Map::AddTile(int srcX, int srcY, int xpos, int ypos) +{ + auto& tile(manager.addEntity()); + tile.addComponent(srcX,srcY,xpos,ypos,tileSize, mapScale, texID); + tile.addGroup(Game::groupMap); +} diff --git a/src/assetmgr/Map.h b/src/assetmgr/Map.h new file mode 100644 index 0000000..7498e22 --- /dev/null +++ b/src/assetmgr/Map.h @@ -0,0 +1,33 @@ +/* + * Map.h + * + * Created on: Feb 13, 2020 + * Author: ayoungblood + */ + +#ifndef SRC_MAP_H_ +#define SRC_MAP_H_ + +#include + +class Map +{ +public: + Map(std::string tID, int ms, int ts); + ~Map(); + + void LoadMap(std::string path, int sizeX, int sizeY, int scale); + void AddTile(int srcX, int srcY, int xpos, int ypos); + + int width; + int height; + int tSize; + +private: + std::string texID; + int mapScale; + int tileSize; + int scaledSize; +}; + +#endif /* SRC_MAP_H_ */ diff --git a/src/assetmgr/MusicManager.cpp b/src/assetmgr/MusicManager.cpp new file mode 100644 index 0000000..e5b76d5 --- /dev/null +++ b/src/assetmgr/MusicManager.cpp @@ -0,0 +1,26 @@ +/* + * MusicManager.cpp + * + * Created on: Apr 9, 2020 + * Author: ayoungblood + */ + +#include "MusicManager.h" +#include "SDL2/SDL_mixer.h" + + Mix_Music* MusicManager::LoadMusic(const char* path){ + Mix_Music* music = Mix_LoadMUS(path); + return music; + } + + Mix_Chunk* MusicManager::LoadSound(const char* path){ + Mix_Chunk* sfx = Mix_LoadWAV(path); + return sfx; + } + + void Play(Mix_Music* music, int replay) + { + + } + void Pause(Mix_Music* music){} + void Stop(Mix_Music* music){} diff --git a/src/assetmgr/MusicManager.h b/src/assetmgr/MusicManager.h new file mode 100644 index 0000000..2933596 --- /dev/null +++ b/src/assetmgr/MusicManager.h @@ -0,0 +1,25 @@ +/* + * MusicManager.h + * + * Created on: Apr 9, 2020 + * Author: ayoungblood + */ + +#ifndef SRC_MUSICMANAGER_H_ +#define SRC_MUSICMANAGER_H_ + +#include "../game/Game.hpp" +#include "SDL2/SDL_mixer.h" + +class MusicManager +{ + public: + static Mix_Music* LoadMusic(const char* path); + static void Play(Mix_Music* music); + static void Pause(Mix_Music* music); + static void Stop(Mix_Music* music); + static Mix_Chunk* LoadSound(const char* path); +}; + + +#endif /* SRC_MUSICMANAGER_H_ */ diff --git a/src/assetmgr/TextureManager.cpp b/src/assetmgr/TextureManager.cpp new file mode 100644 index 0000000..f920713 --- /dev/null +++ b/src/assetmgr/TextureManager.cpp @@ -0,0 +1,22 @@ +/* + * TextureManager.cpp + * + * Created on: Feb 11, 2020 + * Author: ayoungblood + */ + +#include "TextureManager.h" + +SDL_Texture* TextureManager::LoadTexture(const char* texture) +{ + SDL_Surface* tempSurface = IMG_Load(texture); + SDL_Texture* tex = SDL_CreateTextureFromSurface(Game::renderer, tempSurface); + SDL_FreeSurface(tempSurface); + return tex; +} + +void TextureManager::Draw(SDL_Texture* tex, SDL_Rect src, SDL_Rect dest, SDL_RendererFlip flip) +{ + + SDL_RenderCopyEx(Game::renderer, tex, &src, &dest, NULL, NULL, flip); +} diff --git a/src/assetmgr/TextureManager.h b/src/assetmgr/TextureManager.h new file mode 100644 index 0000000..bca14d0 --- /dev/null +++ b/src/assetmgr/TextureManager.h @@ -0,0 +1,23 @@ +/* + * TextureManager.h + * + * Created on: Feb 11, 2020 + * Author: ayoungblood + */ + +#ifndef SRC_TEXTUREMANAGER_H_ +#define SRC_TEXTUREMANAGER_H_ + +// #include +#include "../game/Game.hpp" + +class TextureManager +{ + public: + static SDL_Texture* LoadTexture(const char* fileName); + static void Draw(SDL_Texture* tex, SDL_Rect src, SDL_Rect dest, SDL_RendererFlip flip); +}; + + + +#endif /* SRC_TEXTUREMANAGER_H_ */ diff --git a/src/cjson/cJSON.c b/src/cjson/cJSON.c new file mode 100644 index 0000000..2a860c8 --- /dev/null +++ b/src/cjson/cJSON.c @@ -0,0 +1,3096 @@ +/* + Copyright (c) 2009-2017 Dave Gamble and cJSON contributors + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. +*/ + +/* cJSON */ +/* JSON parser in C. */ + +/* disable warnings about old C89 functions in MSVC */ +#if !defined(_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) +#define _CRT_SECURE_NO_DEPRECATE +#endif + +#ifdef __GNUC__ +#pragma GCC visibility push(default) +#endif +#if defined(_MSC_VER) +#pragma warning (push) +/* disable warning about single line comments in system headers */ +#pragma warning (disable : 4001) +#endif + +#include +#include +#include +#include +#include +#include +#include + +#ifdef ENABLE_LOCALES +#include +#endif + +#if defined(_MSC_VER) +#pragma warning (pop) +#endif +#ifdef __GNUC__ +#pragma GCC visibility pop +#endif + +#include "cJSON.h" + +/* define our own boolean type */ +#ifdef true +#undef true +#endif +#define true ((cJSON_bool)1) + +#ifdef false +#undef false +#endif +#define false ((cJSON_bool)0) + +/* define isnan and isinf for ANSI C, if in C99 or above, isnan and isinf has been defined in math.h */ +#ifndef isinf +#define isinf(d) (isnan((d - d)) && !isnan(d)) +#endif +#ifndef isnan +#define isnan(d) (d != d) +#endif + +#ifndef NAN +#define NAN 0.0/0.0 +#endif + +typedef struct { + const unsigned char *json; + size_t position; +} error; +static error global_error = { NULL, 0 }; + +CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void) +{ + return (const char*) (global_error.json + global_error.position); +} + +CJSON_PUBLIC(char *) cJSON_GetStringValue(const cJSON * const item) +{ + if (!cJSON_IsString(item)) + { + return NULL; + } + + return item->valuestring; +} + +CJSON_PUBLIC(double) cJSON_GetNumberValue(const cJSON * const item) +{ + if (!cJSON_IsNumber(item)) + { + return (double) NAN; + } + + return item->valuedouble; +} + +/* This is a safeguard to prevent copy-pasters from using incompatible C and header files */ +#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 7) || (CJSON_VERSION_PATCH != 14) + #error cJSON.h and cJSON.c have different versions. Make sure that both have the same. +#endif + +CJSON_PUBLIC(const char*) cJSON_Version(void) +{ + static char version[15]; + sprintf(version, "%i.%i.%i", CJSON_VERSION_MAJOR, CJSON_VERSION_MINOR, CJSON_VERSION_PATCH); + + return version; +} + +/* Case insensitive string comparison, doesn't consider two NULL pointers equal though */ +static int case_insensitive_strcmp(const unsigned char *string1, const unsigned char *string2) +{ + if ((string1 == NULL) || (string2 == NULL)) + { + return 1; + } + + if (string1 == string2) + { + return 0; + } + + for(; tolower(*string1) == tolower(*string2); (void)string1++, string2++) + { + if (*string1 == '\0') + { + return 0; + } + } + + return tolower(*string1) - tolower(*string2); +} + +typedef struct internal_hooks +{ + void *(CJSON_CDECL *allocate)(size_t size); + void (CJSON_CDECL *deallocate)(void *pointer); + void *(CJSON_CDECL *reallocate)(void *pointer, size_t size); +} internal_hooks; + +#if defined(_MSC_VER) +/* work around MSVC error C2322: '...' address of dllimport '...' is not static */ +static void * CJSON_CDECL internal_malloc(size_t size) +{ + return malloc(size); +} +static void CJSON_CDECL internal_free(void *pointer) +{ + free(pointer); +} +static void * CJSON_CDECL internal_realloc(void *pointer, size_t size) +{ + return realloc(pointer, size); +} +#else +#define internal_malloc malloc +#define internal_free free +#define internal_realloc realloc +#endif + +/* strlen of character literals resolved at compile time */ +#define static_strlen(string_literal) (sizeof(string_literal) - sizeof("")) + +static internal_hooks global_hooks = { internal_malloc, internal_free, internal_realloc }; + +static unsigned char* cJSON_strdup(const unsigned char* string, const internal_hooks * const hooks) +{ + size_t length = 0; + unsigned char *copy = NULL; + + if (string == NULL) + { + return NULL; + } + + length = strlen((const char*)string) + sizeof(""); + copy = (unsigned char*)hooks->allocate(length); + if (copy == NULL) + { + return NULL; + } + memcpy(copy, string, length); + + return copy; +} + +CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks) +{ + if (hooks == NULL) + { + /* Reset hooks */ + global_hooks.allocate = malloc; + global_hooks.deallocate = free; + global_hooks.reallocate = realloc; + return; + } + + global_hooks.allocate = malloc; + if (hooks->malloc_fn != NULL) + { + global_hooks.allocate = hooks->malloc_fn; + } + + global_hooks.deallocate = free; + if (hooks->free_fn != NULL) + { + global_hooks.deallocate = hooks->free_fn; + } + + /* use realloc only if both free and malloc are used */ + global_hooks.reallocate = NULL; + if ((global_hooks.allocate == malloc) && (global_hooks.deallocate == free)) + { + global_hooks.reallocate = realloc; + } +} + +/* Internal constructor. */ +static cJSON *cJSON_New_Item(const internal_hooks * const hooks) +{ + cJSON* node = (cJSON*)hooks->allocate(sizeof(cJSON)); + if (node) + { + memset(node, '\0', sizeof(cJSON)); + } + + return node; +} + +/* Delete a cJSON structure. */ +CJSON_PUBLIC(void) cJSON_Delete(cJSON *item) +{ + cJSON *next = NULL; + while (item != NULL) + { + next = item->next; + if (!(item->type & cJSON_IsReference) && (item->child != NULL)) + { + cJSON_Delete(item->child); + } + if (!(item->type & cJSON_IsReference) && (item->valuestring != NULL)) + { + global_hooks.deallocate(item->valuestring); + } + if (!(item->type & cJSON_StringIsConst) && (item->string != NULL)) + { + global_hooks.deallocate(item->string); + } + global_hooks.deallocate(item); + item = next; + } +} + +/* get the decimal point character of the current locale */ +static unsigned char get_decimal_point(void) +{ +#ifdef ENABLE_LOCALES + struct lconv *lconv = localeconv(); + return (unsigned char) lconv->decimal_point[0]; +#else + return '.'; +#endif +} + +typedef struct +{ + const unsigned char *content; + size_t length; + size_t offset; + size_t depth; /* How deeply nested (in arrays/objects) is the input at the current offset. */ + internal_hooks hooks; +} parse_buffer; + +/* check if the given size is left to read in a given parse buffer (starting with 1) */ +#define can_read(buffer, size) ((buffer != NULL) && (((buffer)->offset + size) <= (buffer)->length)) +/* check if the buffer can be accessed at the given index (starting with 0) */ +#define can_access_at_index(buffer, index) ((buffer != NULL) && (((buffer)->offset + index) < (buffer)->length)) +#define cannot_access_at_index(buffer, index) (!can_access_at_index(buffer, index)) +/* get a pointer to the buffer at the position */ +#define buffer_at_offset(buffer) ((buffer)->content + (buffer)->offset) + +/* Parse the input text to generate a number, and populate the result into item. */ +static cJSON_bool parse_number(cJSON * const item, parse_buffer * const input_buffer) +{ + double number = 0; + unsigned char *after_end = NULL; + unsigned char number_c_string[64]; + unsigned char decimal_point = get_decimal_point(); + size_t i = 0; + + if ((input_buffer == NULL) || (input_buffer->content == NULL)) + { + return false; + } + + /* copy the number into a temporary buffer and replace '.' with the decimal point + * of the current locale (for strtod) + * This also takes care of '\0' not necessarily being available for marking the end of the input */ + for (i = 0; (i < (sizeof(number_c_string) - 1)) && can_access_at_index(input_buffer, i); i++) + { + switch (buffer_at_offset(input_buffer)[i]) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case '+': + case '-': + case 'e': + case 'E': + number_c_string[i] = buffer_at_offset(input_buffer)[i]; + break; + + case '.': + number_c_string[i] = decimal_point; + break; + + default: + goto loop_end; + } + } +loop_end: + number_c_string[i] = '\0'; + + number = strtod((const char*)number_c_string, (char**)&after_end); + if (number_c_string == after_end) + { + return false; /* parse_error */ + } + + item->valuedouble = number; + + /* use saturation in case of overflow */ + if (number >= INT_MAX) + { + item->valueint = INT_MAX; + } + else if (number <= (double)INT_MIN) + { + item->valueint = INT_MIN; + } + else + { + item->valueint = (int)number; + } + + item->type = cJSON_Number; + + input_buffer->offset += (size_t)(after_end - number_c_string); + return true; +} + +/* don't ask me, but the original cJSON_SetNumberValue returns an integer or double */ +CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number) +{ + if (number >= INT_MAX) + { + object->valueint = INT_MAX; + } + else if (number <= (double)INT_MIN) + { + object->valueint = INT_MIN; + } + else + { + object->valueint = (int)number; + } + + return object->valuedouble = number; +} + +CJSON_PUBLIC(char*) cJSON_SetValuestring(cJSON *object, const char *valuestring) +{ + char *copy = NULL; + /* if object's type is not cJSON_String or is cJSON_IsReference, it should not set valuestring */ + if (!(object->type & cJSON_String) || (object->type & cJSON_IsReference)) + { + return NULL; + } + if (strlen(valuestring) <= strlen(object->valuestring)) + { + strcpy(object->valuestring, valuestring); + return object->valuestring; + } + copy = (char*) cJSON_strdup((const unsigned char*)valuestring, &global_hooks); + if (copy == NULL) + { + return NULL; + } + if (object->valuestring != NULL) + { + cJSON_free(object->valuestring); + } + object->valuestring = copy; + + return copy; +} + +typedef struct +{ + unsigned char *buffer; + size_t length; + size_t offset; + size_t depth; /* current nesting depth (for formatted printing) */ + cJSON_bool noalloc; + cJSON_bool format; /* is this print a formatted print */ + internal_hooks hooks; +} printbuffer; + +/* realloc printbuffer if necessary to have at least "needed" bytes more */ +static unsigned char* ensure(printbuffer * const p, size_t needed) +{ + unsigned char *newbuffer = NULL; + size_t newsize = 0; + + if ((p == NULL) || (p->buffer == NULL)) + { + return NULL; + } + + if ((p->length > 0) && (p->offset >= p->length)) + { + /* make sure that offset is valid */ + return NULL; + } + + if (needed > INT_MAX) + { + /* sizes bigger than INT_MAX are currently not supported */ + return NULL; + } + + needed += p->offset + 1; + if (needed <= p->length) + { + return p->buffer + p->offset; + } + + if (p->noalloc) { + return NULL; + } + + /* calculate new buffer size */ + if (needed > (INT_MAX / 2)) + { + /* overflow of int, use INT_MAX if possible */ + if (needed <= INT_MAX) + { + newsize = INT_MAX; + } + else + { + return NULL; + } + } + else + { + newsize = needed * 2; + } + + if (p->hooks.reallocate != NULL) + { + /* reallocate with realloc if available */ + newbuffer = (unsigned char*)p->hooks.reallocate(p->buffer, newsize); + if (newbuffer == NULL) + { + p->hooks.deallocate(p->buffer); + p->length = 0; + p->buffer = NULL; + + return NULL; + } + } + else + { + /* otherwise reallocate manually */ + newbuffer = (unsigned char*)p->hooks.allocate(newsize); + if (!newbuffer) + { + p->hooks.deallocate(p->buffer); + p->length = 0; + p->buffer = NULL; + + return NULL; + } + if (newbuffer) + { + memcpy(newbuffer, p->buffer, p->offset + 1); + } + p->hooks.deallocate(p->buffer); + } + p->length = newsize; + p->buffer = newbuffer; + + return newbuffer + p->offset; +} + +/* calculate the new length of the string in a printbuffer and update the offset */ +static void update_offset(printbuffer * const buffer) +{ + const unsigned char *buffer_pointer = NULL; + if ((buffer == NULL) || (buffer->buffer == NULL)) + { + return; + } + buffer_pointer = buffer->buffer + buffer->offset; + + buffer->offset += strlen((const char*)buffer_pointer); +} + +/* securely comparison of floating-point variables */ +static cJSON_bool compare_double(double a, double b) +{ + double maxVal = fabs(a) > fabs(b) ? fabs(a) : fabs(b); + return (fabs(a - b) <= maxVal * DBL_EPSILON); +} + +/* Render the number nicely from the given item into a string. */ +static cJSON_bool print_number(const cJSON * const item, printbuffer * const output_buffer) +{ + unsigned char *output_pointer = NULL; + double d = item->valuedouble; + int length = 0; + size_t i = 0; + unsigned char number_buffer[26] = {0}; /* temporary buffer to print the number into */ + unsigned char decimal_point = get_decimal_point(); + double test = 0.0; + + if (output_buffer == NULL) + { + return false; + } + + /* This checks for NaN and Infinity */ + if (isnan(d) || isinf(d)) + { + length = sprintf((char*)number_buffer, "null"); + } + else + { + /* Try 15 decimal places of precision to avoid nonsignificant nonzero digits */ + length = sprintf((char*)number_buffer, "%1.15g", d); + + /* Check whether the original double can be recovered */ + if ((sscanf((char*)number_buffer, "%lg", &test) != 1) || !compare_double((double)test, d)) + { + /* If not, print with 17 decimal places of precision */ + length = sprintf((char*)number_buffer, "%1.17g", d); + } + } + + /* sprintf failed or buffer overrun occurred */ + if ((length < 0) || (length > (int)(sizeof(number_buffer) - 1))) + { + return false; + } + + /* reserve appropriate space in the output */ + output_pointer = ensure(output_buffer, (size_t)length + sizeof("")); + if (output_pointer == NULL) + { + return false; + } + + /* copy the printed number to the output and replace locale + * dependent decimal point with '.' */ + for (i = 0; i < ((size_t)length); i++) + { + if (number_buffer[i] == decimal_point) + { + output_pointer[i] = '.'; + continue; + } + + output_pointer[i] = number_buffer[i]; + } + output_pointer[i] = '\0'; + + output_buffer->offset += (size_t)length; + + return true; +} + +/* parse 4 digit hexadecimal number */ +static unsigned parse_hex4(const unsigned char * const input) +{ + unsigned int h = 0; + size_t i = 0; + + for (i = 0; i < 4; i++) + { + /* parse digit */ + if ((input[i] >= '0') && (input[i] <= '9')) + { + h += (unsigned int) input[i] - '0'; + } + else if ((input[i] >= 'A') && (input[i] <= 'F')) + { + h += (unsigned int) 10 + input[i] - 'A'; + } + else if ((input[i] >= 'a') && (input[i] <= 'f')) + { + h += (unsigned int) 10 + input[i] - 'a'; + } + else /* invalid */ + { + return 0; + } + + if (i < 3) + { + /* shift left to make place for the next nibble */ + h = h << 4; + } + } + + return h; +} + +/* converts a UTF-16 literal to UTF-8 + * A literal can be one or two sequences of the form \uXXXX */ +static unsigned char utf16_literal_to_utf8(const unsigned char * const input_pointer, const unsigned char * const input_end, unsigned char **output_pointer) +{ + long unsigned int codepoint = 0; + unsigned int first_code = 0; + const unsigned char *first_sequence = input_pointer; + unsigned char utf8_length = 0; + unsigned char utf8_position = 0; + unsigned char sequence_length = 0; + unsigned char first_byte_mark = 0; + + if ((input_end - first_sequence) < 6) + { + /* input ends unexpectedly */ + goto fail; + } + + /* get the first utf16 sequence */ + first_code = parse_hex4(first_sequence + 2); + + /* check that the code is valid */ + if (((first_code >= 0xDC00) && (first_code <= 0xDFFF))) + { + goto fail; + } + + /* UTF16 surrogate pair */ + if ((first_code >= 0xD800) && (first_code <= 0xDBFF)) + { + const unsigned char *second_sequence = first_sequence + 6; + unsigned int second_code = 0; + sequence_length = 12; /* \uXXXX\uXXXX */ + + if ((input_end - second_sequence) < 6) + { + /* input ends unexpectedly */ + goto fail; + } + + if ((second_sequence[0] != '\\') || (second_sequence[1] != 'u')) + { + /* missing second half of the surrogate pair */ + goto fail; + } + + /* get the second utf16 sequence */ + second_code = parse_hex4(second_sequence + 2); + /* check that the code is valid */ + if ((second_code < 0xDC00) || (second_code > 0xDFFF)) + { + /* invalid second half of the surrogate pair */ + goto fail; + } + + + /* calculate the unicode codepoint from the surrogate pair */ + codepoint = 0x10000 + (((first_code & 0x3FF) << 10) | (second_code & 0x3FF)); + } + else + { + sequence_length = 6; /* \uXXXX */ + codepoint = first_code; + } + + /* encode as UTF-8 + * takes at maximum 4 bytes to encode: + * 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */ + if (codepoint < 0x80) + { + /* normal ascii, encoding 0xxxxxxx */ + utf8_length = 1; + } + else if (codepoint < 0x800) + { + /* two bytes, encoding 110xxxxx 10xxxxxx */ + utf8_length = 2; + first_byte_mark = 0xC0; /* 11000000 */ + } + else if (codepoint < 0x10000) + { + /* three bytes, encoding 1110xxxx 10xxxxxx 10xxxxxx */ + utf8_length = 3; + first_byte_mark = 0xE0; /* 11100000 */ + } + else if (codepoint <= 0x10FFFF) + { + /* four bytes, encoding 1110xxxx 10xxxxxx 10xxxxxx 10xxxxxx */ + utf8_length = 4; + first_byte_mark = 0xF0; /* 11110000 */ + } + else + { + /* invalid unicode codepoint */ + goto fail; + } + + /* encode as utf8 */ + for (utf8_position = (unsigned char)(utf8_length - 1); utf8_position > 0; utf8_position--) + { + /* 10xxxxxx */ + (*output_pointer)[utf8_position] = (unsigned char)((codepoint | 0x80) & 0xBF); + codepoint >>= 6; + } + /* encode first byte */ + if (utf8_length > 1) + { + (*output_pointer)[0] = (unsigned char)((codepoint | first_byte_mark) & 0xFF); + } + else + { + (*output_pointer)[0] = (unsigned char)(codepoint & 0x7F); + } + + *output_pointer += utf8_length; + + return sequence_length; + +fail: + return 0; +} + +/* Parse the input text into an unescaped cinput, and populate item. */ +static cJSON_bool parse_string(cJSON * const item, parse_buffer * const input_buffer) +{ + const unsigned char *input_pointer = buffer_at_offset(input_buffer) + 1; + const unsigned char *input_end = buffer_at_offset(input_buffer) + 1; + unsigned char *output_pointer = NULL; + unsigned char *output = NULL; + + /* not a string */ + if (buffer_at_offset(input_buffer)[0] != '\"') + { + goto fail; + } + + { + /* calculate approximate size of the output (overestimate) */ + size_t allocation_length = 0; + size_t skipped_bytes = 0; + while (((size_t)(input_end - input_buffer->content) < input_buffer->length) && (*input_end != '\"')) + { + /* is escape sequence */ + if (input_end[0] == '\\') + { + if ((size_t)(input_end + 1 - input_buffer->content) >= input_buffer->length) + { + /* prevent buffer overflow when last input character is a backslash */ + goto fail; + } + skipped_bytes++; + input_end++; + } + input_end++; + } + if (((size_t)(input_end - input_buffer->content) >= input_buffer->length) || (*input_end != '\"')) + { + goto fail; /* string ended unexpectedly */ + } + + /* This is at most how much we need for the output */ + allocation_length = (size_t) (input_end - buffer_at_offset(input_buffer)) - skipped_bytes; + output = (unsigned char*)input_buffer->hooks.allocate(allocation_length + sizeof("")); + if (output == NULL) + { + goto fail; /* allocation failure */ + } + } + + output_pointer = output; + /* loop through the string literal */ + while (input_pointer < input_end) + { + if (*input_pointer != '\\') + { + *output_pointer++ = *input_pointer++; + } + /* escape sequence */ + else + { + unsigned char sequence_length = 2; + if ((input_end - input_pointer) < 1) + { + goto fail; + } + + switch (input_pointer[1]) + { + case 'b': + *output_pointer++ = '\b'; + break; + case 'f': + *output_pointer++ = '\f'; + break; + case 'n': + *output_pointer++ = '\n'; + break; + case 'r': + *output_pointer++ = '\r'; + break; + case 't': + *output_pointer++ = '\t'; + break; + case '\"': + case '\\': + case '/': + *output_pointer++ = input_pointer[1]; + break; + + /* UTF-16 literal */ + case 'u': + sequence_length = utf16_literal_to_utf8(input_pointer, input_end, &output_pointer); + if (sequence_length == 0) + { + /* failed to convert UTF16-literal to UTF-8 */ + goto fail; + } + break; + + default: + goto fail; + } + input_pointer += sequence_length; + } + } + + /* zero terminate the output */ + *output_pointer = '\0'; + + item->type = cJSON_String; + item->valuestring = (char*)output; + + input_buffer->offset = (size_t) (input_end - input_buffer->content); + input_buffer->offset++; + + return true; + +fail: + if (output != NULL) + { + input_buffer->hooks.deallocate(output); + } + + if (input_pointer != NULL) + { + input_buffer->offset = (size_t)(input_pointer - input_buffer->content); + } + + return false; +} + +/* Render the cstring provided to an escaped version that can be printed. */ +static cJSON_bool print_string_ptr(const unsigned char * const input, printbuffer * const output_buffer) +{ + const unsigned char *input_pointer = NULL; + unsigned char *output = NULL; + unsigned char *output_pointer = NULL; + size_t output_length = 0; + /* numbers of additional characters needed for escaping */ + size_t escape_characters = 0; + + if (output_buffer == NULL) + { + return false; + } + + /* empty string */ + if (input == NULL) + { + output = ensure(output_buffer, sizeof("\"\"")); + if (output == NULL) + { + return false; + } + strcpy((char*)output, "\"\""); + + return true; + } + + /* set "flag" to 1 if something needs to be escaped */ + for (input_pointer = input; *input_pointer; input_pointer++) + { + switch (*input_pointer) + { + case '\"': + case '\\': + case '\b': + case '\f': + case '\n': + case '\r': + case '\t': + /* one character escape sequence */ + escape_characters++; + break; + default: + if (*input_pointer < 32) + { + /* UTF-16 escape sequence uXXXX */ + escape_characters += 5; + } + break; + } + } + output_length = (size_t)(input_pointer - input) + escape_characters; + + output = ensure(output_buffer, output_length + sizeof("\"\"")); + if (output == NULL) + { + return false; + } + + /* no characters have to be escaped */ + if (escape_characters == 0) + { + output[0] = '\"'; + memcpy(output + 1, input, output_length); + output[output_length + 1] = '\"'; + output[output_length + 2] = '\0'; + + return true; + } + + output[0] = '\"'; + output_pointer = output + 1; + /* copy the string */ + for (input_pointer = input; *input_pointer != '\0'; (void)input_pointer++, output_pointer++) + { + if ((*input_pointer > 31) && (*input_pointer != '\"') && (*input_pointer != '\\')) + { + /* normal character, copy */ + *output_pointer = *input_pointer; + } + else + { + /* character needs to be escaped */ + *output_pointer++ = '\\'; + switch (*input_pointer) + { + case '\\': + *output_pointer = '\\'; + break; + case '\"': + *output_pointer = '\"'; + break; + case '\b': + *output_pointer = 'b'; + break; + case '\f': + *output_pointer = 'f'; + break; + case '\n': + *output_pointer = 'n'; + break; + case '\r': + *output_pointer = 'r'; + break; + case '\t': + *output_pointer = 't'; + break; + default: + /* escape and print as unicode codepoint */ + sprintf((char*)output_pointer, "u%04x", *input_pointer); + output_pointer += 4; + break; + } + } + } + output[output_length + 1] = '\"'; + output[output_length + 2] = '\0'; + + return true; +} + +/* Invoke print_string_ptr (which is useful) on an item. */ +static cJSON_bool print_string(const cJSON * const item, printbuffer * const p) +{ + return print_string_ptr((unsigned char*)item->valuestring, p); +} + +/* Predeclare these prototypes. */ +static cJSON_bool parse_value(cJSON * const item, parse_buffer * const input_buffer); +static cJSON_bool print_value(const cJSON * const item, printbuffer * const output_buffer); +static cJSON_bool parse_array(cJSON * const item, parse_buffer * const input_buffer); +static cJSON_bool print_array(const cJSON * const item, printbuffer * const output_buffer); +static cJSON_bool parse_object(cJSON * const item, parse_buffer * const input_buffer); +static cJSON_bool print_object(const cJSON * const item, printbuffer * const output_buffer); + +/* Utility to jump whitespace and cr/lf */ +static parse_buffer *buffer_skip_whitespace(parse_buffer * const buffer) +{ + if ((buffer == NULL) || (buffer->content == NULL)) + { + return NULL; + } + + if (cannot_access_at_index(buffer, 0)) + { + return buffer; + } + + while (can_access_at_index(buffer, 0) && (buffer_at_offset(buffer)[0] <= 32)) + { + buffer->offset++; + } + + if (buffer->offset == buffer->length) + { + buffer->offset--; + } + + return buffer; +} + +/* skip the UTF-8 BOM (byte order mark) if it is at the beginning of a buffer */ +static parse_buffer *skip_utf8_bom(parse_buffer * const buffer) +{ + if ((buffer == NULL) || (buffer->content == NULL) || (buffer->offset != 0)) + { + return NULL; + } + + if (can_access_at_index(buffer, 4) && (strncmp((const char*)buffer_at_offset(buffer), "\xEF\xBB\xBF", 3) == 0)) + { + buffer->offset += 3; + } + + return buffer; +} + +CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated) +{ + size_t buffer_length; + + if (NULL == value) + { + return NULL; + } + + /* Adding null character size due to require_null_terminated. */ + buffer_length = strlen(value) + sizeof(""); + + return cJSON_ParseWithLengthOpts(value, buffer_length, return_parse_end, require_null_terminated); +} + +/* Parse an object - create a new root, and populate. */ +CJSON_PUBLIC(cJSON *) cJSON_ParseWithLengthOpts(const char *value, size_t buffer_length, const char **return_parse_end, cJSON_bool require_null_terminated) +{ + parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0 } }; + cJSON *item = NULL; + + /* reset error position */ + global_error.json = NULL; + global_error.position = 0; + + if (value == NULL || 0 == buffer_length) + { + goto fail; + } + + buffer.content = (const unsigned char*)value; + buffer.length = buffer_length; + buffer.offset = 0; + buffer.hooks = global_hooks; + + item = cJSON_New_Item(&global_hooks); + if (item == NULL) /* memory fail */ + { + goto fail; + } + + if (!parse_value(item, buffer_skip_whitespace(skip_utf8_bom(&buffer)))) + { + /* parse failure. ep is set. */ + goto fail; + } + + /* if we require null-terminated JSON without appended garbage, skip and then check for a null terminator */ + if (require_null_terminated) + { + buffer_skip_whitespace(&buffer); + if ((buffer.offset >= buffer.length) || buffer_at_offset(&buffer)[0] != '\0') + { + goto fail; + } + } + if (return_parse_end) + { + *return_parse_end = (const char*)buffer_at_offset(&buffer); + } + + return item; + +fail: + if (item != NULL) + { + cJSON_Delete(item); + } + + if (value != NULL) + { + error local_error; + local_error.json = (const unsigned char*)value; + local_error.position = 0; + + if (buffer.offset < buffer.length) + { + local_error.position = buffer.offset; + } + else if (buffer.length > 0) + { + local_error.position = buffer.length - 1; + } + + if (return_parse_end != NULL) + { + *return_parse_end = (const char*)local_error.json + local_error.position; + } + + global_error = local_error; + } + + return NULL; +} + +/* Default options for cJSON_Parse */ +CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value) +{ + return cJSON_ParseWithOpts(value, 0, 0); +} + +CJSON_PUBLIC(cJSON *) cJSON_ParseWithLength(const char *value, size_t buffer_length) +{ + return cJSON_ParseWithLengthOpts(value, buffer_length, 0, 0); +} + +#define cjson_min(a, b) (((a) < (b)) ? (a) : (b)) + +static unsigned char *print(const cJSON * const item, cJSON_bool format, const internal_hooks * const hooks) +{ + static const size_t default_buffer_size = 256; + printbuffer buffer[1]; + unsigned char *printed = NULL; + + memset(buffer, 0, sizeof(buffer)); + + /* create buffer */ + buffer->buffer = (unsigned char*) hooks->allocate(default_buffer_size); + buffer->length = default_buffer_size; + buffer->format = format; + buffer->hooks = *hooks; + if (buffer->buffer == NULL) + { + goto fail; + } + + /* print the value */ + if (!print_value(item, buffer)) + { + goto fail; + } + update_offset(buffer); + + /* check if reallocate is available */ + if (hooks->reallocate != NULL) + { + printed = (unsigned char*) hooks->reallocate(buffer->buffer, buffer->offset + 1); + if (printed == NULL) { + goto fail; + } + buffer->buffer = NULL; + } + else /* otherwise copy the JSON over to a new buffer */ + { + printed = (unsigned char*) hooks->allocate(buffer->offset + 1); + if (printed == NULL) + { + goto fail; + } + memcpy(printed, buffer->buffer, cjson_min(buffer->length, buffer->offset + 1)); + printed[buffer->offset] = '\0'; /* just to be sure */ + + /* free the buffer */ + hooks->deallocate(buffer->buffer); + } + + return printed; + +fail: + if (buffer->buffer != NULL) + { + hooks->deallocate(buffer->buffer); + } + + if (printed != NULL) + { + hooks->deallocate(printed); + } + + return NULL; +} + +/* Render a cJSON item/entity/structure to text. */ +CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item) +{ + return (char*)print(item, true, &global_hooks); +} + +CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item) +{ + return (char*)print(item, false, &global_hooks); +} + +CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt) +{ + printbuffer p = { 0, 0, 0, 0, 0, 0, { 0, 0, 0 } }; + + if (prebuffer < 0) + { + return NULL; + } + + p.buffer = (unsigned char*)global_hooks.allocate((size_t)prebuffer); + if (!p.buffer) + { + return NULL; + } + + p.length = (size_t)prebuffer; + p.offset = 0; + p.noalloc = false; + p.format = fmt; + p.hooks = global_hooks; + + if (!print_value(item, &p)) + { + global_hooks.deallocate(p.buffer); + return NULL; + } + + return (char*)p.buffer; +} + +CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buffer, const int length, const cJSON_bool format) +{ + printbuffer p = { 0, 0, 0, 0, 0, 0, { 0, 0, 0 } }; + + if ((length < 0) || (buffer == NULL)) + { + return false; + } + + p.buffer = (unsigned char*)buffer; + p.length = (size_t)length; + p.offset = 0; + p.noalloc = true; + p.format = format; + p.hooks = global_hooks; + + return print_value(item, &p); +} + +/* Parser core - when encountering text, process appropriately. */ +static cJSON_bool parse_value(cJSON * const item, parse_buffer * const input_buffer) +{ + if ((input_buffer == NULL) || (input_buffer->content == NULL)) + { + return false; /* no input */ + } + + /* parse the different types of values */ + /* null */ + if (can_read(input_buffer, 4) && (strncmp((const char*)buffer_at_offset(input_buffer), "null", 4) == 0)) + { + item->type = cJSON_NULL; + input_buffer->offset += 4; + return true; + } + /* false */ + if (can_read(input_buffer, 5) && (strncmp((const char*)buffer_at_offset(input_buffer), "false", 5) == 0)) + { + item->type = cJSON_False; + input_buffer->offset += 5; + return true; + } + /* true */ + if (can_read(input_buffer, 4) && (strncmp((const char*)buffer_at_offset(input_buffer), "true", 4) == 0)) + { + item->type = cJSON_True; + item->valueint = 1; + input_buffer->offset += 4; + return true; + } + /* string */ + if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '\"')) + { + return parse_string(item, input_buffer); + } + /* number */ + if (can_access_at_index(input_buffer, 0) && ((buffer_at_offset(input_buffer)[0] == '-') || ((buffer_at_offset(input_buffer)[0] >= '0') && (buffer_at_offset(input_buffer)[0] <= '9')))) + { + return parse_number(item, input_buffer); + } + /* array */ + if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '[')) + { + return parse_array(item, input_buffer); + } + /* object */ + if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '{')) + { + return parse_object(item, input_buffer); + } + + return false; +} + +/* Render a value to text. */ +static cJSON_bool print_value(const cJSON * const item, printbuffer * const output_buffer) +{ + unsigned char *output = NULL; + + if ((item == NULL) || (output_buffer == NULL)) + { + return false; + } + + switch ((item->type) & 0xFF) + { + case cJSON_NULL: + output = ensure(output_buffer, 5); + if (output == NULL) + { + return false; + } + strcpy((char*)output, "null"); + return true; + + case cJSON_False: + output = ensure(output_buffer, 6); + if (output == NULL) + { + return false; + } + strcpy((char*)output, "false"); + return true; + + case cJSON_True: + output = ensure(output_buffer, 5); + if (output == NULL) + { + return false; + } + strcpy((char*)output, "true"); + return true; + + case cJSON_Number: + return print_number(item, output_buffer); + + case cJSON_Raw: + { + size_t raw_length = 0; + if (item->valuestring == NULL) + { + return false; + } + + raw_length = strlen(item->valuestring) + sizeof(""); + output = ensure(output_buffer, raw_length); + if (output == NULL) + { + return false; + } + memcpy(output, item->valuestring, raw_length); + return true; + } + + case cJSON_String: + return print_string(item, output_buffer); + + case cJSON_Array: + return print_array(item, output_buffer); + + case cJSON_Object: + return print_object(item, output_buffer); + + default: + return false; + } +} + +/* Build an array from input text. */ +static cJSON_bool parse_array(cJSON * const item, parse_buffer * const input_buffer) +{ + cJSON *head = NULL; /* head of the linked list */ + cJSON *current_item = NULL; + + if (input_buffer->depth >= CJSON_NESTING_LIMIT) + { + return false; /* to deeply nested */ + } + input_buffer->depth++; + + if (buffer_at_offset(input_buffer)[0] != '[') + { + /* not an array */ + goto fail; + } + + input_buffer->offset++; + buffer_skip_whitespace(input_buffer); + if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ']')) + { + /* empty array */ + goto success; + } + + /* check if we skipped to the end of the buffer */ + if (cannot_access_at_index(input_buffer, 0)) + { + input_buffer->offset--; + goto fail; + } + + /* step back to character in front of the first element */ + input_buffer->offset--; + /* loop through the comma separated array elements */ + do + { + /* allocate next item */ + cJSON *new_item = cJSON_New_Item(&(input_buffer->hooks)); + if (new_item == NULL) + { + goto fail; /* allocation failure */ + } + + /* attach next item to list */ + if (head == NULL) + { + /* start the linked list */ + current_item = head = new_item; + } + else + { + /* add to the end and advance */ + current_item->next = new_item; + new_item->prev = current_item; + current_item = new_item; + } + + /* parse next value */ + input_buffer->offset++; + buffer_skip_whitespace(input_buffer); + if (!parse_value(current_item, input_buffer)) + { + goto fail; /* failed to parse value */ + } + buffer_skip_whitespace(input_buffer); + } + while (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ',')); + + if (cannot_access_at_index(input_buffer, 0) || buffer_at_offset(input_buffer)[0] != ']') + { + goto fail; /* expected end of array */ + } + +success: + input_buffer->depth--; + + if (head != NULL) { + head->prev = current_item; + } + + item->type = cJSON_Array; + item->child = head; + + input_buffer->offset++; + + return true; + +fail: + if (head != NULL) + { + cJSON_Delete(head); + } + + return false; +} + +/* Render an array to text */ +static cJSON_bool print_array(const cJSON * const item, printbuffer * const output_buffer) +{ + unsigned char *output_pointer = NULL; + size_t length = 0; + cJSON *current_element = item->child; + + if (output_buffer == NULL) + { + return false; + } + + /* Compose the output array. */ + /* opening square bracket */ + output_pointer = ensure(output_buffer, 1); + if (output_pointer == NULL) + { + return false; + } + + *output_pointer = '['; + output_buffer->offset++; + output_buffer->depth++; + + while (current_element != NULL) + { + if (!print_value(current_element, output_buffer)) + { + return false; + } + update_offset(output_buffer); + if (current_element->next) + { + length = (size_t) (output_buffer->format ? 2 : 1); + output_pointer = ensure(output_buffer, length + 1); + if (output_pointer == NULL) + { + return false; + } + *output_pointer++ = ','; + if(output_buffer->format) + { + *output_pointer++ = ' '; + } + *output_pointer = '\0'; + output_buffer->offset += length; + } + current_element = current_element->next; + } + + output_pointer = ensure(output_buffer, 2); + if (output_pointer == NULL) + { + return false; + } + *output_pointer++ = ']'; + *output_pointer = '\0'; + output_buffer->depth--; + + return true; +} + +/* Build an object from the text. */ +static cJSON_bool parse_object(cJSON * const item, parse_buffer * const input_buffer) +{ + cJSON *head = NULL; /* linked list head */ + cJSON *current_item = NULL; + + if (input_buffer->depth >= CJSON_NESTING_LIMIT) + { + return false; /* to deeply nested */ + } + input_buffer->depth++; + + if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != '{')) + { + goto fail; /* not an object */ + } + + input_buffer->offset++; + buffer_skip_whitespace(input_buffer); + if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '}')) + { + goto success; /* empty object */ + } + + /* check if we skipped to the end of the buffer */ + if (cannot_access_at_index(input_buffer, 0)) + { + input_buffer->offset--; + goto fail; + } + + /* step back to character in front of the first element */ + input_buffer->offset--; + /* loop through the comma separated array elements */ + do + { + /* allocate next item */ + cJSON *new_item = cJSON_New_Item(&(input_buffer->hooks)); + if (new_item == NULL) + { + goto fail; /* allocation failure */ + } + + /* attach next item to list */ + if (head == NULL) + { + /* start the linked list */ + current_item = head = new_item; + } + else + { + /* add to the end and advance */ + current_item->next = new_item; + new_item->prev = current_item; + current_item = new_item; + } + + /* parse the name of the child */ + input_buffer->offset++; + buffer_skip_whitespace(input_buffer); + if (!parse_string(current_item, input_buffer)) + { + goto fail; /* failed to parse name */ + } + buffer_skip_whitespace(input_buffer); + + /* swap valuestring and string, because we parsed the name */ + current_item->string = current_item->valuestring; + current_item->valuestring = NULL; + + if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != ':')) + { + goto fail; /* invalid object */ + } + + /* parse the value */ + input_buffer->offset++; + buffer_skip_whitespace(input_buffer); + if (!parse_value(current_item, input_buffer)) + { + goto fail; /* failed to parse value */ + } + buffer_skip_whitespace(input_buffer); + } + while (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ',')); + + if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != '}')) + { + goto fail; /* expected end of object */ + } + +success: + input_buffer->depth--; + + if (head != NULL) { + head->prev = current_item; + } + + item->type = cJSON_Object; + item->child = head; + + input_buffer->offset++; + return true; + +fail: + if (head != NULL) + { + cJSON_Delete(head); + } + + return false; +} + +/* Render an object to text. */ +static cJSON_bool print_object(const cJSON * const item, printbuffer * const output_buffer) +{ + unsigned char *output_pointer = NULL; + size_t length = 0; + cJSON *current_item = item->child; + + if (output_buffer == NULL) + { + return false; + } + + /* Compose the output: */ + length = (size_t) (output_buffer->format ? 2 : 1); /* fmt: {\n */ + output_pointer = ensure(output_buffer, length + 1); + if (output_pointer == NULL) + { + return false; + } + + *output_pointer++ = '{'; + output_buffer->depth++; + if (output_buffer->format) + { + *output_pointer++ = '\n'; + } + output_buffer->offset += length; + + while (current_item) + { + if (output_buffer->format) + { + size_t i; + output_pointer = ensure(output_buffer, output_buffer->depth); + if (output_pointer == NULL) + { + return false; + } + for (i = 0; i < output_buffer->depth; i++) + { + *output_pointer++ = '\t'; + } + output_buffer->offset += output_buffer->depth; + } + + /* print key */ + if (!print_string_ptr((unsigned char*)current_item->string, output_buffer)) + { + return false; + } + update_offset(output_buffer); + + length = (size_t) (output_buffer->format ? 2 : 1); + output_pointer = ensure(output_buffer, length); + if (output_pointer == NULL) + { + return false; + } + *output_pointer++ = ':'; + if (output_buffer->format) + { + *output_pointer++ = '\t'; + } + output_buffer->offset += length; + + /* print value */ + if (!print_value(current_item, output_buffer)) + { + return false; + } + update_offset(output_buffer); + + /* print comma if not last */ + length = ((size_t)(output_buffer->format ? 1 : 0) + (size_t)(current_item->next ? 1 : 0)); + output_pointer = ensure(output_buffer, length + 1); + if (output_pointer == NULL) + { + return false; + } + if (current_item->next) + { + *output_pointer++ = ','; + } + + if (output_buffer->format) + { + *output_pointer++ = '\n'; + } + *output_pointer = '\0'; + output_buffer->offset += length; + + current_item = current_item->next; + } + + output_pointer = ensure(output_buffer, output_buffer->format ? (output_buffer->depth + 1) : 2); + if (output_pointer == NULL) + { + return false; + } + if (output_buffer->format) + { + size_t i; + for (i = 0; i < (output_buffer->depth - 1); i++) + { + *output_pointer++ = '\t'; + } + } + *output_pointer++ = '}'; + *output_pointer = '\0'; + output_buffer->depth--; + + return true; +} + +/* Get Array size/item / object item. */ +CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array) +{ + cJSON *child = NULL; + size_t size = 0; + + if (array == NULL) + { + return 0; + } + + child = array->child; + + while(child != NULL) + { + size++; + child = child->next; + } + + /* FIXME: Can overflow here. Cannot be fixed without breaking the API */ + + return (int)size; +} + +static cJSON* get_array_item(const cJSON *array, size_t index) +{ + cJSON *current_child = NULL; + + if (array == NULL) + { + return NULL; + } + + current_child = array->child; + while ((current_child != NULL) && (index > 0)) + { + index--; + current_child = current_child->next; + } + + return current_child; +} + +CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index) +{ + if (index < 0) + { + return NULL; + } + + return get_array_item(array, (size_t)index); +} + +static cJSON *get_object_item(const cJSON * const object, const char * const name, const cJSON_bool case_sensitive) +{ + cJSON *current_element = NULL; + + if ((object == NULL) || (name == NULL)) + { + return NULL; + } + + current_element = object->child; + if (case_sensitive) + { + while ((current_element != NULL) && (current_element->string != NULL) && (strcmp(name, current_element->string) != 0)) + { + current_element = current_element->next; + } + } + else + { + while ((current_element != NULL) && (case_insensitive_strcmp((const unsigned char*)name, (const unsigned char*)(current_element->string)) != 0)) + { + current_element = current_element->next; + } + } + + if ((current_element == NULL) || (current_element->string == NULL)) { + return NULL; + } + + return current_element; +} + +CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string) +{ + return get_object_item(object, string, false); +} + +CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string) +{ + return get_object_item(object, string, true); +} + +CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string) +{ + return cJSON_GetObjectItem(object, string) ? 1 : 0; +} + +/* Utility for array list handling. */ +static void suffix_object(cJSON *prev, cJSON *item) +{ + prev->next = item; + item->prev = prev; +} + +/* Utility for handling references. */ +static cJSON *create_reference(const cJSON *item, const internal_hooks * const hooks) +{ + cJSON *reference = NULL; + if (item == NULL) + { + return NULL; + } + + reference = cJSON_New_Item(hooks); + if (reference == NULL) + { + return NULL; + } + + memcpy(reference, item, sizeof(cJSON)); + reference->string = NULL; + reference->type |= cJSON_IsReference; + reference->next = reference->prev = NULL; + return reference; +} + +static cJSON_bool add_item_to_array(cJSON *array, cJSON *item) +{ + cJSON *child = NULL; + + if ((item == NULL) || (array == NULL) || (array == item)) + { + return false; + } + + child = array->child; + /* + * To find the last item in array quickly, we use prev in array + */ + if (child == NULL) + { + /* list is empty, start new one */ + array->child = item; + item->prev = item; + item->next = NULL; + } + else + { + /* append to the end */ + if (child->prev) + { + suffix_object(child->prev, item); + array->child->prev = item; + } + } + + return true; +} + +/* Add item to array/object. */ +CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToArray(cJSON *array, cJSON *item) +{ + return add_item_to_array(array, item); +} + +#if defined(__clang__) || (defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5)))) + #pragma GCC diagnostic push +#endif +#ifdef __GNUC__ +#pragma GCC diagnostic ignored "-Wcast-qual" +#endif +/* helper function to cast away const */ +static void* cast_away_const(const void* string) +{ + return (void*)string; +} +#if defined(__clang__) || (defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5)))) + #pragma GCC diagnostic pop +#endif + + +static cJSON_bool add_item_to_object(cJSON * const object, const char * const string, cJSON * const item, const internal_hooks * const hooks, const cJSON_bool constant_key) +{ + char *new_key = NULL; + int new_type = cJSON_Invalid; + + if ((object == NULL) || (string == NULL) || (item == NULL) || (object == item)) + { + return false; + } + + if (constant_key) + { + new_key = (char*)cast_away_const(string); + new_type = item->type | cJSON_StringIsConst; + } + else + { + new_key = (char*)cJSON_strdup((const unsigned char*)string, hooks); + if (new_key == NULL) + { + return false; + } + + new_type = item->type & ~cJSON_StringIsConst; + } + + if (!(item->type & cJSON_StringIsConst) && (item->string != NULL)) + { + hooks->deallocate(item->string); + } + + item->string = new_key; + item->type = new_type; + + return add_item_to_array(object, item); +} + +CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item) +{ + return add_item_to_object(object, string, item, &global_hooks, false); +} + +/* Add an item to an object with constant string as key */ +CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item) +{ + return add_item_to_object(object, string, item, &global_hooks, true); +} + +CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item) +{ + if (array == NULL) + { + return false; + } + + return add_item_to_array(array, create_reference(item, &global_hooks)); +} + +CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item) +{ + if ((object == NULL) || (string == NULL)) + { + return false; + } + + return add_item_to_object(object, string, create_reference(item, &global_hooks), &global_hooks, false); +} + +CJSON_PUBLIC(cJSON*) cJSON_AddNullToObject(cJSON * const object, const char * const name) +{ + cJSON *null = cJSON_CreateNull(); + if (add_item_to_object(object, name, null, &global_hooks, false)) + { + return null; + } + + cJSON_Delete(null); + return NULL; +} + +CJSON_PUBLIC(cJSON*) cJSON_AddTrueToObject(cJSON * const object, const char * const name) +{ + cJSON *true_item = cJSON_CreateTrue(); + if (add_item_to_object(object, name, true_item, &global_hooks, false)) + { + return true_item; + } + + cJSON_Delete(true_item); + return NULL; +} + +CJSON_PUBLIC(cJSON*) cJSON_AddFalseToObject(cJSON * const object, const char * const name) +{ + cJSON *false_item = cJSON_CreateFalse(); + if (add_item_to_object(object, name, false_item, &global_hooks, false)) + { + return false_item; + } + + cJSON_Delete(false_item); + return NULL; +} + +CJSON_PUBLIC(cJSON*) cJSON_AddBoolToObject(cJSON * const object, const char * const name, const cJSON_bool boolean) +{ + cJSON *bool_item = cJSON_CreateBool(boolean); + if (add_item_to_object(object, name, bool_item, &global_hooks, false)) + { + return bool_item; + } + + cJSON_Delete(bool_item); + return NULL; +} + +CJSON_PUBLIC(cJSON*) cJSON_AddNumberToObject(cJSON * const object, const char * const name, const double number) +{ + cJSON *number_item = cJSON_CreateNumber(number); + if (add_item_to_object(object, name, number_item, &global_hooks, false)) + { + return number_item; + } + + cJSON_Delete(number_item); + return NULL; +} + +CJSON_PUBLIC(cJSON*) cJSON_AddStringToObject(cJSON * const object, const char * const name, const char * const string) +{ + cJSON *string_item = cJSON_CreateString(string); + if (add_item_to_object(object, name, string_item, &global_hooks, false)) + { + return string_item; + } + + cJSON_Delete(string_item); + return NULL; +} + +CJSON_PUBLIC(cJSON*) cJSON_AddRawToObject(cJSON * const object, const char * const name, const char * const raw) +{ + cJSON *raw_item = cJSON_CreateRaw(raw); + if (add_item_to_object(object, name, raw_item, &global_hooks, false)) + { + return raw_item; + } + + cJSON_Delete(raw_item); + return NULL; +} + +CJSON_PUBLIC(cJSON*) cJSON_AddObjectToObject(cJSON * const object, const char * const name) +{ + cJSON *object_item = cJSON_CreateObject(); + if (add_item_to_object(object, name, object_item, &global_hooks, false)) + { + return object_item; + } + + cJSON_Delete(object_item); + return NULL; +} + +CJSON_PUBLIC(cJSON*) cJSON_AddArrayToObject(cJSON * const object, const char * const name) +{ + cJSON *array = cJSON_CreateArray(); + if (add_item_to_object(object, name, array, &global_hooks, false)) + { + return array; + } + + cJSON_Delete(array); + return NULL; +} + +CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item) +{ + if ((parent == NULL) || (item == NULL)) + { + return NULL; + } + + if (item != parent->child) + { + /* not the first element */ + item->prev->next = item->next; + } + if (item->next != NULL) + { + /* not the last element */ + item->next->prev = item->prev; + } + + if (item == parent->child) + { + /* first element */ + parent->child = item->next; + } + else if (item->next == NULL) + { + /* last element */ + parent->child->prev = item->prev; + } + + /* make sure the detached item doesn't point anywhere anymore */ + item->prev = NULL; + item->next = NULL; + + return item; +} + +CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which) +{ + if (which < 0) + { + return NULL; + } + + return cJSON_DetachItemViaPointer(array, get_array_item(array, (size_t)which)); +} + +CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which) +{ + cJSON_Delete(cJSON_DetachItemFromArray(array, which)); +} + +CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string) +{ + cJSON *to_detach = cJSON_GetObjectItem(object, string); + + return cJSON_DetachItemViaPointer(object, to_detach); +} + +CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string) +{ + cJSON *to_detach = cJSON_GetObjectItemCaseSensitive(object, string); + + return cJSON_DetachItemViaPointer(object, to_detach); +} + +CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string) +{ + cJSON_Delete(cJSON_DetachItemFromObject(object, string)); +} + +CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string) +{ + cJSON_Delete(cJSON_DetachItemFromObjectCaseSensitive(object, string)); +} + +/* Replace array/object items with new ones. */ +CJSON_PUBLIC(cJSON_bool) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem) +{ + cJSON *after_inserted = NULL; + + if (which < 0) + { + return false; + } + + after_inserted = get_array_item(array, (size_t)which); + if (after_inserted == NULL) + { + return add_item_to_array(array, newitem); + } + + newitem->next = after_inserted; + newitem->prev = after_inserted->prev; + after_inserted->prev = newitem; + if (after_inserted == array->child) + { + array->child = newitem; + } + else + { + newitem->prev->next = newitem; + } + return true; +} + +CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement) +{ + if ((parent == NULL) || (replacement == NULL) || (item == NULL)) + { + return false; + } + + if (replacement == item) + { + return true; + } + + replacement->next = item->next; + replacement->prev = item->prev; + + if (replacement->next != NULL) + { + replacement->next->prev = replacement; + } + if (parent->child == item) + { + if (parent->child->prev == parent->child) + { + replacement->prev = replacement; + } + parent->child = replacement; + } + else + { /* + * To find the last item in array quickly, we use prev in array. + * We can't modify the last item's next pointer where this item was the parent's child + */ + if (replacement->prev != NULL) + { + replacement->prev->next = replacement; + } + if (replacement->next == NULL) + { + parent->child->prev = replacement; + } + } + + item->next = NULL; + item->prev = NULL; + cJSON_Delete(item); + + return true; +} + +CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem) +{ + if (which < 0) + { + return false; + } + + return cJSON_ReplaceItemViaPointer(array, get_array_item(array, (size_t)which), newitem); +} + +static cJSON_bool replace_item_in_object(cJSON *object, const char *string, cJSON *replacement, cJSON_bool case_sensitive) +{ + if ((replacement == NULL) || (string == NULL)) + { + return false; + } + + /* replace the name in the replacement */ + if (!(replacement->type & cJSON_StringIsConst) && (replacement->string != NULL)) + { + cJSON_free(replacement->string); + } + replacement->string = (char*)cJSON_strdup((const unsigned char*)string, &global_hooks); + replacement->type &= ~cJSON_StringIsConst; + + return cJSON_ReplaceItemViaPointer(object, get_object_item(object, string, case_sensitive), replacement); +} + +CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObject(cJSON *object, const char *string, cJSON *newitem) +{ + return replace_item_in_object(object, string, newitem, false); +} + +CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object, const char *string, cJSON *newitem) +{ + return replace_item_in_object(object, string, newitem, true); +} + +/* Create basic types: */ +CJSON_PUBLIC(cJSON *) cJSON_CreateNull(void) +{ + cJSON *item = cJSON_New_Item(&global_hooks); + if(item) + { + item->type = cJSON_NULL; + } + + return item; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateTrue(void) +{ + cJSON *item = cJSON_New_Item(&global_hooks); + if(item) + { + item->type = cJSON_True; + } + + return item; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateFalse(void) +{ + cJSON *item = cJSON_New_Item(&global_hooks); + if(item) + { + item->type = cJSON_False; + } + + return item; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateBool(cJSON_bool boolean) +{ + cJSON *item = cJSON_New_Item(&global_hooks); + if(item) + { + item->type = boolean ? cJSON_True : cJSON_False; + } + + return item; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(double num) +{ + cJSON *item = cJSON_New_Item(&global_hooks); + if(item) + { + item->type = cJSON_Number; + item->valuedouble = num; + + /* use saturation in case of overflow */ + if (num >= INT_MAX) + { + item->valueint = INT_MAX; + } + else if (num <= (double)INT_MIN) + { + item->valueint = INT_MIN; + } + else + { + item->valueint = (int)num; + } + } + + return item; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateString(const char *string) +{ + cJSON *item = cJSON_New_Item(&global_hooks); + if(item) + { + item->type = cJSON_String; + item->valuestring = (char*)cJSON_strdup((const unsigned char*)string, &global_hooks); + if(!item->valuestring) + { + cJSON_Delete(item); + return NULL; + } + } + + return item; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateStringReference(const char *string) +{ + cJSON *item = cJSON_New_Item(&global_hooks); + if (item != NULL) + { + item->type = cJSON_String | cJSON_IsReference; + item->valuestring = (char*)cast_away_const(string); + } + + return item; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateObjectReference(const cJSON *child) +{ + cJSON *item = cJSON_New_Item(&global_hooks); + if (item != NULL) { + item->type = cJSON_Object | cJSON_IsReference; + item->child = (cJSON*)cast_away_const(child); + } + + return item; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateArrayReference(const cJSON *child) { + cJSON *item = cJSON_New_Item(&global_hooks); + if (item != NULL) { + item->type = cJSON_Array | cJSON_IsReference; + item->child = (cJSON*)cast_away_const(child); + } + + return item; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateRaw(const char *raw) +{ + cJSON *item = cJSON_New_Item(&global_hooks); + if(item) + { + item->type = cJSON_Raw; + item->valuestring = (char*)cJSON_strdup((const unsigned char*)raw, &global_hooks); + if(!item->valuestring) + { + cJSON_Delete(item); + return NULL; + } + } + + return item; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateArray(void) +{ + cJSON *item = cJSON_New_Item(&global_hooks); + if(item) + { + item->type=cJSON_Array; + } + + return item; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateObject(void) +{ + cJSON *item = cJSON_New_Item(&global_hooks); + if (item) + { + item->type = cJSON_Object; + } + + return item; +} + +/* Create Arrays: */ +CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count) +{ + size_t i = 0; + cJSON *n = NULL; + cJSON *p = NULL; + cJSON *a = NULL; + + if ((count < 0) || (numbers == NULL)) + { + return NULL; + } + + a = cJSON_CreateArray(); + for(i = 0; a && (i < (size_t)count); i++) + { + n = cJSON_CreateNumber(numbers[i]); + if (!n) + { + cJSON_Delete(a); + return NULL; + } + if(!i) + { + a->child = n; + } + else + { + suffix_object(p, n); + } + p = n; + } + a->child->prev = n; + + return a; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count) +{ + size_t i = 0; + cJSON *n = NULL; + cJSON *p = NULL; + cJSON *a = NULL; + + if ((count < 0) || (numbers == NULL)) + { + return NULL; + } + + a = cJSON_CreateArray(); + + for(i = 0; a && (i < (size_t)count); i++) + { + n = cJSON_CreateNumber((double)numbers[i]); + if(!n) + { + cJSON_Delete(a); + return NULL; + } + if(!i) + { + a->child = n; + } + else + { + suffix_object(p, n); + } + p = n; + } + a->child->prev = n; + + return a; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateDoubleArray(const double *numbers, int count) +{ + size_t i = 0; + cJSON *n = NULL; + cJSON *p = NULL; + cJSON *a = NULL; + + if ((count < 0) || (numbers == NULL)) + { + return NULL; + } + + a = cJSON_CreateArray(); + + for(i = 0;a && (i < (size_t)count); i++) + { + n = cJSON_CreateNumber(numbers[i]); + if(!n) + { + cJSON_Delete(a); + return NULL; + } + if(!i) + { + a->child = n; + } + else + { + suffix_object(p, n); + } + p = n; + } + a->child->prev = n; + + return a; +} + +CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char *const *strings, int count) +{ + size_t i = 0; + cJSON *n = NULL; + cJSON *p = NULL; + cJSON *a = NULL; + + if ((count < 0) || (strings == NULL)) + { + return NULL; + } + + a = cJSON_CreateArray(); + + for (i = 0; a && (i < (size_t)count); i++) + { + n = cJSON_CreateString(strings[i]); + if(!n) + { + cJSON_Delete(a); + return NULL; + } + if(!i) + { + a->child = n; + } + else + { + suffix_object(p,n); + } + p = n; + } + a->child->prev = n; + + return a; +} + +/* Duplication */ +CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse) +{ + cJSON *newitem = NULL; + cJSON *child = NULL; + cJSON *next = NULL; + cJSON *newchild = NULL; + + /* Bail on bad ptr */ + if (!item) + { + goto fail; + } + /* Create new item */ + newitem = cJSON_New_Item(&global_hooks); + if (!newitem) + { + goto fail; + } + /* Copy over all vars */ + newitem->type = item->type & (~cJSON_IsReference); + newitem->valueint = item->valueint; + newitem->valuedouble = item->valuedouble; + if (item->valuestring) + { + newitem->valuestring = (char*)cJSON_strdup((unsigned char*)item->valuestring, &global_hooks); + if (!newitem->valuestring) + { + goto fail; + } + } + if (item->string) + { + newitem->string = (item->type&cJSON_StringIsConst) ? item->string : (char*)cJSON_strdup((unsigned char*)item->string, &global_hooks); + if (!newitem->string) + { + goto fail; + } + } + /* If non-recursive, then we're done! */ + if (!recurse) + { + return newitem; + } + /* Walk the ->next chain for the child. */ + child = item->child; + while (child != NULL) + { + newchild = cJSON_Duplicate(child, true); /* Duplicate (with recurse) each item in the ->next chain */ + if (!newchild) + { + goto fail; + } + if (next != NULL) + { + /* If newitem->child already set, then crosswire ->prev and ->next and move on */ + next->next = newchild; + newchild->prev = next; + next = newchild; + } + else + { + /* Set newitem->child and move to it */ + newitem->child = newchild; + next = newchild; + } + child = child->next; + } + if (newitem && newitem->child) + { + newitem->child->prev = newchild; + } + + return newitem; + +fail: + if (newitem != NULL) + { + cJSON_Delete(newitem); + } + + return NULL; +} + +static void skip_oneline_comment(char **input) +{ + *input += static_strlen("//"); + + for (; (*input)[0] != '\0'; ++(*input)) + { + if ((*input)[0] == '\n') { + *input += static_strlen("\n"); + return; + } + } +} + +static void skip_multiline_comment(char **input) +{ + *input += static_strlen("/*"); + + for (; (*input)[0] != '\0'; ++(*input)) + { + if (((*input)[0] == '*') && ((*input)[1] == '/')) + { + *input += static_strlen("*/"); + return; + } + } +} + +static void minify_string(char **input, char **output) { + (*output)[0] = (*input)[0]; + *input += static_strlen("\""); + *output += static_strlen("\""); + + + for (; (*input)[0] != '\0'; (void)++(*input), ++(*output)) { + (*output)[0] = (*input)[0]; + + if ((*input)[0] == '\"') { + (*output)[0] = '\"'; + *input += static_strlen("\""); + *output += static_strlen("\""); + return; + } else if (((*input)[0] == '\\') && ((*input)[1] == '\"')) { + (*output)[1] = (*input)[1]; + *input += static_strlen("\""); + *output += static_strlen("\""); + } + } +} + +CJSON_PUBLIC(void) cJSON_Minify(char *json) +{ + char *into = json; + + if (json == NULL) + { + return; + } + + while (json[0] != '\0') + { + switch (json[0]) + { + case ' ': + case '\t': + case '\r': + case '\n': + json++; + break; + + case '/': + if (json[1] == '/') + { + skip_oneline_comment(&json); + } + else if (json[1] == '*') + { + skip_multiline_comment(&json); + } else { + json++; + } + break; + + case '\"': + minify_string(&json, (char**)&into); + break; + + default: + into[0] = json[0]; + json++; + into++; + } + } + + /* and null-terminate. */ + *into = '\0'; +} + +CJSON_PUBLIC(cJSON_bool) cJSON_IsInvalid(const cJSON * const item) +{ + if (item == NULL) + { + return false; + } + + return (item->type & 0xFF) == cJSON_Invalid; +} + +CJSON_PUBLIC(cJSON_bool) cJSON_IsFalse(const cJSON * const item) +{ + if (item == NULL) + { + return false; + } + + return (item->type & 0xFF) == cJSON_False; +} + +CJSON_PUBLIC(cJSON_bool) cJSON_IsTrue(const cJSON * const item) +{ + if (item == NULL) + { + return false; + } + + return (item->type & 0xff) == cJSON_True; +} + + +CJSON_PUBLIC(cJSON_bool) cJSON_IsBool(const cJSON * const item) +{ + if (item == NULL) + { + return false; + } + + return (item->type & (cJSON_True | cJSON_False)) != 0; +} +CJSON_PUBLIC(cJSON_bool) cJSON_IsNull(const cJSON * const item) +{ + if (item == NULL) + { + return false; + } + + return (item->type & 0xFF) == cJSON_NULL; +} + +CJSON_PUBLIC(cJSON_bool) cJSON_IsNumber(const cJSON * const item) +{ + if (item == NULL) + { + return false; + } + + return (item->type & 0xFF) == cJSON_Number; +} + +CJSON_PUBLIC(cJSON_bool) cJSON_IsString(const cJSON * const item) +{ + if (item == NULL) + { + return false; + } + + return (item->type & 0xFF) == cJSON_String; +} + +CJSON_PUBLIC(cJSON_bool) cJSON_IsArray(const cJSON * const item) +{ + if (item == NULL) + { + return false; + } + + return (item->type & 0xFF) == cJSON_Array; +} + +CJSON_PUBLIC(cJSON_bool) cJSON_IsObject(const cJSON * const item) +{ + if (item == NULL) + { + return false; + } + + return (item->type & 0xFF) == cJSON_Object; +} + +CJSON_PUBLIC(cJSON_bool) cJSON_IsRaw(const cJSON * const item) +{ + if (item == NULL) + { + return false; + } + + return (item->type & 0xFF) == cJSON_Raw; +} + +CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive) +{ + if ((a == NULL) || (b == NULL) || ((a->type & 0xFF) != (b->type & 0xFF)) || cJSON_IsInvalid(a)) + { + return false; + } + + /* check if type is valid */ + switch (a->type & 0xFF) + { + case cJSON_False: + case cJSON_True: + case cJSON_NULL: + case cJSON_Number: + case cJSON_String: + case cJSON_Raw: + case cJSON_Array: + case cJSON_Object: + break; + + default: + return false; + } + + /* identical objects are equal */ + if (a == b) + { + return true; + } + + switch (a->type & 0xFF) + { + /* in these cases and equal type is enough */ + case cJSON_False: + case cJSON_True: + case cJSON_NULL: + return true; + + case cJSON_Number: + if (compare_double(a->valuedouble, b->valuedouble)) + { + return true; + } + return false; + + case cJSON_String: + case cJSON_Raw: + if ((a->valuestring == NULL) || (b->valuestring == NULL)) + { + return false; + } + if (strcmp(a->valuestring, b->valuestring) == 0) + { + return true; + } + + return false; + + case cJSON_Array: + { + cJSON *a_element = a->child; + cJSON *b_element = b->child; + + for (; (a_element != NULL) && (b_element != NULL);) + { + if (!cJSON_Compare(a_element, b_element, case_sensitive)) + { + return false; + } + + a_element = a_element->next; + b_element = b_element->next; + } + + /* one of the arrays is longer than the other */ + if (a_element != b_element) { + return false; + } + + return true; + } + + case cJSON_Object: + { + cJSON *a_element = NULL; + cJSON *b_element = NULL; + cJSON_ArrayForEach(a_element, a) + { + /* TODO This has O(n^2) runtime, which is horrible! */ + b_element = get_object_item(b, a_element->string, case_sensitive); + if (b_element == NULL) + { + return false; + } + + if (!cJSON_Compare(a_element, b_element, case_sensitive)) + { + return false; + } + } + + /* doing this twice, once on a and b to prevent true comparison if a subset of b + * TODO: Do this the proper way, this is just a fix for now */ + cJSON_ArrayForEach(b_element, b) + { + a_element = get_object_item(a, b_element->string, case_sensitive); + if (a_element == NULL) + { + return false; + } + + if (!cJSON_Compare(b_element, a_element, case_sensitive)) + { + return false; + } + } + + return true; + } + + default: + return false; + } +} + +CJSON_PUBLIC(void *) cJSON_malloc(size_t size) +{ + return global_hooks.allocate(size); +} + +CJSON_PUBLIC(void) cJSON_free(void *object) +{ + global_hooks.deallocate(object); +} + diff --git a/src/cjson/cJSON.h b/src/cjson/cJSON.h new file mode 100644 index 0000000..e633019 --- /dev/null +++ b/src/cjson/cJSON.h @@ -0,0 +1,293 @@ +/* + Copyright (c) 2009-2017 Dave Gamble and cJSON contributors + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. +*/ + +#ifndef cJSON__h +#define cJSON__h + +#ifdef __cplusplus +extern "C" +{ +#endif + +#if !defined(__WINDOWS__) && (defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32)) +#define __WINDOWS__ +#endif + +#ifdef __WINDOWS__ + +/* When compiling for windows, we specify a specific calling convention to avoid issues where we are being called from a project with a different default calling convention. For windows you have 3 define options: + +CJSON_HIDE_SYMBOLS - Define this in the case where you don't want to ever dllexport symbols +CJSON_EXPORT_SYMBOLS - Define this on library build when you want to dllexport symbols (default) +CJSON_IMPORT_SYMBOLS - Define this if you want to dllimport symbol + +For *nix builds that support visibility attribute, you can define similar behavior by + +setting default visibility to hidden by adding +-fvisibility=hidden (for gcc) +or +-xldscope=hidden (for sun cc) +to CFLAGS + +then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJSON_EXPORT_SYMBOLS does + +*/ + +#define CJSON_CDECL __cdecl +#define CJSON_STDCALL __stdcall + +/* export symbols by default, this is necessary for copy pasting the C and header file */ +#if !defined(CJSON_HIDE_SYMBOLS) && !defined(CJSON_IMPORT_SYMBOLS) && !defined(CJSON_EXPORT_SYMBOLS) +#define CJSON_EXPORT_SYMBOLS +#endif + +#if defined(CJSON_HIDE_SYMBOLS) +#define CJSON_PUBLIC(type) type CJSON_STDCALL +#elif defined(CJSON_EXPORT_SYMBOLS) +#define CJSON_PUBLIC(type) __declspec(dllexport) type CJSON_STDCALL +#elif defined(CJSON_IMPORT_SYMBOLS) +#define CJSON_PUBLIC(type) __declspec(dllimport) type CJSON_STDCALL +#endif +#else /* !__WINDOWS__ */ +#define CJSON_CDECL +#define CJSON_STDCALL + +#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(CJSON_API_VISIBILITY) +#define CJSON_PUBLIC(type) __attribute__((visibility("default"))) type +#else +#define CJSON_PUBLIC(type) type +#endif +#endif + +/* project version */ +#define CJSON_VERSION_MAJOR 1 +#define CJSON_VERSION_MINOR 7 +#define CJSON_VERSION_PATCH 14 + +#include + +/* cJSON Types: */ +#define cJSON_Invalid (0) +#define cJSON_False (1 << 0) +#define cJSON_True (1 << 1) +#define cJSON_NULL (1 << 2) +#define cJSON_Number (1 << 3) +#define cJSON_String (1 << 4) +#define cJSON_Array (1 << 5) +#define cJSON_Object (1 << 6) +#define cJSON_Raw (1 << 7) /* raw json */ + +#define cJSON_IsReference 256 +#define cJSON_StringIsConst 512 + +/* The cJSON structure: */ +typedef struct cJSON +{ + /* next/prev allow you to walk array/object chains. Alternatively, use GetArraySize/GetArrayItem/GetObjectItem */ + struct cJSON *next; + struct cJSON *prev; + /* An array or object item will have a child pointer pointing to a chain of the items in the array/object. */ + struct cJSON *child; + + /* The type of the item, as above. */ + int type; + + /* The item's string, if type==cJSON_String and type == cJSON_Raw */ + char *valuestring; + /* writing to valueint is DEPRECATED, use cJSON_SetNumberValue instead */ + int valueint; + /* The item's number, if type==cJSON_Number */ + double valuedouble; + + /* The item's name string, if this item is the child of, or is in the list of subitems of an object. */ + char *string; +} cJSON; + +typedef struct cJSON_Hooks +{ + /* malloc/free are CDECL on Windows regardless of the default calling convention of the compiler, so ensure the hooks allow passing those functions directly. */ + void *(CJSON_CDECL *malloc_fn)(size_t sz); + void (CJSON_CDECL *free_fn)(void *ptr); +} cJSON_Hooks; + +typedef int cJSON_bool; + +/* Limits how deeply nested arrays/objects can be before cJSON rejects to parse them. + * This is to prevent stack overflows. */ +#ifndef CJSON_NESTING_LIMIT +#define CJSON_NESTING_LIMIT 1000 +#endif + +/* returns the version of cJSON as a string */ +CJSON_PUBLIC(const char*) cJSON_Version(void); + +/* Supply malloc, realloc and free functions to cJSON */ +CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks); + +/* Memory Management: the caller is always responsible to free the results from all variants of cJSON_Parse (with cJSON_Delete) and cJSON_Print (with stdlib free, cJSON_Hooks.free_fn, or cJSON_free as appropriate). The exception is cJSON_PrintPreallocated, where the caller has full responsibility of the buffer. */ +/* Supply a block of JSON, and this returns a cJSON object you can interrogate. */ +CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value); +CJSON_PUBLIC(cJSON *) cJSON_ParseWithLength(const char *value, size_t buffer_length); +/* ParseWithOpts allows you to require (and check) that the JSON is null terminated, and to retrieve the pointer to the final byte parsed. */ +/* If you supply a ptr in return_parse_end and parsing fails, then return_parse_end will contain a pointer to the error so will match cJSON_GetErrorPtr(). */ +CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated); +CJSON_PUBLIC(cJSON *) cJSON_ParseWithLengthOpts(const char *value, size_t buffer_length, const char **return_parse_end, cJSON_bool require_null_terminated); + +/* Render a cJSON entity to text for transfer/storage. */ +CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item); +/* Render a cJSON entity to text for transfer/storage without any formatting. */ +CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item); +/* Render a cJSON entity to text using a buffered strategy. prebuffer is a guess at the final size. guessing well reduces reallocation. fmt=0 gives unformatted, =1 gives formatted */ +CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt); +/* Render a cJSON entity to text using a buffer already allocated in memory with given length. Returns 1 on success and 0 on failure. */ +/* NOTE: cJSON is not always 100% accurate in estimating how much memory it will use, so to be safe allocate 5 bytes more than you actually need */ +CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buffer, const int length, const cJSON_bool format); +/* Delete a cJSON entity and all subentities. */ +CJSON_PUBLIC(void) cJSON_Delete(cJSON *item); + +/* Returns the number of items in an array (or object). */ +CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array); +/* Retrieve item number "index" from array "array". Returns NULL if unsuccessful. */ +CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index); +/* Get item "string" from object. Case insensitive. */ +CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string); +CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string); +CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string); +/* For analysing failed parses. This returns a pointer to the parse error. You'll probably need to look a few chars back to make sense of it. Defined when cJSON_Parse() returns 0. 0 when cJSON_Parse() succeeds. */ +CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void); + +/* Check item type and return its value */ +CJSON_PUBLIC(char *) cJSON_GetStringValue(const cJSON * const item); +CJSON_PUBLIC(double) cJSON_GetNumberValue(const cJSON * const item); + +/* These functions check the type of an item */ +CJSON_PUBLIC(cJSON_bool) cJSON_IsInvalid(const cJSON * const item); +CJSON_PUBLIC(cJSON_bool) cJSON_IsFalse(const cJSON * const item); +CJSON_PUBLIC(cJSON_bool) cJSON_IsTrue(const cJSON * const item); +CJSON_PUBLIC(cJSON_bool) cJSON_IsBool(const cJSON * const item); +CJSON_PUBLIC(cJSON_bool) cJSON_IsNull(const cJSON * const item); +CJSON_PUBLIC(cJSON_bool) cJSON_IsNumber(const cJSON * const item); +CJSON_PUBLIC(cJSON_bool) cJSON_IsString(const cJSON * const item); +CJSON_PUBLIC(cJSON_bool) cJSON_IsArray(const cJSON * const item); +CJSON_PUBLIC(cJSON_bool) cJSON_IsObject(const cJSON * const item); +CJSON_PUBLIC(cJSON_bool) cJSON_IsRaw(const cJSON * const item); + +/* These calls create a cJSON item of the appropriate type. */ +CJSON_PUBLIC(cJSON *) cJSON_CreateNull(void); +CJSON_PUBLIC(cJSON *) cJSON_CreateTrue(void); +CJSON_PUBLIC(cJSON *) cJSON_CreateFalse(void); +CJSON_PUBLIC(cJSON *) cJSON_CreateBool(cJSON_bool boolean); +CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(double num); +CJSON_PUBLIC(cJSON *) cJSON_CreateString(const char *string); +/* raw json */ +CJSON_PUBLIC(cJSON *) cJSON_CreateRaw(const char *raw); +CJSON_PUBLIC(cJSON *) cJSON_CreateArray(void); +CJSON_PUBLIC(cJSON *) cJSON_CreateObject(void); + +/* Create a string where valuestring references a string so + * it will not be freed by cJSON_Delete */ +CJSON_PUBLIC(cJSON *) cJSON_CreateStringReference(const char *string); +/* Create an object/array that only references it's elements so + * they will not be freed by cJSON_Delete */ +CJSON_PUBLIC(cJSON *) cJSON_CreateObjectReference(const cJSON *child); +CJSON_PUBLIC(cJSON *) cJSON_CreateArrayReference(const cJSON *child); + +/* These utilities create an Array of count items. + * The parameter count cannot be greater than the number of elements in the number array, otherwise array access will be out of bounds.*/ +CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count); +CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count); +CJSON_PUBLIC(cJSON *) cJSON_CreateDoubleArray(const double *numbers, int count); +CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char *const *strings, int count); + +/* Append item to the specified array/object. */ +CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToArray(cJSON *array, cJSON *item); +CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item); +/* Use this when string is definitely const (i.e. a literal, or as good as), and will definitely survive the cJSON object. + * WARNING: When this function was used, make sure to always check that (item->type & cJSON_StringIsConst) is zero before + * writing to `item->string` */ +CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item); +/* Append reference to item to the specified array/object. Use this when you want to add an existing cJSON to a new cJSON, but don't want to corrupt your existing cJSON. */ +CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item); +CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item); + +/* Remove/Detach items from Arrays/Objects. */ +CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item); +CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which); +CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which); +CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string); +CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string); +CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string); +CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string); + +/* Update array items. */ +CJSON_PUBLIC(cJSON_bool) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem); /* Shifts pre-existing items to the right. */ +CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement); +CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem); +CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem); +CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object,const char *string,cJSON *newitem); + +/* Duplicate a cJSON item */ +CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse); +/* Duplicate will create a new, identical cJSON item to the one you pass, in new memory that will + * need to be released. With recurse!=0, it will duplicate any children connected to the item. + * The item->next and ->prev pointers are always zero on return from Duplicate. */ +/* Recursively compare two cJSON items for equality. If either a or b is NULL or invalid, they will be considered unequal. + * case_sensitive determines if object keys are treated case sensitive (1) or case insensitive (0) */ +CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive); + +/* Minify a strings, remove blank characters(such as ' ', '\t', '\r', '\n') from strings. + * The input pointer json cannot point to a read-only address area, such as a string constant, + * but should point to a readable and writable adress area. */ +CJSON_PUBLIC(void) cJSON_Minify(char *json); + +/* Helper functions for creating and adding items to an object at the same time. + * They return the added item or NULL on failure. */ +CJSON_PUBLIC(cJSON*) cJSON_AddNullToObject(cJSON * const object, const char * const name); +CJSON_PUBLIC(cJSON*) cJSON_AddTrueToObject(cJSON * const object, const char * const name); +CJSON_PUBLIC(cJSON*) cJSON_AddFalseToObject(cJSON * const object, const char * const name); +CJSON_PUBLIC(cJSON*) cJSON_AddBoolToObject(cJSON * const object, const char * const name, const cJSON_bool boolean); +CJSON_PUBLIC(cJSON*) cJSON_AddNumberToObject(cJSON * const object, const char * const name, const double number); +CJSON_PUBLIC(cJSON*) cJSON_AddStringToObject(cJSON * const object, const char * const name, const char * const string); +CJSON_PUBLIC(cJSON*) cJSON_AddRawToObject(cJSON * const object, const char * const name, const char * const raw); +CJSON_PUBLIC(cJSON*) cJSON_AddObjectToObject(cJSON * const object, const char * const name); +CJSON_PUBLIC(cJSON*) cJSON_AddArrayToObject(cJSON * const object, const char * const name); + +/* When assigning an integer value, it needs to be propagated to valuedouble too. */ +#define cJSON_SetIntValue(object, number) ((object) ? (object)->valueint = (object)->valuedouble = (number) : (number)) +/* helper for the cJSON_SetNumberValue macro */ +CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number); +#define cJSON_SetNumberValue(object, number) ((object != NULL) ? cJSON_SetNumberHelper(object, (double)number) : (number)) +/* Change the valuestring of a cJSON_String object, only takes effect when type of object is cJSON_String */ +CJSON_PUBLIC(char*) cJSON_SetValuestring(cJSON *object, const char *valuestring); + +/* Macro for iterating over an array or object */ +#define cJSON_ArrayForEach(element, array) for(element = (array != NULL) ? (array)->child : NULL; element != NULL; element = element->next) + +/* malloc/free objects using the malloc/free functions that have been set with cJSON_InitHooks */ +CJSON_PUBLIC(void *) cJSON_malloc(size_t size); +CJSON_PUBLIC(void) cJSON_free(void *object); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/src/config/config.json b/src/config/config.json new file mode 100644 index 0000000..6481779 --- /dev/null +++ b/src/config/config.json @@ -0,0 +1,7 @@ +{ +"GameName":"Graveyard Shift", +"WindowName":"Graveyard Shift", +"WindowSize":{"w":320,"h":240}, +"WindowFullScreen": 0, +"GlobalScale": 4 +} diff --git a/src/config/credits.json b/src/config/credits.json new file mode 100644 index 0000000..74e2dfd --- /dev/null +++ b/src/config/credits.json @@ -0,0 +1,6 @@ +{ +"GameName":"Graveyard Shift", +"Developers": "Alan Youngblood", +"LibraryDevelopers": "Sam Lantinga, Dave Gamble, Carl Birch, Job Vranish, David Lafreniere", +"SpecialThanks":"Nic Allen, Brian Lhota" +} diff --git a/src/ecs/Animation.h b/src/ecs/Animation.h new file mode 100644 index 0000000..35370e9 --- /dev/null +++ b/src/ecs/Animation.h @@ -0,0 +1,28 @@ +/* + * Animation.h + * + * Created on: Mar 27, 2020 + * Author: ayoungblood + */ + +#ifndef SRC_ECS_ANIMATION_H_ +#define SRC_ECS_ANIMATION_H_ + +struct Animation +{ + int index; + int frames; + int speed; + + Animation() {} + Animation(int i, int f, int s) + { + index = i; + frames = f; + speed = s; + } +}; + + + +#endif /* SRC_ECS_ANIMATION_H_ */ diff --git a/src/ecs/ColliderComponent.h b/src/ecs/ColliderComponent.h new file mode 100644 index 0000000..d0cc225 --- /dev/null +++ b/src/ecs/ColliderComponent.h @@ -0,0 +1,104 @@ +/* + * ColliderComponent.h + * + * Created on: Mar 8, 2020 + * Author: ayoungblood + */ + +#ifndef SRC_ECS_COLLIDERCOMPONENT_H_ +#define SRC_ECS_COLLIDERCOMPONENT_H_ + +#include +#include "SDL2/SDL.h" +#include "Components.h" +#include "../assetmgr/TextureManager.h" +#include + +class ColliderComponent : public Component +{ +public: + SDL_Rect collider; + std::string tag; + + SDL_Texture* tex; + SDL_Rect srcR, destR; + + TransformComponent* transform; + + ColliderComponent(std::string t) + { + tag = t; +// collider.x = 10; +// collider.y = 52; +// collider.w = collider.h = 12; + } + + ColliderComponent(std::string t, int xpos, int ypos, int size, int scale) + { + tag = t; + collider.x = xpos; + collider.y = ypos; + collider.w = collider.h = size*scale; + } + + ColliderComponent(std::string t, int width, int height) + { + tag = t; + collider.w = width; + collider.h = height; + } + + void init() override + { + if (!entity->hasComponent()) + { + entity->addComponent(); + } + transform = &entity->getComponent(); + + tex = TextureManager::LoadTexture("assets/ColTex.png"); + srcR = { 0, 0, 16, 16}; + destR = { collider.x, collider.y, collider.w, collider.h }; +// if(tag == "player"){ +// destR = { 18, 28, 24, 24 }; +// transform->height = 24; +// transform->width = 24; +// std::cout << "player collider init() ran" << std::endl; +// std::cout << "destR.w: " << destR.w << std::endl; +// std::cout << "destR.h: " << destR.h << std::endl; +// } +// Game::colliders.push_back(this); + } + + void update() override + { +// if(tag != "terrain") +// { +// collider.x = static_cast(transform->position.x)+9; +// collider.y = static_cast(transform->position.y)+28; +//// collider.w = transform->width * transform->scale; +//// collider.h = transform->height * transform->scale; +// collider.w = 12 * transform->scale; +// collider.h = 12 * transform->scale; +// +//// std::cout << "collider.w: " << collider.w << std::endl; +//// std::cout << "collider.h: " << collider.h << std::endl; +//// std::cout << "tag: " << tag << std::endl; +// } + destR.x = collider.x - Game::camera.x; + destR.y = collider.y - Game::camera.y; +// std::cout << "tag: " << tag << std::endl; + } + + void draw() override + { + if(tag == "terrain") + { + TextureManager::Draw(tex, srcR, destR, SDL_FLIP_NONE); + } + } + +}; + + +#endif /* SRC_ECS_COLLIDERCOMPONENT_H_ */ diff --git a/src/ecs/Components.h b/src/ecs/Components.h new file mode 100644 index 0000000..61ff807 --- /dev/null +++ b/src/ecs/Components.h @@ -0,0 +1,23 @@ +/* + * Components.h + * + * Created on: Feb 21, 2020 + * Author: ayoungblood + */ + +#ifndef SRC_COMPONENTS_H_ +#define SRC_COMPONENTS_H_ + +#include "ECS.h" +#include "TransformComponent.h" +#include "SpriteComponent.h" +#include "KeyboardController.h" +#include "ColliderComponent.h" +#include "ProjectileComponent.h" +#include "TileComponent.h" +#include "UIFontComponent.h" + + + + +#endif /* SRC_COMPONENTS_H_ */ diff --git a/src/ecs/ECS.cpp b/src/ecs/ECS.cpp new file mode 100644 index 0000000..6faaf7c --- /dev/null +++ b/src/ecs/ECS.cpp @@ -0,0 +1,14 @@ +/* + * ECS.cpp + * + * Created on: Mar 24, 2020 + * Author: ayoungblood + */ + +#include "ECS.h" + +void Entity::addGroup(Group mGroup) +{ + groupBitset[mGroup] = true; + manager.AddToGroup(this, mGroup); +} diff --git a/src/ecs/ECS.h b/src/ecs/ECS.h new file mode 100644 index 0000000..26ee1d4 --- /dev/null +++ b/src/ecs/ECS.h @@ -0,0 +1,177 @@ +/* + * ECS.h + * + * Created on: Feb 21, 2020 + * Author: ayoungblood + */ + +#ifndef SRC_ECS_H_ +#define SRC_ECS_H_ + +#include +#include +#include +#include +#include +#include + +class Component; +class Entity; +class Manager; + +using ComponentID = std::size_t; +using Group = std::size_t; + +inline ComponentID getNewComponentTypeID() +{ + static ComponentID lastID = 0u; + return lastID++; +} + + +template inline ComponentID getComponentTypeID() noexcept +{ + static_assert (std::is_base_of::value, ""); + static ComponentID typeID = getNewComponentTypeID(); + return typeID; +} + +constexpr std::size_t maxComponents = 32; +constexpr std::size_t maxGroups =32; + +using ComponentBitSet = std::bitset; +using GroupBitset = std::bitset; + +using ComponentArray = std::array; + +class Component +{ +public: + Entity* entity; + + virtual void init() {} + virtual void update() {} + virtual void draw() {} + + virtual ~Component() {} + +}; + +class Entity +{ +private: + Manager& manager; + bool active = true; + std::vector> components; + ComponentArray componentArray; + ComponentBitSet componentBitSet; + GroupBitset groupBitset; + +public: + Entity(Manager& mManager) : manager(mManager) {} + + void update() + { + for(auto& c : components) c->update(); + } + void draw() + { + for(auto& c : components) c->draw(); + } + bool isActive() const { return active; } + void destroy() { active = false; } + bool hasGroup(Group mGroup) + { + return groupBitset[mGroup]; + } + + void addGroup(Group mGroup); + void delGroup(Group mGroup) + { + groupBitset[mGroup] = false; + } + + template bool hasComponent() const + { + return componentBitSet[getComponentTypeID()]; + } + + template + T& addComponent(TArgs&&... mArgs) + { + T* c(new T(std::forward(mArgs)...)); + c->entity = this; + std::unique_ptr uPtr{ c }; + components.emplace_back(std::move(uPtr)); + + componentArray[getComponentTypeID()] = c; + componentBitSet[getComponentTypeID()] = true; + + c->init(); + return *c; + } + + template T& getComponent() const + { + auto ptr(componentArray[getComponentTypeID()]); + return *static_cast(ptr); + } + +}; + +class Manager +{ +private: + std::vector> entities; + std::array, maxGroups> groupedEntities; +public: + void update() + { + for (auto& e : entities) e->update(); + } + void draw() + { + for (auto& e : entities) e->draw(); + } + void refresh() + { + for (auto i(0u); i < maxGroups; i++) + { + auto& v(groupedEntities[i]); + v.erase( + std::remove_if(std::begin(v), std::end(v), + [i](Entity* mEntity) + { + return !mEntity->isActive() || !mEntity->hasGroup(i); + }), + std::end(v)); + } + + entities.erase(std::remove_if(std::begin(entities), std::end(entities), + [](const std::unique_ptr &mEntity) + { + return !mEntity->isActive(); + }), + std::end(entities)); + } + + void AddToGroup(Entity* mEntity, Group mGroup) + { + groupedEntities[mGroup].emplace_back(mEntity); + } + + std::vector& getGroup(Group mGroup) + { + return groupedEntities[mGroup]; + } + + Entity& addEntity() + { + Entity* e = new Entity(*this); + std::unique_ptr uPtr{ e }; + entities.emplace_back(std::move(uPtr)); + return *e; + } +}; + +#endif /* SRC_ECS_H_ */ diff --git a/src/ecs/KeyboardController.h b/src/ecs/KeyboardController.h new file mode 100644 index 0000000..99cf343 --- /dev/null +++ b/src/ecs/KeyboardController.h @@ -0,0 +1,126 @@ +/* + * KeyboardController.h + * + * Created on: Mar 1, 2020 + * Author: ayoungblood + */ + +#ifndef SRC_ECS_KEYBOARDCONTROLLER_H_ +#define SRC_ECS_KEYBOARDCONTROLLER_H_ + +#include "../game/Game.hpp" +#include "ECS.h" +#include "Components.h" +#include "../assetmgr/AssetManager.h" + +class KeyboardController : public Component +{ +public: + TransformComponent *transform; + SpriteComponent *sprite; + + Game *game; + + void init() override + { + transform = &entity->getComponent(); + sprite = &entity->getComponent(); + } + + void update() override + { + if (Game::event.type == SDL_KEYDOWN) + { + switch (Game::event.key.keysym.sym) + { + case SDLK_UP: + transform->velocity.y = -1; +// sprite->Play("WalkNorth"); + if (transform->velocity.x < 0) + { +// sprite->Play("WalkNW"); + } + if (transform->velocity.x > 0) + { +// sprite->Play("WalkNW"); +// sprite->spriteFlip = SDL_FLIP_HORIZONTAL; + } + break; + case SDLK_DOWN: + transform->velocity.y = 1; +// sprite->Play("WalkSouth"); + if (transform->velocity.x < 0) + { +// sprite->Play("WalkSW"); + } + if (transform->velocity.x > 0) + { +// sprite->Play("WalkSW"); +// sprite->spriteFlip = SDL_FLIP_HORIZONTAL; + } + break; + case SDLK_LEFT: + transform->velocity.x = -1; +// sprite->Play("Walk"); + break; + case SDLK_RIGHT: + transform->velocity.x = 1; +// sprite->Play("Walk"); +// sprite->spriteFlip = SDL_FLIP_HORIZONTAL; + break; + case SDLK_k: +// game->printDebug(""); + break; + case SDLK_j: + if (Mix_PlayChannel(-1, Game::assets->GetSoundClip("bwoop"),0) == 0) + { + Mix_PlayChannel(-1, Game::assets->GetSoundClip("bwoop"),0); + } + break; + default: + break; + } + } + + if (Game::event.type == SDL_KEYUP) + { + switch (Game::event.key.keysym.sym) + { + case SDLK_UP: + transform->velocity.y = 0; +// sprite->Play("Idle"); +// sprite->spriteFlip = SDL_FLIP_NONE; + break; + case SDLK_DOWN: + transform->velocity.y = 0; +// sprite->Play("Idle"); +// sprite->spriteFlip = SDL_FLIP_NONE; + break; + case SDLK_LEFT: + transform->velocity.x = 0; +// sprite->Play("Idle"); + break; + case SDLK_RIGHT: + transform->velocity.x = 0; +// sprite->Play("Idle"); +// sprite->spriteFlip = SDL_FLIP_NONE; + break; + case SDLK_k: + if (Game::debugCollisionBoxes) + { Game::debugCollisionBoxes = false; } + else + {Game::debugCollisionBoxes = true; } + break; + case SDLK_ESCAPE: // exit the game when Escape pressed + Game::isRunning = false; + break; + default: + break; + } + } + } + +}; + + +#endif /* SRC_ECS_KEYBOARDCONTROLLER_H_ */ diff --git a/src/ecs/ProjectileComponent.h b/src/ecs/ProjectileComponent.h new file mode 100644 index 0000000..a0fdddd --- /dev/null +++ b/src/ecs/ProjectileComponent.h @@ -0,0 +1,58 @@ +/* + * Projectile.h + * + * Created on: Apr 4, 2020 + * Author: ayoungblood + */ + +#ifndef SRC_ECS_PROJECTILECOMPONENT_H_ +#define SRC_ECS_PROJECTILECOMPONENT_H_ + +#include "ECS.h" +#include "Components.h" +#include "../game/Vector2D.h" + +class ProjectileComponent : public Component +{ +public: + ProjectileComponent(int rng, int sp, Vector2D vel) : range(rng), speed(sp), velocity(vel) + {} + ~ProjectileComponent() + {} + + void init() override + { + transform = &entity->getComponent(); + transform->velocity = velocity; +// std::cout << transform->position << std::endl; + } + + void update() override + { + distance += speed; + if (distance > range) + { + entity->destroy(); + } + else if (transform->position.x > Game::camera.x + Game::camera.w || + transform->position.x < Game::camera.x || + transform->position.y > Game::camera.y +Game::camera.h || + transform->position.y < Game::camera.y) + { + entity->destroy(); + } + + } + +private: + + TransformComponent* transform; + + int range; + int speed; + int distance; + Vector2D velocity; + +}; + +#endif /* SRC_ECS_PROJECTILECOMPONENT_H_ */ diff --git a/src/ecs/SpriteComponent.h b/src/ecs/SpriteComponent.h new file mode 100644 index 0000000..e95252b --- /dev/null +++ b/src/ecs/SpriteComponent.h @@ -0,0 +1,216 @@ +/* + * SpriteComponent.h + * + * Created on: Feb 22, 2020 + * Author: ayoungblood + */ + +#ifndef SRC_ECS_SPRITECOMPONENT_H_ +#define SRC_ECS_SPRITECOMPONENT_H_ + +#define ASCII_START_IDX 32 +#define ASCII_COUNT 96 +#define ASCII_ROW_COUNT 16 + +#include "Components.h" +#include "SDL2/SDL.h" +#include "../assetmgr/TextureManager.h" +#include "Animation.h" +#include +#include "../assetmgr/AssetManager.h" +#include "../cjson/cJSON.h" +#include +#include +#include +#include +#include + +class SpriteComponent : public Component +{ +private: + TransformComponent *transform; + SDL_Texture *texture; + SDL_Rect srcRect, destRect; + char letter; + int frames = 0; + int speed = 100; + int letterWidth, letterHeight; + int scale = 1; + +public: + enum SpriteType : std::size_t + { + spriteUIL0, + spriteUIL1, + spriteText, + spriteObject, + spriteTileMap, + spriteActor, + spriteAnimation, + spriteAtlas + }; + SpriteType spriteType; + int animIndex = 0; + bool ui = false; + std::map animations; + + SDL_RendererFlip spriteFlip = SDL_FLIP_NONE; + +// SpriteComponent() = default; + SpriteComponent(std::string id, SpriteType sType) + { + spriteType = sType; + setTex(id); + } + +// One initializer to rule them all + SpriteComponent(std::string id, SpriteType sType, std::string json) + { + spriteType = sType; + if(sType == spriteAnimation) + { + std::ifstream jsonText(json); + std::ostringstream tmp; + tmp << jsonText.rdbuf(); + std::string aJson = tmp.str(); + cJSON * animJson = cJSON_Parse(aJson.c_str()); + cJSON * meta = cJSON_GetObjectItem(animJson, "meta"); + cJSON * frameTags = cJSON_GetObjectItem(meta,"frameTags"); +// printf("frameTags:\n%s\n",cJSON_Print(frameTags)); + int tagsCount = cJSON_GetArraySize(frameTags); +// printf("number of tags: \n%d\n",tagsCount); +// cJSON * arrItem = cJSON_GetArrayItem(frameTags,0); +// cJSON * animItem = cJSON_GetArrayItem(frameTags, 0); +// printf("Animation item: \n%s\n",cJSON_Print(animItem)); +// printf("arrItem: \n%s\n",cJSON_Print(arrItem)); + for (int t = 0; t < tagsCount; t++) + { +// printf("Tag: \n%d\n",t); +// printf("tag number: \n%d\n",t); + cJSON * animItem = cJSON_GetArrayItem(frameTags,t); +// printf("Animation item: \n%s\n",cJSON_Print(animItem)); + cJSON * nameJson = cJSON_GetObjectItem(animItem, "name"); + const char * name = cJSON_Print(nameJson); + int fromFrame = cJSON_GetObjectItem(animItem, "from")->valueint; + int toFrame = cJSON_GetObjectItem(animItem, "to")->valueint; + Animation anim = Animation(fromFrame,toFrame,100); + animations.emplace(name, anim); + Play(name); +// printf("Animation name: \n%s\n",name); +// printf("animation.frames: %d\n", animations[name].frames); +// printf("animations.index: %d\n", animations[name].index); +// printf("animations.speed: %d\n", animations[name].speed); + } + +// if(!animations.empty()){ +// printf("animations found!\n"); +// }else{ +// printf("No animations\n"); +// } +// Play("S-Fly"); + setTex(id); + } + } + + SpriteComponent(std::string id, SpriteType sType, char fontLetter, int letterW, int letterH, int letterScale) + { + spriteType = sType; + setTex(id); +// text = isText; + letter = fontLetter; + letterWidth = letterW; + letterHeight = letterH; + scale = letterScale; + destRect.w = letterW*letterScale; + destRect.h = letterH*letterScale; + } + + SpriteComponent(std::string id, SpriteType sType, SDL_Rect srcR, SDL_Rect destR) + { + spriteType = sType; + setTex(id); + srcRect = srcR; + destRect = destR; + } + + ~SpriteComponent() + { + SDL_DestroyTexture(texture); + } + + void setTex(std::string id) + { + texture = Game::assets->GetTexture(id); + } + + void init() override + { + transform = &entity->getComponent(); + + switch(spriteType) + { + case spriteText: + srcRect.x = ((letter-ASCII_START_IDX) % ASCII_ROW_COUNT)*letterWidth; + srcRect.y = ((letter-ASCII_START_IDX)/ASCII_ROW_COUNT)*letterHeight; + srcRect.w = letterWidth; + srcRect.h = letterHeight; + destRect.w = letterWidth*scale; + destRect.h = letterHeight*scale; + break; + case spriteUIL0: case spriteUIL1: + break; + case spriteActor: case spriteAnimation: case spriteAtlas: case spriteObject: case spriteTileMap: + srcRect.x = srcRect.y = 0; + srcRect.w = transform->width; + srcRect.h = transform->height; + break; + default: + break; + } + } + + void update() override + { + switch(spriteType) + { + case spriteUIL0: case spriteUIL1: case spriteText: + destRect.x = static_cast(transform->position.x); + destRect.y = static_cast(transform->position.y); + break; + case spriteActor: case spriteObject: case spriteAtlas: + srcRect.y = animIndex * transform->height; + destRect.x = static_cast(transform->position.x) - Game::camera.x; + destRect.y = static_cast(transform->position.y) - Game::camera.y; + destRect.w = transform->width * transform->scale; + destRect.h = transform->height * transform->scale; + break; + case spriteTileMap: + break; + case spriteAnimation: + srcRect.x = srcRect.w * static_cast((SDL_GetTicks()/speed) % frames); + srcRect.y = animIndex * transform->height; + destRect.x = static_cast(transform->position.x) - Game::camera.x; + destRect.y = static_cast(transform->position.y) - Game::camera.y; + destRect.w = transform->width * transform->scale; + destRect.h = transform->height * transform->scale; + break; + default: + break; + } + } + + void draw() override + { + TextureManager::Draw(texture, srcRect, destRect, spriteFlip); + } + + void Play(const char* animName) + { + frames = animations[animName].frames; + animIndex = animations[animName].index; + speed = animations[animName].speed; + } + +}; + +#endif /* SRC_ECS_SPRITECOMPONENT_H_ */ diff --git a/src/ecs/TileComponent.h b/src/ecs/TileComponent.h new file mode 100644 index 0000000..8aa0086 --- /dev/null +++ b/src/ecs/TileComponent.h @@ -0,0 +1,58 @@ +/* + * TileComponent.h + * + * Created on: Mar 21, 2020 + * Author: ayoungblood + */ + +#ifndef SRC_ECS_TILECOMPONENT_H_ +#define SRC_ECS_TILECOMPONENT_H_ + +#include "ECS.h" +#include "SDL2/SDL.h" +#include "../assetmgr/AssetManager.h" + +class TileComponent : public Component +{ +public: + + SDL_Texture* texture; + SDL_Rect srcRect, destRect; + Vector2D position; + + TileComponent() = default; + + ~TileComponent() + { + SDL_DestroyTexture(texture); + } + + + TileComponent(int srcX, int srcY, int xpos, int ypos, int tsize, int tscale, std::string id) + { + texture = Game::assets->GetTexture(id); + position.x = xpos; + position.y = ypos; + + srcRect.x = srcX; + srcRect.y = srcY; + srcRect.w = srcRect.h = tsize; + + destRect.x = xpos; + destRect.y = ypos; + destRect.w = destRect.h = tsize * tscale; + } + + void update() override + { + destRect.x = position.x - Game::camera.x; + destRect.y = position.y - Game::camera.y; + } + + void draw() override + { + TextureManager::Draw(texture, srcRect, destRect, SDL_FLIP_NONE); + } +}; + +#endif /* SRC_ECS_TILECOMPONENT_H_ */ diff --git a/src/ecs/TransformComponent.h b/src/ecs/TransformComponent.h new file mode 100644 index 0000000..1348593 --- /dev/null +++ b/src/ecs/TransformComponent.h @@ -0,0 +1,68 @@ +/* + * TransformComponent.h + * + * Created on: Feb 22, 2020 + * Author: ayoungblood + */ + +#ifndef SRC_ECS_TransformComponent_H_ +#define SRC_ECS_TransformComponent_H_ + +#include "Components.h" +#include "../game/Vector2D.h" + +class TransformComponent : public Component +{ + +public: + + Vector2D position; + Vector2D velocity; + + int height = 40; + int width = 30; + int scale = 1; + int speed = 2; + + TransformComponent() + { + position.Zero(); + } + + TransformComponent(int sc) + { + position.x = 64*sc; + position.y = 80*sc; + scale = sc; + speed = speed*sc; + } + + TransformComponent(float x, float y) + { + position.Zero(); + } + + TransformComponent(int x, int y, int w, int h, int sc) + { + position.x = x; + position.y = y; + width = w; + height = h; + scale = sc; + speed = speed*sc; + } + + void init() override + { + velocity.Zero(); + } + void update() override + { + position.x += velocity.x * speed; + position.y += velocity.y * speed; + } + +}; + + +#endif /* SRC_ECS_TransformComponent_H_ */ diff --git a/src/ecs/UIFontComponent.h b/src/ecs/UIFontComponent.h new file mode 100644 index 0000000..e4d2181 --- /dev/null +++ b/src/ecs/UIFontComponent.h @@ -0,0 +1,83 @@ +/* + * UIFontComponent.h + * + * Created on: May 14, 2020 + * Author: ayoungblood + */ + +#ifndef SRC_ECS_UIFONTCOMPONENT_H_ +#define SRC_ECS_UIFONTCOMPONENT_H_ + +#define ASCII_START_IDX 32 +#define ASCII_COUNT 96 +#define ASCII_ROW_COUNT 16 + +#include "Components.h" +#include "SDL2/SDL.h" +#include "../assetmgr/AssetManager.h" + +class UIFontComponent : public Component +{ +private: +// SDL_Texture * texture; + +// Font dimensions + int _LetterWidth; + int _LetterHeight; + +// Track current letter on texture + SDL_Rect _LetterClips[ASCII_COUNT]; + +public: + +// SDL_RendererFlip spriteFlip = SDL_FLIP_NONE; + SDL_Texture* texture; + SDL_Rect srcRect, destRect; + Vector2D position; + +// UIFontComponent() = default; + + UIFontComponent(std::string id, int letterW, int letterH, int xpos, int ypos, int scale) + { + texture = Game::assets->GetTexture(id); + srcRect = UIFontComponent::SetCharClips(texture, xpos, ypos); + + position.x = xpos; + position.y = ypos; + + destRect.x = xpos; + destRect.y = ypos; + destRect.w = letterW * scale; + destRect.h = letterH * scale; + } + + ~UIFontComponent() + { + SDL_DestroyTexture(texture); + } + + void update() override + { + + } + + void draw() override + { + TextureManager::Draw(texture, srcRect, destRect, SDL_FLIP_NONE); + } + + SDL_Rect SetCharClips(SDL_Texture* fontTex, int x, int y) + { + SDL_Rect letterClip; + for (int i = 0; i < ASCII_COUNT; ++i) + { + _LetterClips[i].x = x + ((i % ASCII_ROW_COUNT) * _LetterWidth); + _LetterClips[i].y = y + ((i / ASCII_ROW_COUNT) * _LetterHeight); + _LetterClips[i].w = _LetterWidth; + _LetterClips[i].h = _LetterHeight; + letterClip = _LetterClips[i]; + } + return letterClip; + } +}; +#endif /* SRC_ECS_UIFONTCOMPONENT_H_ */ diff --git a/src/fsm/ConcreteGMStates.cpp b/src/fsm/ConcreteGMStates.cpp new file mode 100644 index 0000000..4dfd000 --- /dev/null +++ b/src/fsm/ConcreteGMStates.cpp @@ -0,0 +1,95 @@ +#include "ConcreteGMStates.h" +#include + +void TitleScreen::toggle(GameManager* gamemgr) +{ + // TitleScreen -> LoadingScreen + printf("Entering TitleScreen state \n"); + gamemgr->setState(LoadingScreen::getInstance()); + printf("Transition from TitleScreen to LoadingScreen\n"); +} + +GameManagerState & TitleScreen::getInstance() +{ + static TitleScreen singleton; + return singleton; +} + +void LoadingScreen::toggle(GameManager* gamemgr) +{ + // LoadingScreen -> DayTime + printf("Entering LoadingScreen state \n"); + gamemgr->setState(DayTime::getInstance()); + printf("Transition from LoadingScreen to DayTime\n"); +} + +GameManagerState & LoadingScreen::getInstance() +{ + static LoadingScreen singleton; + return singleton; +} + +void DayTime::toggle(GameManager* gamemgr) +{ + // DayTime -> NightTime + printf("Entering DayTime state \n"); + gamemgr->setState(NightTime::getInstance()); + printf("Transition from DayTime to NightTime\n"); +} + +GameManagerState & DayTime::getInstance() +{ + static DayTime singleton; + return singleton; +} + +void NightTime::toggle(GameManager* gamemgr) +{ + if(!gameOver) + { + // NightTime -> DayTime + printf("Entering NightTime state \n"); + gamemgr->setState(DayTime::getInstance()); + printf("Transition from NightTime to DayTime\n"); + } else + { + // NightTime -> GameOver + printf("Entering NightTime state \n"); + gamemgr->setState(GameOver::getInstance()); + printf("Transitioning from NightTime to GameOver \n"); + } +} + +GameManagerState & NightTime::getInstance() +{ + static NightTime singleton; + return singleton; +} + +void PauseScreen::toggle(GameManager* gamemgr) +{ + // PauseScreen -> DayTime + printf("Entering PauseScreen state \n"); + gamemgr->setState(DayTime::getInstance()); + printf("Transition from TitleScreen to LoadingScreen\n"); +} + +GameManagerState & PauseScreen::getInstance() +{ + static PauseScreen singleton; + return singleton; +} + +void GameOver::toggle(GameManager* gamemgr) +{ + // GameOver -> TitleScreen + printf("Entering TitleScreen state \n"); + gamemgr->setState(TitleScreen::getInstance()); + printf("Transition from TitleScreen to LoadingScreen\n"); +} + +GameManagerState & GameOver::getInstance() +{ + static GameOver singleton; + return singleton; +} diff --git a/src/fsm/ConcreteGMStates.h b/src/fsm/ConcreteGMStates.h new file mode 100644 index 0000000..f7216f5 --- /dev/null +++ b/src/fsm/ConcreteGMStates.h @@ -0,0 +1,82 @@ +#pragma once +#include "GameManagerState.h" +#include "GameManager.h" + +class TitleScreen : public GameManagerState +{ +public: + void enter(GameManager * gamemgr) {}; + void toggle(GameManager * gamemgr); + void exit(GameManager* gamemgr) {} + static GameManagerState& getInstance(); +private: + TitleScreen(){} + TitleScreen(const TitleScreen& other); + TitleScreen& operator=(const TitleScreen& other); +}; + +class LoadingScreen : public GameManagerState +{ +public: + void enter(GameManager * gamemgr) {}; + void toggle(GameManager * gamemgr); + void exit(GameManager* gamemgr) {} + static GameManagerState& getInstance(); +private: + LoadingScreen(){} + LoadingScreen(const LoadingScreen& other); + LoadingScreen& operator=(const LoadingScreen& other); +}; + +class DayTime : public GameManagerState +{ +public: + void enter(GameManager * gamemgr) {}; + void toggle(GameManager * gamemgr); + void exit(GameManager* gamemgr) {} + static GameManagerState& getInstance(); +private: + DayTime(){} + DayTime(const DayTime& other); + DayTime& operator=(const DayTime& other); +}; + +class NightTime : public GameManagerState +{ +public: + void enter(GameManager * gamemgr) {}; + void toggle(GameManager * gamemgr); + void exit(GameManager* gamemgr) {} + bool gameOver; + static GameManagerState& getInstance(); +private: + NightTime(){} + NightTime(const NightTime& other); + NightTime& operator=(const NightTime& other); +}; + +class GameOver : public GameManagerState +{ +public: + void enter(GameManager * gamemgr) {}; + void toggle(GameManager * gamemgr); + void exit(GameManager* gamemgr) {} + static GameManagerState& getInstance(); +private: + GameOver(){} + GameOver(const GameOver& other); + GameOver& operator=(const GameOver& other); +}; + +class PauseScreen : public GameManagerState +{ +public: + void enter(GameManager * gamemgr) {}; + void toggle(GameManager * gamemgr); + void exit(GameManager* gamemgr) {} + static GameManagerState& getInstance(); +private: + PauseScreen(){} + PauseScreen(const PauseScreen& other); + PauseScreen& operator=(const PauseScreen& other); +}; diff --git a/src/fsm/GameManager.cpp b/src/fsm/GameManager.cpp new file mode 100644 index 0000000..a678495 --- /dev/null +++ b/src/fsm/GameManager.cpp @@ -0,0 +1,20 @@ +#include "GameManager.h" +#include "ConcreteGMStates.h" + +GameManager::GameManager() +{ + currentState = &TitleScreen::getInstance(); +} + +void GameManager::setState(GameManagerState& newState) +{ + currentState->exit(this); // do stuff before changing states + currentState = &newState; // change the states + currentState->enter(this); // do stuff after changing states +} + +void GameManager::toggle() +{ + currentState->toggle(this); +} + diff --git a/src/fsm/GameManager.h b/src/fsm/GameManager.h new file mode 100644 index 0000000..f2512e0 --- /dev/null +++ b/src/fsm/GameManager.h @@ -0,0 +1,19 @@ +#pragma once +#include "GameManagerState.h" + +// Forward declaration to resolve circular dependency/include +class GameManagerState; + +class GameManager +{ +public: + GameManager(); + + inline GameManagerState* getCurrentState() const { return currentState; } + void toggle(); + + void setState(GameManagerState& newState); + +private: + GameManagerState* currentState; +}; diff --git a/src/fsm/GameManagerState.h b/src/fsm/GameManagerState.h new file mode 100644 index 0000000..ceeba31 --- /dev/null +++ b/src/fsm/GameManagerState.h @@ -0,0 +1,14 @@ +#pragma once +#include "GameManager.h" + +// Forward declaration to resolve circular dependency/include +class GameManager; + +class GameManagerState +{ +public: + virtual void enter(GameManager* gamemgr) = 0; + virtual void toggle(GameManager* gamemgr) = 0; + virtual void exit(GameManager* gamemgr) = 0; + virtual ~GameManagerState() {} +}; diff --git a/src/game/Collision.cpp b/src/game/Collision.cpp new file mode 100644 index 0000000..b5109e6 --- /dev/null +++ b/src/game/Collision.cpp @@ -0,0 +1,37 @@ +/* + * Collision.cpp + * + * Created on: Mar 8, 2020 + * Author: ayoungblood + */ + +#include "Collision.h" +#include "../ecs/ColliderComponent.h" + +bool Collision::AABB(const SDL_Rect& recA, const SDL_Rect& recB) +{ + if( + recA.x + recA.w >= recB.x && + recB.x + recB.w >= recA.x && + recA.y + recA.h >= recB.y && + recB.y + recB.h >= recA.y + ) + { + return true; + } + + return false; +} + +bool Collision::AABB(const ColliderComponent& colA, const ColliderComponent& colB) +{ + if(AABB(colA.collider, colB.collider)) + { +// std::cout << colA.tag << " hit: " << colB.tag << std::endl; + return true; + } + else + { + return false; + } +} diff --git a/src/game/Collision.h b/src/game/Collision.h new file mode 100644 index 0000000..0fe14d0 --- /dev/null +++ b/src/game/Collision.h @@ -0,0 +1,23 @@ +/* + * Collision.h + * + * Created on: Mar 8, 2020 + * Author: ayoungblood + */ + +#ifndef SRC_COLLISION_H_ +#define SRC_COLLISION_H_ + +#include + +class ColliderComponent; + +class Collision +{ +public: + static bool AABB(const SDL_Rect& recA, const SDL_Rect& recB); + static bool AABB(const ColliderComponent& colA, const ColliderComponent& colB); +}; + + +#endif /* SRC_COLLISION_H_ */ diff --git a/src/game/Game.cpp b/src/game/Game.cpp new file mode 100644 index 0000000..8ea7506 --- /dev/null +++ b/src/game/Game.cpp @@ -0,0 +1,324 @@ +/* + * Game.cpp + * + * Created on: Feb 9, 2020 + * Author: ayoungblood + * Special Thanks to: Carl Birch of Let's Make Games + * Nic Allen + * Brian Lhota + */ + +#include "Game.hpp" +#include "../assetmgr/TextureManager.h" +#include "../assetmgr/Map.h" +#include "../ecs/Components.h" +#include "Collision.h" +#include +#include +#include +#include +#include "../assetmgr/AssetManager.h" +#include "../ui/UIText.h" +#include "../ui/UINineSlice.h" +#include "../cjson/cJSON.h" +#include "../fsm/GameManager.h" +#include "../fsm/GameManagerState.h" +// #include "../fsm/ConcreteGMStates.h" + +Map* map; +Manager manager; +UIText* text; +UINineSlice* my9Slice; +UIText* scoreboardText; +UINineSlice* scoreboard9Slice; + +SDL_Renderer* Game::renderer = nullptr; +SDL_Event Game::event; + +SDL_Rect Game::camera; + +AssetManager* Game::assets = new AssetManager(&manager); + +bool Game::isRunning = false; + +auto& player(manager.addEntity()); + +auto& enemy(manager.addEntity()); + +auto& scoreboard(manager.addEntity()); +auto& uiInfo(manager.addEntity()); + +auto& tree(manager.addEntity()); + +bool Game::debugCollisionBoxes = false; + +int gScale = 0; + +Game::Game() { + // TODO Auto-generated constructor stub + +} + +Game::~Game() { + // TODO Auto-generated destructor stub +} + +void Game::init(const char *title, int width, int height, bool fullscreen, int globalScale) +{ + camera = { 0, 0, width, height }; + int flags = 0; + gScale = globalScale; + if(fullscreen) + { + flags = SDL_WINDOW_FULLSCREEN; + } + + if(SDL_Init(SDL_INIT_EVERYTHING) == 0) + { + window = SDL_CreateWindow(title, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, width, height, flags); + if(!window) + { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,"Couldn't create window: %s", SDL_GetError()); + } + renderer = SDL_CreateRenderer(window, -1, 0); + if(!renderer) + { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create renderer: %s", SDL_GetError()); + isRunning = false; + } + else + { + SDL_SetRenderDrawColor(renderer, 255,255,255,255); + isRunning = true; + } + //Initialize SDL_mixer + if (Mix_OpenAudio(44100, MIX_DEFAULT_FORMAT, 2, 2048)<0) + { + SDL_LogError(SDL_LOG_CATEGORY_ERROR, "Couldn't initialize SDL audio mixer!, Error: %s", SDL_GetError()); + } + + assets->AddTexture("terrain", "assets/textures/tiles/GS-tiles2.png"); + assets->AddTexture("player", "assets/textures/actors/owl_anim.png"); + assets->AddTexture("font", "assets/textures/ui/ui-font-tombstone-serif.png"); + assets->AddTexture("textBox", "assets/textures/ui/ui-element-tombstone.png"); + assets->AddTexture("tree","assets/textures/objects/tree.png"); + assets->AddTexture("jewel","assets/textures/objects/jewel.png"); + assets->AddTexture("3","assets/textures/ui/day-night-icon.png"); + assets->AddTexture("robber","assets/textures/actors/robberrodent.png"); + assets->AddMusicTrack("simonZ","assets/audio/music/sailing16.ogg"); + assets->AddSoundClip("bwoop","assets/audio/sfx/bwoop.wav"); + + map = new Map("terrain",globalScale,16); + + const char* myText = "Graveyard Shift"; + text = new UIText(myText, "font", 0, 0, 8, 12, globalScale); + text->ParseString(myText, 12, 22, globalScale); + SDL_Rect myDestRect = SDL_Rect(); + myDestRect.x = 12; + myDestRect.y = 8; + myDestRect.w = 140; + myDestRect.h = 40; + my9Slice = new UINineSlice("textBox"); + my9Slice->MakeSlices("textBox",128,128,16,111,16,111,myDestRect,globalScale); + + const char* sbText = "500"; + scoreboardText = new UIText(sbText, "font", 0, 0, 8, 12, globalScale); + scoreboardText->ParseString(sbText, 190, 22, globalScale); + SDL_Rect scoreboardDestRect = SDL_Rect(); + scoreboardDestRect.x = 164; + scoreboardDestRect.y = 8; + scoreboardDestRect.w = 140; + scoreboardDestRect.h = 40; + scoreboard9Slice = new UINineSlice("textBox"); + SDL_Rect jewelSrcRect = SDL_Rect(); + jewelSrcRect.x = 0; + jewelSrcRect.y = 0; + jewelSrcRect.w = 24; + jewelSrcRect.h = 22; + SDL_Rect jewelDestRect = SDL_Rect(); + jewelDestRect.x = 0; + jewelDestRect.y = 0; + jewelDestRect.w = 24*globalScale; + jewelDestRect.h = 22*globalScale; + scoreboard9Slice->MakeSlices("textBox",128,128,16,111,16,111,scoreboardDestRect,globalScale); + scoreboard.addComponent(172*globalScale,16*globalScale,24,22,globalScale); + scoreboard.addComponent("jewel", SpriteComponent::spriteUIL1, jewelSrcRect, jewelDestRect); + scoreboard.addGroup(groupUI_Layer1); + + tree.addComponent(292*globalScale,168*globalScale,192,142,globalScale); + tree.addComponent("tree",SpriteComponent::spriteObject); + tree.addGroup(groupObjects); + + //ecs implementation + + map->LoadMap("assets/maps/GS-Night.txt",48,32, globalScale); + + player.addComponent(50*globalScale,50*globalScale,40,40,globalScale); + player.addComponent("player", SpriteComponent::spriteAnimation, "assets/textures/actors/owl_anim.json"); + player.addComponent(); + player.addComponent("player"); + player.addGroup(groupPlayers); + + enemy.addComponent(180*globalScale,180*globalScale,32,32,globalScale); + enemy.addComponent("robber", SpriteComponent::spriteAnimation, "assets/textures/actors/robberrodent.json"); + enemy.addGroup(groupEnemies); + + printf("Starting up GameManager\n"); + GameManager gamemgr = GameManager(); + gamemgr.toggle(); + gamemgr.toggle(); + gamemgr.toggle(); + gamemgr.toggle(); + gamemgr.toggle(); + gamemgr.toggle(); + gamemgr.toggle(); + +// gamemgr.setState(GameManager::setState(GameManagerState::enter(&PauseScreen))); + printf("GameManager Demo Completed.\n"); + } else { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't Initialize SDL: %s", SDL_GetError()); + isRunning = false; + } +} + +//camera.x = camera.x*globalScale; + +auto& tiles(manager.getGroup(Game::groupMap)); +auto& players(manager.getGroup(Game::groupPlayers)); +auto& colliders(manager.getGroup(Game::groupColliders)); +auto& objects(manager.getGroup(Game::groupObjects)); +auto& enemies(manager.getGroup(Game::groupEnemies)); +// auto& projectiles(manager.getGroup(Game::groupProjectiles)); +auto& gui(manager.getGroup(Game::groupUI_Layer0)); +auto& uiText(manager.getGroup(Game::groupUI_Layer1)); + +void Game::handleEvents() +{ + SDL_PollEvent(&event); + switch (event.type) + { + case SDL_QUIT: + isRunning = false; + break; + default: + break; + } + +} + +void Game::update() +{ + SDL_Rect playerCol = player.getComponent().collider; + Vector2D playerPos = player.getComponent().position; + + if (Mix_PlayingMusic() == 0) + { +// std::cout << "Play Music Now" << std::endl; +// Mix_PlayMusic(assets->GetMusicTrack("simonZ"), -1); + } + + + manager.refresh(); + manager.update(); + + for (auto& c : colliders) + { + SDL_Rect cCol = c->getComponent().collider; + if(Collision::AABB(cCol, playerCol)) + { + player.getComponent().position = playerPos; + } + } + +// for(auto& p: projectiles) +// { +// if(Collision::AABB(player.getComponent().collider, p->getComponent().collider)) +// { +// std::cout << "Projectile hit player" << std::endl; +// p->destroy(); +// } +// } + + camera.x = player.getComponent().position.x - camera.w/2; + camera.y = player.getComponent().position.y - camera.h/2; + + + if(camera.x < 0) + camera.x = 0; + if (camera.y < 0) + camera.y = 0; + if (camera.x > map->width-camera.w) + camera.x = map->width-camera.w; + if (camera.y > map->height-camera.h) + camera.y = map->height-camera.h; +} + + +void Game::render() +{ + SDL_RenderClear(renderer); + for (auto& t : tiles) + { + t->draw(); + } + if (Game::debugCollisionBoxes) + { + for (auto& c : colliders) + { + c->draw(); + } + } + + for (auto& o : objects) + { + o->draw(); + } + + for (auto& e : enemies) + { + e->draw(); + } + + for (auto& p : players) + { + p->draw(); + } + + for (auto& guiElement : gui) + { + guiElement->draw(); + } + for (auto& letter : uiText) + { + letter->draw(); + } + Vector2D origPt; + Vector2D destPt; + origPt.Zero(); + destPt.x = 320.0*gScale; + destPt.y = 240.0*gScale; + drawLine(origPt,destPt,255,0,0); + SDL_RenderPresent(renderer); +} + +void Game::clean() +{ + SDL_DestroyWindow(window); + SDL_DestroyRenderer(renderer); + IMG_Quit(); + Mix_Quit(); + SDL_Quit(); + printf("Game Cleaned\n"); +} + +void Game::printDebug(char* debugInfo) +{ + printf("%s",debugInfo); + printf("\n"); +} + +void Game::drawLine(Vector2D srcpt, Vector2D destpt, int red, int green, int blue) +{ + SDL_SetRenderDrawColor(renderer, red, green, blue, 255); + SDL_RenderDrawLine(renderer, srcpt.x, srcpt.y, destpt.x, destpt.y); +} diff --git a/src/game/Game.hpp b/src/game/Game.hpp new file mode 100644 index 0000000..6c48908 --- /dev/null +++ b/src/game/Game.hpp @@ -0,0 +1,59 @@ +/* + * Game.hpp + * + * Created on: Feb 9, 2020 + * Author: ayoungblood + */ + +#ifndef GAME_HPP_ +#define GAME_HPP_ +#include "SDL2/SDL.h" +#include "SDL2/SDL_image.h" +#include "SDL2/SDL_mixer.h" +#include +#include +#include +#include "Vector2D.h" +#include "../assetmgr/AssetManager.h" + +class ColliderComponent; +class AssetManager; + +class Game { +public: + Game(); + virtual ~Game(); + void init(const char* title, int width, int height, bool fullscreen, int globalScale); + void handleEvents(); + void update(); + void render(); + void clean(); + void printDebug(char* debugInfo); + void drawLine(Vector2D srcpt, Vector2D destpt, int red, int green, int blue); + bool running() { return isRunning; } +// static void AddTile(int srcX, int srcY, int xpos, int ypos); + static SDL_Renderer *renderer; + static SDL_Event event; +// static std::vector colliders; + static bool isRunning; + static bool debugCollisionBoxes; + static SDL_Rect camera; + static AssetManager* assets; + enum groupLabels : std::size_t + { + groupMap, + groupPlayers, + groupEnemies, + groupColliders, + groupProjectiles, + groupObjects, + groupUI_Layer0, + groupUI_Layer1 + }; +private: + int counter = 0; +// bool isRunning = false; + SDL_Window *window; +// SDL_Renderer *renderer; +}; +#endif /* GAME_HPP_ */ diff --git a/src/game/Main.cpp b/src/game/Main.cpp new file mode 100644 index 0000000..b4c9b61 --- /dev/null +++ b/src/game/Main.cpp @@ -0,0 +1,77 @@ +/* + * main.cpp + * + * Created on: Feb 9, 2020 + * Author: ayoungblood + */ + +#include "Game.hpp" +#include "../cjson/cJSON.h" +#include +#include +#include +#include + +Game *game = nullptr; + +int main(int argc, const char * argv[]) +{ + const int FPS = 60; + const int frameDelay = 1000 / FPS; + + Uint32 frameStart; + int frameTime; + +// ============================= +// Load cJSON config.json file +// ============================= + std::ifstream jsonText("src/config/config.json"); + std::ostringstream tmp; + tmp << jsonText.rdbuf(); + std::string json = tmp.str(); + cJSON * myJSON = cJSON_Parse(json.c_str()); + cJSON * windowName = cJSON_GetObjectItemCaseSensitive(myJSON, "WindowName"); +// if (cJSON_IsString(windowName) && (windowName->valuestring != NULL)) +// { +// printf("Window Name is: %s\n", windowName->valuestring); +// } + cJSON * windowSize = cJSON_GetObjectItem(myJSON, "WindowSize"); + int windowWidth = cJSON_GetObjectItem(windowSize, "w")->valueint; + int windowHeight = cJSON_GetObjectItem(windowSize, "h")->valueint; +// printf("Window:\nwidth:%d\nheight:%d\n",windowWidth,windowHeight); + int windowFS = cJSON_GetObjectItem(myJSON, "WindowFullScreen")->valueint; + int globalScale = cJSON_GetObjectItem(myJSON, "GlobalScale")->valueint; + bool isWindowFS; + if (windowFS==0) + { + isWindowFS = false; + } else + { + isWindowFS = true; + } + windowWidth = windowWidth*globalScale; + windowHeight = windowHeight*globalScale; + game = new Game(); + game->init(windowName->valuestring, windowWidth, windowHeight, isWindowFS, globalScale); +// cJSON memory management + cJSON_Delete(myJSON); + + while (game->running()) + { + frameStart = SDL_GetTicks(); + + game->handleEvents(); + game->update(); + game->render(); + + frameTime = SDL_GetTicks() - frameStart; + + if(frameDelay > frameTime) + { + SDL_Delay(frameDelay - frameTime); + } + + } + game->clean(); + return 0; +} diff --git a/src/game/Vector2D.cpp b/src/game/Vector2D.cpp new file mode 100644 index 0000000..1f89af4 --- /dev/null +++ b/src/game/Vector2D.cpp @@ -0,0 +1,122 @@ +/* + * Vector2D.cpp + * + * Created on: Mar 1, 2020 + * Author: ayoungblood + */ + +#include "Vector2D.h" + +Vector2D::Vector2D() +{ + x = 0.0f; + y = 0.0f; + r = 0.0f; + t = 0.0f; +} + +Vector2D::Vector2D(float x, float y) +{ + this->x = x; + this->y = y; + this->r = sqrt(pow(x,2.0)+pow(y,2.0)); + this->t = atan(y/x); +} + +Vector2D::Vector2D(float r, float t, bool isPolar) +{ + this->x = r*(cos(t)); + this->y = r*(sin(t)); + this->r = r; + this->t = t; +} + +Vector2D& Vector2D::Add(const Vector2D& vec) +{ + this->x += vec.x; + this->y += vec.y; + return *this; +} + +Vector2D& Vector2D::Subtract(const Vector2D& vec) +{ + this->x -= vec.x; + this->y -= vec.y; + return *this; +} + +Vector2D& Vector2D::Multiply(const Vector2D& vec) +{ + this->x *= vec.x; + this->y *= vec.y; + return *this; +} + +Vector2D& Vector2D::Divide(const Vector2D& vec) +{ + this->x /= vec.x; + this->y /= vec.y; + return *this; +} + +Vector2D& operator+(Vector2D& v1, const Vector2D& v2) +{ + return v1.Add(v2); +} + +Vector2D& operator-(Vector2D& v1, const Vector2D& v2) +{ + return v1.Subtract(v2); +} + +Vector2D& operator*(Vector2D& v1, const Vector2D& v2) +{ + return v1.Multiply(v2); +} + +Vector2D& operator/(Vector2D& v1, const Vector2D& v2) +{ + return v1.Divide(v2); +} + +Vector2D& Vector2D::operator +=(const Vector2D& vec) +{ + return this->Add(vec); +} + +Vector2D& Vector2D::operator -=(const Vector2D& vec) +{ + return this->Subtract(vec); +} + +Vector2D& Vector2D::operator *=(const Vector2D& vec) +{ + return this->Multiply(vec); +} + +Vector2D& Vector2D::operator /=(const Vector2D& vec) +{ + return this->Divide(vec); +} + +Vector2D& Vector2D::operator *(const int& i) +{ + this->x *= i; + this->y *= i; + + return *this; +} + +Vector2D& Vector2D::Zero() +{ + this->x = 0; + this->y = 0; + return *this; +} + + +std::ostream& operator<<(std::ostream& stream, const Vector2D& vec) +{ + stream << "(" << vec.x << "," << vec.y << ")"; + return stream; +} diff --git a/src/game/Vector2D.h b/src/game/Vector2D.h new file mode 100644 index 0000000..9902205 --- /dev/null +++ b/src/game/Vector2D.h @@ -0,0 +1,50 @@ +/* + * Vector2d.h + * + * Created on: Feb 22, 2020 + * Author: ayoungblood + */ + +#ifndef SRC_ECS_VECTOR2D_H_ +#define SRC_ECS_VECTOR2D_H_ + +#include +#include + +class Vector2D +{ +public: + float x; + float y; + float r; + float t; + + Vector2D(); + Vector2D(float x, float y); + Vector2D(float r, float t, bool isPolar); + + Vector2D& Add(const Vector2D& vec); + Vector2D& Subtract(const Vector2D& vec); + Vector2D& Multiply(const Vector2D& vec); + Vector2D& Divide(const Vector2D& vec); + + friend Vector2D& operator+(Vector2D& v1, const Vector2D& v2); + friend Vector2D& operator-(Vector2D& v1, const Vector2D& v2); + friend Vector2D& operator*(Vector2D& v1, const Vector2D& v2); + friend Vector2D& operator/(Vector2D& v1, const Vector2D& v2); + + Vector2D& operator+=(const Vector2D& vec); + Vector2D& operator-=(const Vector2D& vec); + Vector2D& operator*=(const Vector2D& vec); + Vector2D& operator/=(const Vector2D& vec); + + Vector2D& operator*(const int& i); + Vector2D& Zero(); + + friend std::ostream& operator<<(std::ostream& stream, const Vector2D& vec); + +}; + + + +#endif /* SRC_ECS_VECTOR2D_H_ */ diff --git a/src/ui/UINineSlice.cpp b/src/ui/UINineSlice.cpp new file mode 100644 index 0000000..360ba12 --- /dev/null +++ b/src/ui/UINineSlice.cpp @@ -0,0 +1,340 @@ +/* + * UINineSlice.cpp + * + * Created on: May 31, 2020 + * Author: ayoungblood + */ + +#include "../ui/UINineSlice.h" +#include "../game/Game.hpp" +#include "../ecs/ECS.h" +#include "../ecs/Components.h" +#include "string.h" +#include +#include + +extern Manager manager; + +UINineSlice::UINineSlice(std::string texID) +{ + textureID = texID; +} + +UINineSlice::~UINineSlice() +{ + +} + +void UINineSlice::MakeSlices(std::string texture, int srcW, int srcH, int x0, int x1, int y0, int y1, SDL_Rect finalRect,int scale) +{ +// Note about the variables: The source texture is what everything is drawn from, with srcW and srcH defining the size of that texture and x0 x1 being the vertical slices position across the x axis, and the y0, y1 being the horizontal slices. This is also in the project readme with an ASCII art diagram. finalRect refers to the Rectangle that describes the area of the screen in which we want the 9-sliced source to appear in it's final in-game rendering. + + SDL_Rect srcRect; + SDL_Rect destRect; + int cols; + int rows; + int colsRemainder; + int rowsRemainder; + + cols = ((finalRect.w-x0-(srcW-x1))/(x1-x0)); + rows = (finalRect.h-y0-(srcH-y1))/(y1-y0); +// Calculate a remainders + colsRemainder = ((finalRect.w-x0-(srcW-x1))%(x1-x0)); + rowsRemainder = ((finalRect.h-y0-(srcH-y1))%(y1-y0)); + +// printf("\n\nColumns: %d\nRows: %d\nColumn Remainder: %d\nRow Remainder: %d\n\n",cols,rows,colsRemainder,rowsRemainder); + + finalRect.x = finalRect.x*scale; + finalRect.y = finalRect.y*scale; + finalRect.w = finalRect.w*scale; + finalRect.h = finalRect.h*scale; + +// x0 = x0*scale; +// x1 = x1*scale; +// y0 = y0*scale; +// y1 = y1*scale; + +// printf("finalRect x:%d, y:%d, w:%d, h:%d \n",finalRect.x,finalRect.y,finalRect.w,finalRect.h); + +// destRect.x = destRect.x*scale; +// destRect.y = destRect.y*scale; +// destRect.w = destRect.w*scale; +// destRect.h = destRect.h*scale; +// colsRemainder = colsRemainder*scale; +// rowsRemainder = rowsRemainder*scale; + + for (int i=0; i<9; i++) + { + switch(i) + { + case 0: + srcRect.x = 0; + srcRect.y = 0; + srcRect.w = x0; + srcRect.h = y0; +// printf("tile zero.w or x0: %d\n",x0); + destRect.w = srcRect.w; + destRect.h = srcRect.h; + break; + case 1: + srcRect.x = x0; + srcRect.y = 0; + srcRect.w = x1-x0; + srcRect.h = y0; + destRect.w = srcRect.w; + destRect.h = srcRect.h; + break; + case 2: + srcRect.x = x1; + srcRect.y = 0; + srcRect.w = srcW-x1; + srcRect.h = y0; + destRect.w = srcRect.w; + destRect.h = srcRect.h; +// printf("srcRect.x: %d",srcRect.x); +// printf("UI9Slice #2 srcRect x:%d y:%d w:%d h:%d \n",srcRect.x,srcRect.y,srcRect.w,srcRect.h); + break; + case 3: + srcRect.x = 0; + srcRect.y = y0; + srcRect.w = x0; + srcRect.h = y1-y0; + destRect.w = srcRect.w; + destRect.h = srcRect.h; + break; + case 4: + srcRect.x = x0; + srcRect.y = y0; + srcRect.w = x1-x0; + srcRect.h = y1-y0; + destRect.w = srcRect.w; + destRect.h = srcRect.h; + break; + case 5: + srcRect.x = x1; + srcRect.y = y0; + srcRect.w = srcW-x1; + srcRect.h = y1-y0; + destRect.w = srcRect.w; + destRect.h = srcRect.h; + break; + case 6: + srcRect.x = 0; + srcRect.y = y1; + srcRect.w = x0; + srcRect.h = srcH-y1; + destRect.w = srcRect.w; + destRect.h = srcRect.h; + break; + case 7: + srcRect.x = x0; + srcRect.y = y1; + srcRect.w = x1-x0; + srcRect.h = srcH-y1; + destRect.w = srcRect.w; + destRect.h = srcRect.h; + break; + case 8: + srcRect.x = x1; + srcRect.y = y1; + srcRect.w = srcW-x1; + srcRect.h = srcH-y1; + destRect.w = srcRect.w; + destRect.h = srcRect.h; + break; + default: + srcRect.x = 0; + srcRect.y = 0; + srcRect.w = 0; + srcRect.h = 0; + destRect.w = 0; + destRect.h = 0; + } +// These will be the same for each SDL_Rect except if there's a scaling int, which still needs to be implemented +// destRect.w = srcRect.w*scale; +// destRect.h = srcRect.h*scale; + +// x0 = x0*scale; +// x1 = x1*scale; +// y0 = y0*scale; +// y1 = y1*scale; + +// Calculate where and how many tiles to place +// We only need one instance of each of these in each corner or slices 0,2,6,8 + if (i==0||i==2||i==6||i==8) + { + if (i==0) + { + destRect.x = finalRect.x; + destRect.y = finalRect.y; + } + if (i==2) + { + destRect.x = finalRect.x+(finalRect.w-srcRect.w*scale); + destRect.y = finalRect.y; + } + if (i==6) + { + destRect.x = finalRect.x; + destRect.y = finalRect.y+(finalRect.h-srcRect.h*scale); + } + if (i==8) + { + destRect.x = finalRect.x+(finalRect.w-srcRect.w*scale); + destRect.y = finalRect.y+(finalRect.h-srcRect.h*scale); + } + AddSlice(srcRect,destRect,scale); +// printf("Corner Slice\n"); +// printf("srcRect x:%d, y:%d, w:%d, h:%d \n",srcRect.x,srcRect.y,srcRect.w,srcRect.h); +// printf("destRect x:%d, y:%d, w:%d, h:%d \n\n",destRect.x,destRect.y,destRect.w,destRect.h); + } +// Slices 1,7 need to be repeated in a row + if (i==1||i==7) + { + if (i==1) + { + for (int c=0;c0){ + destRect.x = finalRect.x+(x0*scale+cols*(x1*scale-x0*scale)); + destRect.y = finalRect.y; + srcRect.w = colsRemainder; + destRect.w = colsRemainder; + AddSlice(srcRect,destRect,scale); +// printf("Top Slice (1) \n"); +// printf("srcRect x:%d, y:%d, w:%d, h:%d \n",srcRect.x,srcRect.y,srcRect.w,srcRect.h); +// printf("destRect x:%d, y:%d, w:%d, h:%d \n\n",destRect.x,destRect.y,destRect.w,destRect.h); + } + } + if (i==7) + { + for (int c=0;c0){ + destRect.x = finalRect.x+(x0*scale+cols*(x1*scale-x0*scale)); + destRect.y = finalRect.y+(finalRect.h-(srcH-y1)*scale); + srcRect.w = colsRemainder; + destRect.w = colsRemainder; + AddSlice(srcRect,destRect,scale); +// printf("destRect x:%d, y:%d, w:%d, h:%d \n",destRect.x,destRect.y,destRect.w,destRect.h); + } + } + } +// Slice 3,5 need to be repeated in a column + if (i==3||i==5) + { + if (i==3) + { + for (int r=0;r0){ + destRect.x = finalRect.x; + destRect.y = finalRect.y+(y0*scale+rows*(y1-y0)*scale); + srcRect.h = rowsRemainder; + destRect.h = rowsRemainder; + AddSlice(srcRect,destRect,scale); +// printf("destRect x:%d, y:%d, w:%d, h:%d \n",destRect.x,destRect.y,destRect.w,destRect.h); + } + } + if (i==5) + { + for (int r=0;r0){ + destRect.x = finalRect.x+(finalRect.w-(srcW-x1)*scale); + destRect.y = finalRect.y+(y0*scale+rows*(y1-y0)*scale); + srcRect.h = rowsRemainder; + destRect.h = rowsRemainder; + AddSlice(srcRect,destRect,scale); +// printf("destRect x:%d, y:%d, w:%d, h:%d \n",destRect.x,destRect.y,destRect.w,destRect.h); + } + } + } +// Slice 4 will need to be repeated in columns and rows + if (i==4) + { + int rowY; + for (int r=0;r0) + { + destRect.x = finalRect.x+(x0*scale+cols*(x1-x0)*scale); + destRect.y = finalRect.y+(y0*scale+rowY*scale); + srcRect.w = colsRemainder; + destRect.w = colsRemainder; + AddSlice(srcRect,destRect,scale); +// printf("destRect x:%d, y:%d, w:%d, h:%d \n",destRect.x,destRect.y,destRect.w,destRect.h); + } + } + if (rowsRemainder>0) + { + for (int c=0;c0&&colsRemainder>0) + { + destRect.x = finalRect.x+(x0*scale+cols*(x1-x0)*scale); + destRect.y = finalRect.y+(y0*scale+rows*(y1-y0)*scale); + srcRect.w = colsRemainder; + srcRect.h = rowsRemainder; + destRect.w = colsRemainder; + destRect.h = rowsRemainder; + AddSlice(srcRect,destRect,scale); +// printf("destRect x:%d, y:%d, w:%d, h:%d \n",destRect.x,destRect.y,destRect.w,destRect.h); + } + } + } +} +// Need to take in variables: (srcRect, desiredRect) +void UINineSlice::AddSlice(SDL_Rect srcRect, SDL_Rect destRect, int scale) +{ +// printf("adding a 9slice element"); + auto& slice(manager.addEntity()); + SDL_Rect scaledRect = SDL_Rect(); + scaledRect.x = destRect.x; + scaledRect.y = destRect.y; + scaledRect.w = destRect.w*scale; + scaledRect.h = destRect.h*scale; + slice.addComponent(scaledRect.x, scaledRect.y, scaledRect.w, scaledRect.h, 1); + slice.addComponent("textBox",SpriteComponent::spriteUIL0,srcRect,scaledRect); + slice.addGroup(Game::groupUI_Layer0); +} diff --git a/src/ui/UINineSlice.h b/src/ui/UINineSlice.h new file mode 100644 index 0000000..ce26d31 --- /dev/null +++ b/src/ui/UINineSlice.h @@ -0,0 +1,28 @@ +/* + * UINineSlice.h + * + * Created on: May 31, 2020 + * Author: ayoungblood + */ + +#ifndef SRC_UININESLICE_H_ +#define SRC_UININESLICE_H_ + +#include "SDL2/SDL.h" +#include "string" + +class UINineSlice +{ +public: + std::string textureID; + SDL_Rect destRect; + UINineSlice(std::string texID); + ~UINineSlice(); + void MakeSlices(std::string texture, int srcW, int srcH, int x0, int x1, int y0, int y1, SDL_Rect destRect, int scale); + void AddSlice(SDL_Rect srcRect, SDL_Rect destRect, int scale); +private: + +}; + + +#endif /* SRC_UININESLICE_H_ */ diff --git a/src/ui/UIText.cpp b/src/ui/UIText.cpp new file mode 100644 index 0000000..11832fb --- /dev/null +++ b/src/ui/UIText.cpp @@ -0,0 +1,67 @@ +/* + * UIText.cpp + * + * Created on: May 21, 2020 + * Author: ayoungblood + */ + +#include "UIText.h" +#include "../game/Game.hpp" +#include "../ecs/ECS.h" +#include "../ecs/Components.h" +#include "string.h" +#include +#include + +extern Manager manager; + +UIText::UIText(const char* text, std::string texId, int x, int y, int letterW, int letterH, int lScale) +{ + inputText = text; + textureID = texId; + posX = x; + posY = y; + letterWidth = letterW; + letterHeight = letterH; + scale = lScale; +} + +UIText::~UIText() +{ +} + +void UIText::ParseString(const char* inputText, int x, int y, int scale) +{ + //Parse input text into an array of char + int posX = x; + int posY = y; + int i = 0; +// printf(inputText); + char current = inputText[i]; + do + { + ++i; + if (strcmp(¤t,"\n")) + { + posX += letterWidth; + } + else + { +// printf("new line detected"); + posX = x; + posY += letterHeight; + } + UIText::AddLetter(posX, posY, current); + current = inputText[i]; + } while ((strcmp(¤t,"\0"))!=0); +} + + +void UIText::AddLetter(int xpos, int ypos, char crnt) +{ + auto& letter(manager.addEntity()); + letter.addComponent(xpos*scale, ypos*scale, letterWidth, letterHeight, 1); +// printf("Scale: %d\n",scale); + letter.addComponent("font", SpriteComponent::spriteText, crnt, letterWidth, letterHeight, scale); + letter.addGroup(Game::groupUI_Layer1); +} diff --git a/src/ui/UIText.h b/src/ui/UIText.h new file mode 100644 index 0000000..12d3c74 --- /dev/null +++ b/src/ui/UIText.h @@ -0,0 +1,32 @@ +/* + * UIText.h + * + * Created on: May 21, 2020 + * Author: ayoungblood + */ + +#ifndef SRC_UITEXT_H_ +#define SRC_UITEXT_H_ + +#include "SDL2/SDL.h" +#include + +class UIText +{ +public: + const char* inputText; + int letterHeight; + int letterWidth; + int posX; + int posY; + std::string textureID; + UIText(const char* inputText, std::string texID, int x, int y, int letterW, int letterH, int lScale); + ~UIText(); + +// void SetCharClips(SDL_Texture* fontTex, int x, int y, int letterW, int letterH); + void AddLetter(int xpos, int ypos, char crnt); + void ParseString(const char* inputText, int x, int y, int scale); + int scale; +}; + +#endif /* SRC_UITEXT_H_ */