Browse Source

Merge branch 'master' of https://github.com/odin-lang/Odin

gingerBill 3 years ago
parent
commit
594049027b
3 changed files with 4 additions and 4 deletions
  1. 1 1
      vendor/raylib/raylib.odin
  2. 2 2
      vendor/sdl2/sdl_render.odin
  3. 1 1
      vendor/stb/src/Makefile

+ 1 - 1
vendor/raylib/raylib.odin

@@ -1176,7 +1176,7 @@ foreign lib {
 	ColorFromNormalized :: proc(normalized: Vector4) -> Color ---                       // Returns Color from normalized values [0..1]
 	ColorFromNormalized :: proc(normalized: Vector4) -> Color ---                       // Returns Color from normalized values [0..1]
 	ColorToHSV          :: proc(color: Color) -> Vector3 ---                            // Returns HSV values for a Color, hue [0..360], saturation/value [0..1]
 	ColorToHSV          :: proc(color: Color) -> Vector3 ---                            // Returns HSV values for a Color, hue [0..360], saturation/value [0..1]
 	ColorFromHSV        :: proc(hue, saturation, value: f32) -> Color ---               // Returns a Color from HSV values, hue [0..360], saturation/value [0..1]
 	ColorFromHSV        :: proc(hue, saturation, value: f32) -> Color ---               // Returns a Color from HSV values, hue [0..360], saturation/value [0..1]
-	ColorAlpha          :: proc(color: f32, alpha: f32) -> Color ---                    // Returns color with alpha applied, alpha goes from 0.0f to 1.0f
+	ColorAlpha          :: proc(color: Color, alpha: f32) -> Color ---                    // Returns color with alpha applied, alpha goes from 0.0f to 1.0f
 	ColorAlphaBlend     :: proc(dst, src, tint: Color) -> Color ---                     // Returns src alpha-blended into dst color with tint
 	ColorAlphaBlend     :: proc(dst, src, tint: Color) -> Color ---                     // Returns src alpha-blended into dst color with tint
 	GetColor            :: proc(hexValue: c.int) -> Color ---                           // Get Color structure from hexadecimal value
 	GetColor            :: proc(hexValue: c.int) -> Color ---                           // Get Color structure from hexadecimal value
 	GetPixelColor       :: proc(srcPtr: rawptr, format: PixelFormat) -> Color ---       // Get Color from a source pixel pointer of certain format
 	GetPixelColor       :: proc(srcPtr: rawptr, format: PixelFormat) -> Color ---       // Get Color from a source pixel pointer of certain format

+ 2 - 2
vendor/sdl2/sdl_render.odin

@@ -93,8 +93,8 @@ foreign lib {
 	LockTextureToSurface         :: proc(texture:  ^Texture, rect: ^Rect, surface: ^^Surface) -> c.int ---
 	LockTextureToSurface         :: proc(texture:  ^Texture, rect: ^Rect, surface: ^^Surface) -> c.int ---
 	UnlockTexture                :: proc(texture:  ^Texture) ---
 	UnlockTexture                :: proc(texture:  ^Texture) ---
 	RenderTargetSupported        :: proc(renderer: ^PixelFormatEnum) -> bool ---
 	RenderTargetSupported        :: proc(renderer: ^PixelFormatEnum) -> bool ---
-	SetRenderTarget              :: proc(renderer: ^PixelFormatEnum, texture: ^Texture) -> c.int ---
-	GetRenderTarget              :: proc(renderer: ^PixelFormatEnum) -> ^Texture ---
+	SetRenderTarget              :: proc(renderer: ^Renderer, texture: ^Texture) -> c.int ---
+	GetRenderTarget              :: proc(renderer: ^Renderer) -> ^Texture ---
 	RenderSetLogicalSize         :: proc(renderer: ^Renderer, w, h: c.int) -> c.int ---
 	RenderSetLogicalSize         :: proc(renderer: ^Renderer, w, h: c.int) -> c.int ---
 	RenderGetLogicalSize         :: proc(renderer: ^Renderer, w, h: ^c.int) ---
 	RenderGetLogicalSize         :: proc(renderer: ^Renderer, w, h: ^c.int) ---
 	RenderSetIntegerScale        :: proc(renderer: ^Renderer, enable: bool) -> c.int ---
 	RenderSetIntegerScale        :: proc(renderer: ^Renderer, enable: bool) -> c.int ---

+ 1 - 1
vendor/stb/src/Makefile

@@ -6,7 +6,7 @@ all:
 	ar rcs ../lib/stb_image_resize.a stb_image_resize.o
 	ar rcs ../lib/stb_image_resize.a stb_image_resize.o
 	ar rcs ../lib/stb_truetype.a     stb_truetype.o
 	ar rcs ../lib/stb_truetype.a     stb_truetype.o
 	ar rcs ../lib/stb_rect_pack.a    stb_rect_pack.o
 	ar rcs ../lib/stb_rect_pack.a    stb_rect_pack.o
-	ar rcs ../lib/stb_vorbis_pack.a  stb_vorbis_pack.o
+	#ar rcs ../lib/stb_vorbis_pack.a  stb_vorbis_pack.o
 	#gcc -fPIC -shared -Wl,-soname=stb_image.so         -o ../lib/stb_image.so        stb_image.o
 	#gcc -fPIC -shared -Wl,-soname=stb_image.so         -o ../lib/stb_image.so        stb_image.o
 	#gcc -fPIC -shared -Wl,-soname=stb_image_write.so   -o ../lib/stb_image_write.so  stb_image_write.o
 	#gcc -fPIC -shared -Wl,-soname=stb_image_write.so   -o ../lib/stb_image_write.so  stb_image_write.o
 	#gcc -fPIC -shared -Wl,-soname=stb_image_resize.so  -o ../lib/stb_image_resize.so stb_image_resize.o
 	#gcc -fPIC -shared -Wl,-soname=stb_image_resize.so  -o ../lib/stb_image_resize.so stb_image_resize.o