Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
7d4b3e65
Commit
7d4b3e65
authored
May 21, 2020
by
Paul Herman
Committed by
Paul Herman
May 21, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Expose loading TGA images in Image.
parent
163687d1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
0 deletions
+24
-0
image.cpp
core/image.cpp
+8
-0
image.h
core/image.h
+2
-0
image_loader_tga.cpp
modules/tga/image_loader_tga.cpp
+14
-0
No files found.
core/image.cpp
View file @
7d4b3e65
...
...
@@ -30,6 +30,7 @@
#include "image.h"
#include "core/error_macros.h"
#include "core/hash_map.h"
#include "core/io/image_loader.h"
#include "core/io/resource_loader.h"
...
...
@@ -2630,6 +2631,7 @@ void Image::fill(const Color &c) {
ImageMemLoadFunc
Image
::
_png_mem_loader_func
=
nullptr
;
ImageMemLoadFunc
Image
::
_jpg_mem_loader_func
=
nullptr
;
ImageMemLoadFunc
Image
::
_webp_mem_loader_func
=
nullptr
;
ImageMemLoadFunc
Image
::
_tga_mem_loader_func
=
nullptr
;
void
(
*
Image
::
_image_compress_bc_func
)(
Image
*
,
float
,
Image
::
UsedChannels
)
=
nullptr
;
void
(
*
Image
::
_image_compress_bptc_func
)(
Image
*
,
float
,
Image
::
UsedChannels
)
=
nullptr
;
...
...
@@ -3058,6 +3060,7 @@ void Image::_bind_methods() {
ClassDB
::
bind_method
(
D_METHOD
(
"load_png_from_buffer"
,
"buffer"
),
&
Image
::
load_png_from_buffer
);
ClassDB
::
bind_method
(
D_METHOD
(
"load_jpg_from_buffer"
,
"buffer"
),
&
Image
::
load_jpg_from_buffer
);
ClassDB
::
bind_method
(
D_METHOD
(
"load_webp_from_buffer"
,
"buffer"
),
&
Image
::
load_webp_from_buffer
);
ClassDB
::
bind_method
(
D_METHOD
(
"load_tga_from_buffer"
,
"buffer"
),
&
Image
::
load_tga_from_buffer
);
ADD_PROPERTY
(
PropertyInfo
(
Variant
::
DICTIONARY
,
"data"
,
PROPERTY_HINT_NONE
,
""
,
PROPERTY_USAGE_STORAGE
),
"_set_data"
,
"_get_data"
);
...
...
@@ -3389,6 +3392,11 @@ Error Image::load_webp_from_buffer(const Vector<uint8_t> &p_array) {
return
_load_from_buffer
(
p_array
,
_webp_mem_loader_func
);
}
Error
Image
::
load_tga_from_buffer
(
const
Vector
<
uint8_t
>
&
p_array
)
{
ERR_FAIL_NULL_V_MSG
(
_tga_mem_loader_func
,
ERR_UNAVAILABLE
,
"TGA module was not installed."
);
return
_load_from_buffer
(
p_array
,
_tga_mem_loader_func
);
}
void
Image
::
convert_rg_to_ra_rgba8
()
{
ERR_FAIL_COND
(
format
!=
FORMAT_RGBA8
);
ERR_FAIL_COND
(
!
data
.
size
());
...
...
core/image.h
View file @
7d4b3e65
...
...
@@ -135,6 +135,7 @@ public:
static
ImageMemLoadFunc
_png_mem_loader_func
;
static
ImageMemLoadFunc
_jpg_mem_loader_func
;
static
ImageMemLoadFunc
_webp_mem_loader_func
;
static
ImageMemLoadFunc
_tga_mem_loader_func
;
static
void
(
*
_image_compress_bc_func
)(
Image
*
,
float
,
UsedChannels
p_channels
);
static
void
(
*
_image_compress_bptc_func
)(
Image
*
,
float
p_lossy_quality
,
UsedChannels
p_channels
);
...
...
@@ -360,6 +361,7 @@ public:
Error
load_png_from_buffer
(
const
Vector
<
uint8_t
>
&
p_array
);
Error
load_jpg_from_buffer
(
const
Vector
<
uint8_t
>
&
p_array
);
Error
load_webp_from_buffer
(
const
Vector
<
uint8_t
>
&
p_array
);
Error
load_tga_from_buffer
(
const
Vector
<
uint8_t
>
&
p_array
);
void
convert_rg_to_ra_rgba8
();
void
convert_ra_rgba8_to_rg
();
...
...
modules/tga/image_loader_tga.cpp
View file @
7d4b3e65
...
...
@@ -30,6 +30,8 @@
#include "image_loader_tga.h"
#include "core/error_macros.h"
#include "core/io/file_access_memory.h"
#include "core/os/os.h"
#include "core/print_string.h"
...
...
@@ -311,5 +313,17 @@ void ImageLoaderTGA::get_recognized_extensions(List<String> *p_extensions) const
p_extensions
->
push_back
(
"tga"
);
}
static
Ref
<
Image
>
_tga_mem_loader_func
(
const
uint8_t
*
p_png
,
int
p_size
)
{
FileAccessMemory
memfile
;
Error
open_memfile_error
=
memfile
.
open_custom
(
p_png
,
p_size
);
ERR_FAIL_COND_V_MSG
(
open_memfile_error
,
Ref
<
Image
>
(),
"Could not create memfile for TGA image buffer."
);
Ref
<
Image
>
img
;
img
.
instance
();
Error
load_error
=
ImageLoaderTGA
().
load_image
(
img
,
&
memfile
,
false
,
1.0
f
);
ERR_FAIL_COND_V_MSG
(
load_error
,
Ref
<
Image
>
(),
"Failed to load TGA image."
);
return
img
;
}
ImageLoaderTGA
::
ImageLoaderTGA
()
{
Image
::
_tga_mem_loader_func
=
_tga_mem_loader_func
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment