From 1df7a8b4a6833d0589470f42db97cc7a423dca0b Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 20 Apr 2017 18:09:30 +0200 Subject: Update some files --- examples/textures/resources/scarfy.png | Bin 21597 -> 33146 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'examples') diff --git a/examples/textures/resources/scarfy.png b/examples/textures/resources/scarfy.png index a377a712..beb5ffa0 100644 Binary files a/examples/textures/resources/scarfy.png and b/examples/textures/resources/scarfy.png differ -- cgit v1.2.3 From 8d3750e36d970d86507e6556bb2c61ee83e45e47 Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 20 Apr 2017 23:26:16 +0200 Subject: Turn transparent pixels to black --- examples/shaders/resources/fudesumi.png | Bin 219234 -> 222742 bytes examples/textures/resources/fudesumi.png | Bin 219234 -> 222742 bytes examples/textures/resources/fudesumi.raw | Bin 786432 -> 786432 bytes 3 files changed, 0 insertions(+), 0 deletions(-) (limited to 'examples') diff --git a/examples/shaders/resources/fudesumi.png b/examples/shaders/resources/fudesumi.png index 8ba983dc..9d9038fa 100644 Binary files a/examples/shaders/resources/fudesumi.png and b/examples/shaders/resources/fudesumi.png differ diff --git a/examples/textures/resources/fudesumi.png b/examples/textures/resources/fudesumi.png index 8ba983dc..9d9038fa 100644 Binary files a/examples/textures/resources/fudesumi.png and b/examples/textures/resources/fudesumi.png differ diff --git a/examples/textures/resources/fudesumi.raw b/examples/textures/resources/fudesumi.raw index e05fa0e1..dad6ff0a 100644 Binary files a/examples/textures/resources/fudesumi.raw and b/examples/textures/resources/fudesumi.raw differ -- cgit v1.2.3 From e38a7fcedec0573f38f5bdea43f2ad32c1889dce Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 21 Apr 2017 00:08:37 +0200 Subject: Small tweak --- examples/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/Makefile b/examples/Makefile index 060789e7..c2983c69 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -36,7 +36,7 @@ ifeq ($(PLATFORM),PLATFORM_WEB) endif # define raylib directory for include and library -RAYLIB_PATH = D:\GitHub\raylib +RAYLIB_PATH ?= C:\GitHub\raylib # determine PLATFORM_OS in case PLATFORM_DESKTOP selected ifeq ($(PLATFORM),PLATFORM_DESKTOP) -- cgit v1.2.3 From b0f8ea27e3d7417c0f0c9795aa315dac399c97bf Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sat, 22 Apr 2017 19:04:54 +0200 Subject: Renamed function for lib consistency LoadSpriteFontTTF() --> LoadSpriteFontEx() --- examples/text/text_ttf_loading.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/text/text_ttf_loading.c b/examples/text/text_ttf_loading.c index 4e490399..02b7f95f 100644 --- a/examples/text/text_ttf_loading.c +++ b/examples/text/text_ttf_loading.c @@ -25,7 +25,7 @@ int main() // NOTE: Textures/Fonts MUST be loaded after Window initialization (OpenGL context is required) // TTF SpriteFont loading with custom generation parameters - SpriteFont font = LoadSpriteFontTTF("resources/KAISG.ttf", 96, 0, 0); + SpriteFont font = LoadSpriteFontEx("resources/KAISG.ttf", 96, 0, 0); // Generate mipmap levels to use trilinear filtering // NOTE: On 2D drawing it won't be noticeable, it looks like FILTER_BILINEAR @@ -82,7 +82,7 @@ int main() if (count == 1) // Only support one ttf file dropped { UnloadSpriteFont(font); - font = LoadSpriteFontTTF(droppedFiles[0], fontSize, 0, 0); + font = LoadSpriteFontEx(droppedFiles[0], fontSize, 0, 0); ClearDroppedFiles(); } } -- cgit v1.2.3 From 9b072dc34677d00155fa8795f863f7ee2fd76b51 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sun, 23 Apr 2017 12:05:18 +0200 Subject: Review game examples Makefiles --- examples/Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'examples') diff --git a/examples/Makefile b/examples/Makefile index c2983c69..7ac395cc 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -4,7 +4,7 @@ # # NOTE: By default examples are compiled using raylib static library and OpenAL Soft shared library # -# Copyright (c) 2013-2016 Ramon Santamaria (@raysan5) +# Copyright (c) 2013-2017 Ramon Santamaria (@raysan5) # # This software is provided "as-is", without any express or implied warranty. In no event # will the authors be held liable for any damages arising from the use of this software. @@ -23,13 +23,15 @@ # #************************************************************************************************** +.PHONY: all clean + # define raylib platform to compile for # possible platforms: PLATFORM_DESKTOP PLATFORM_RPI PLATFORM_WEB # WARNING: To compile to HTML5, code must be redesigned to use emscripten.h and emscripten_set_main_loop() PLATFORM ?= PLATFORM_DESKTOP # define NO to use OpenAL Soft as static library (shared by default) -SHARED_OPENAL ?= YES +SHARED_OPENAL ?= NO ifeq ($(PLATFORM),PLATFORM_WEB) SHARED_OPENAL = NO @@ -99,7 +101,7 @@ ifeq ($(PLATFORM),PLATFORM_WEB) # --memory-init-file 0 # to avoid an external memory initialization code file (.mem) # -s ALLOW_MEMORY_GROWTH=1 # to allow memory resizing # -s TOTAL_MEMORY=16777216 # to specify heap memory size (default = 16MB) - # -preload-file file.res # embbed file.res resource into .data file + # --preload-file file.res # embbed file.res resource into .data file endif ifeq ($(PLATFORM),PLATFORM_RPI) CFLAGS = -O2 -s -Wall -std=gnu99 -fgnu89-inline @@ -174,7 +176,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # requires the following packages: # libglfw3-dev libopenal-dev libegl1-mesa-dev LIBS = -lraylib -lglfw3 -lGL -lopenal -lm -lpthread -ldl - # on XWindow could require also below libraries, just uncomment + # on XWindow requires also below libraries LIBS += -lX11 -lXrandr -lXinerama -lXi -lXxf86vm -lXcursor else ifeq ($(PLATFORM_OS),OSX) @@ -202,7 +204,7 @@ ifeq ($(PLATFORM),PLATFORM_RPI) LIBS = -lraylib -lGLESv2 -lEGL -lpthread -lrt -lm -lbcm_host -lopenal endif ifeq ($(PLATFORM),PLATFORM_WEB) - # just adjust the correct path to libraylib.bc + # NOTE: Set the correct path to libraylib.bc LIBS = $(RAYLIB_RELEASE)/libraylib.bc endif @@ -282,8 +284,7 @@ EXAMPLES = \ fix_dylib \ -# typing 'make' will invoke the default target entry called 'all', -# in this case, the 'default' target entry is raylib +# typing 'make' will invoke the default target entry all: examples # generic compilation pattern -- cgit v1.2.3 From f2656871e9150abdb589a8908c6947af31f3a393 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sun, 23 Apr 2017 12:11:27 +0200 Subject: Review Makefiles default raylib path --- examples/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/Makefile b/examples/Makefile index 7ac395cc..18a5d1f4 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -38,7 +38,7 @@ ifeq ($(PLATFORM),PLATFORM_WEB) endif # define raylib directory for include and library -RAYLIB_PATH ?= C:\GitHub\raylib +RAYLIB_PATH ?= C:\raylib\raylib # determine PLATFORM_OS in case PLATFORM_DESKTOP selected ifeq ($(PLATFORM),PLATFORM_DESKTOP) -- cgit v1.2.3