seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Exposed RenderingDevice to script API

Browse Source 
Also added an easier way to load native GLSL shaders.

Extras:

Had to fix no-cache for subresources in resource loader, it was not properly working, making shaders not properly reload.

Note:

The precommit hooks are broken because they don't seem to support enums from one class being used in another.
Feel free to fix this after merging this PR.
This commit is contained in:
Juan Linietsky
2020-04-19 23:19:21 -03:00
parent 6d8e1aea89
commit ae09b55a19
75 changed files with 4439 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scene/resources/resource_format_text.h
View File

@ -62,6 +62,7 @@ class ResourceLoaderText {
//Map<String,String> remaps;
Map<int, ExtResource> ext_resources;
Map<int, RES> int_resources;
int resources_total;
int resource_current;
@ -69,6 +70,8 @@ class ResourceLoaderText {
VariantParser::Tag next_tag;
bool use_nocache;
bool use_sub_threads;
float *progress;
@ -106,7 +109,6 @@ class ResourceLoaderText {
friend class ResourceFormatLoaderText;
List<RES> resource_cache;
Error error;
RES resource;
@ -134,7 +136,7 @@ public:
class ResourceFormatLoaderText : public ResourceFormatLoader {
public:
static ResourceFormatLoaderText *singleton;
virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr);
virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, bool p_no_cache = false);
virtual void get_recognized_extensions_for_type(const String &p_type, List<String> *p_extensions) const;
virtual void get_recognized_extensions(List<String> *p_extensions) const;
virtual bool handles_type(const String &p_type) const;