asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #34671 from Chaosus/shader_hex_support

Browse source 
Support for hex numbers in shaders
This commit is contained in:
Rémi Verschelde 2020-01-08 10:01:49 +01:00 committed by GitHub
commit 5edd1a27d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
servers/visual/shader_language.cpp
View file

@ -571,8 +571,10 @@ ShaderLanguage::Token ShaderLanguage::_get_token() {
CharType last_char = str[str.length() - 1]; CharType last_char = str[str.length() - 1];
if (hexa_found) { if (hexa_found) {
//hex integers eg."0xFF" or "0x12AB", etc - NOT supported yet //integer(hex)
return _make_token(TK_ERROR, "Invalid (hexadecimal) numeric constant - Not supported"); if (str.size() > 11 || !str.is_valid_hex_number(true)) { // > 0xFFFFFFFF
return _make_token(TK_ERROR, "Invalid (hexadecimal) numeric constant");
}
} else if (period_found || exponent_found || float_suffix_found) { } else if (period_found || exponent_found || float_suffix_found) {
//floats //floats
if (period_found) { if (period_found) {
@ -621,7 +623,11 @@ ShaderLanguage::Token ShaderLanguage::_get_token() {
else else
tk.type = TK_INT_CONSTANT; tk.type = TK_INT_CONSTANT;
tk.constant = str.to_double(); //won't work with hex if (hexa_found) {
tk.constant = (double)str.hex_to_int64(true);
} else {
tk.constant = str.to_double();
}
tk.line = tk_line; tk.line = tk_line;
return tk; return tk;