Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement SDL_UpperBlit as Surface.upper_blit #102

Merged
merged 6 commits into from
Jun 5, 2014
Merged

Implement SDL_UpperBlit as Surface.upper_blit #102

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a7bbc5b
Implement SDL_UpperBlit as upper_blit
gmorenz May 11, 2014
29bb632
Merge branch 'master' of https://github.com/AngryLawyer/rust-sdl2
gmorenz May 11, 2014
4dd3be8
Make upper_blit use transmute instead of match
gmorenz May 12, 2014
f1992f0
Merge branch 'master' of https://github.com/AngryLawyer/rust-sdl2
gmorenz May 14, 2014
f679a55
Change from upper_blit to blit_surface
gmorenz May 14, 2014
be45cdd
Change blit_surface to blit
gmorenz May 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/sdl2/surface.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,15 @@ impl Surface {
Err(get_error())
}
}

pub fn blit( &self, src: &Surface, dstrect: Option<Rect>, srcrect: Option<Rect> ) -> bool {
unsafe {
let dstrect_ptr = mem::transmute( dstrect.as_ref() );
let srcrect_ptr = mem::transmute( srcrect.as_ref() );
ll::SDL_UpperBlit( src.raw, srcrect_ptr, self.raw, dstrect_ptr ) == 0
}
}

/*
pub fn SDL_SetSurfaceAlphaMod(surface: *SDL_Surface, alpha: uint8_t) -> c_int;
pub fn SDL_GetSurfaceAlphaMod(surface: *SDL_Surface, alpha: *uint8_t ) -> c_int;
Expand All @@ -259,7 +268,6 @@ impl Surface {
pub fn SDL_ConvertPixels(width: c_int, height: c_int, src_format: uint32_t, src: *c_void, src_pitch: c_int, dst_format: uint32_t, dst: *c_void, dst_pitch: c_int) -> c_int;
pub fn SDL_FillRect(dst: *SDL_Surface, rect: *SDL_Rect, color: uint32_t) -> c_int;
pub fn SDL_FillRects(dst: *SDL_Surface, rects: *SDL_Rect, count: c_int, color: uint32_t) -> c_int;
pub fn SDL_UpperBlit(src: *SDL_Surface, srcrect: *SDL_Rect, dst: *SDL_Surface, dstrect: *SDL_Rect) -> c_int;
pub fn SDL_LowerBlit(src: *SDL_Surface, srcrect: *SDL_Rect, dst: *SDL_Surface, dstrect: *SDL_Rect) -> c_int;
pub fn SDL_SoftStretch(src: *SDL_Surface, srcrect: *SDL_Rect, dst: *SDL_Surface, dstrect: *SDL_Rect) -> c_int;
pub fn SDL_UpperBlitScaled(src: *SDL_Surface, srcrect: *SDL_Rect, dst: *SDL_Surface, dstrect: *SDL_Rect) -> c_int;
Expand Down