commit
e4453096d3
15 changed files with 16 additions and 16 deletions
|
@ -8986,7 +8986,7 @@ void RenderingDeviceVulkan::_free_rids(T &p_owner, const char *p_type) {
|
|||
}
|
||||
|
||||
void RenderingDeviceVulkan::capture_timestamp(const String &p_name) {
|
||||
ERR_FAIL_COND_MSG(draw_list != nullptr, "Capturing timestamps during draw list creation is not allowed. Offending timestap was: " + p_name);
|
||||
ERR_FAIL_COND_MSG(draw_list != nullptr, "Capturing timestamps during draw list creation is not allowed. Offending timestamp was: " + p_name);
|
||||
ERR_FAIL_COND(frames[frame].timestamp_count >= max_timestamp_query_elements);
|
||||
|
||||
//this should be optional for profiling, else it will slow things down
|
||||
|
|
|
@ -175,7 +175,7 @@ class RenderingDeviceVulkan : public RenderingDevice {
|
|||
// These are temporary buffers on CPU memory that hold
|
||||
// the information until the CPU fetches it and places it
|
||||
// either on GPU buffers, or images (textures). It ensures
|
||||
// updates are properly synchronized with whathever the
|
||||
// updates are properly synchronized with whatever the
|
||||
// GPU is doing.
|
||||
//
|
||||
// The logic here is as follows, only 3 of these
|
||||
|
|
|
@ -324,7 +324,7 @@ float EditorAudioBus::_normalized_volume_to_scaled_db(float normalized) {
|
|||
/* There are three different formulas for the conversion from normalized
|
||||
* values to relative decibal values.
|
||||
* One formula is an exponential graph which intends to counteract
|
||||
* the logorithmic nature of human hearing. This is an approximation
|
||||
* the logarithmic nature of human hearing. This is an approximation
|
||||
* of the behaviour of a 'logarithmic potentiometer' found on most
|
||||
* musical instruments and also emulated in popular software.
|
||||
* The other two equations are hand-tuned linear tapers that intend to
|
||||
|
|
|
@ -1644,7 +1644,7 @@ Error EditorFileSystem::_reimport_group(const String &p_group_file, const Vector
|
|||
config->get_section_keys("params", &sk);
|
||||
for (const String ¶m : sk) {
|
||||
Variant value = config->get_value("params", param);
|
||||
//override with whathever is in file
|
||||
//override with whatever is in file
|
||||
source_file_options[p_files[i]][param] = value;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -471,7 +471,7 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize, Ref<ImporterMesh> &p
|
|||
bool local_xform_mirror = p_local_xform.basis.determinant() < 0;
|
||||
|
||||
if (p_morph_data) {
|
||||
//add morphie target
|
||||
//add morph target
|
||||
ERR_FAIL_COND_V(!p_morph_data->targets.has("MORPH_TARGET"), ERR_INVALID_DATA);
|
||||
String mt = p_morph_data->targets["MORPH_TARGET"];
|
||||
ERR_FAIL_COND_V(!p_morph_data->sources.has(mt), ERR_INVALID_DATA);
|
||||
|
|
|
@ -113,7 +113,7 @@ void TilesEditorPlugin::_thread() {
|
|||
tile_map->set_scale(scale);
|
||||
tile_map->set_position(-(scale * encompassing_rect.get_center()) + thumbnail_size2 / 2);
|
||||
|
||||
// Add the viewport at the lasst moment to avoid rendering too early.
|
||||
// Add the viewport at the last moment to avoid rendering too early.
|
||||
EditorNode::get_singleton()->add_child(viewport);
|
||||
|
||||
RS::get_singleton()->connect(SNAME("frame_pre_draw"), callable_mp(const_cast<TilesEditorPlugin *>(this), &TilesEditorPlugin::_preview_frame_started), Vector<Variant>(), Object::CONNECT_ONESHOT);
|
||||
|
|
|
@ -527,7 +527,7 @@ String RenameDialog::_postprocess(const String &subject) {
|
|||
// To Lowercase
|
||||
result = result.to_lower();
|
||||
} else if (case_id == 2) {
|
||||
// To Upercase
|
||||
// To Uppercase
|
||||
result = result.to_upper();
|
||||
}
|
||||
|
||||
|
|
|
@ -3497,7 +3497,7 @@ bool GDScriptParser::export_annotations(const AnnotationNode *p_annotation, Node
|
|||
|
||||
variable->export_info.hint_string = hint_string;
|
||||
|
||||
// This is called after tne analyzer is done finding the type, so this should be set here.
|
||||
// This is called after the analyzer is done finding the type, so this should be set here.
|
||||
DataType export_type = variable->get_datatype();
|
||||
|
||||
if (p_annotation->name == "@export") {
|
||||
|
|
|
@ -3416,7 +3416,7 @@ void DisplayServerX11::process_events() {
|
|||
|
||||
if (mouse_mode_grab) {
|
||||
for (const KeyValue<WindowID, WindowData> &E : windows) {
|
||||
//dear X11, I try, I really try, but you never work, you do whathever you want.
|
||||
//dear X11, I try, I really try, but you never work, you do whatever you want.
|
||||
if (mouse_mode == MOUSE_MODE_CAPTURED) {
|
||||
// Show the cursor if we're in captured mode so it doesn't look weird.
|
||||
XUndefineCursor(x11_display, E.value.x11_window);
|
||||
|
|
|
@ -2612,7 +2612,7 @@ void RendererStorageRD::MaterialData::update_uniform_buffer(const Map<StringName
|
|||
}
|
||||
|
||||
if (E.value.scope == ShaderLanguage::ShaderNode::Uniform::SCOPE_INSTANCE) {
|
||||
continue; //instance uniforms don't appear in the bufferr
|
||||
continue; //instance uniforms don't appear in the buffer
|
||||
}
|
||||
|
||||
if (E.value.scope == ShaderLanguage::ShaderNode::Uniform::SCOPE_GLOBAL) {
|
||||
|
|
|
@ -575,7 +575,7 @@ void main() {
|
|||
|
||||
uint instance_index = instance_index_interp;
|
||||
|
||||
//lay out everything, whathever is unused is optimized away anyway
|
||||
//lay out everything, whatever is unused is optimized away anyway
|
||||
vec3 vertex = vertex_interp;
|
||||
vec3 view = -normalize(vertex_interp);
|
||||
vec3 albedo = vec3(1.0);
|
||||
|
|
|
@ -581,7 +581,7 @@ void main() {
|
|||
discard;
|
||||
#endif
|
||||
|
||||
//lay out everything, whathever is unused is optimized away anyway
|
||||
//lay out everything, whatever is unused is optimized away anyway
|
||||
vec3 vertex = vertex_interp;
|
||||
vec3 view = -normalize(vertex_interp);
|
||||
vec3 albedo = vec3(1.0);
|
||||
|
|
|
@ -102,7 +102,7 @@ dispatch_data;
|
|||
|
||||
struct ProcessVoxel {
|
||||
uint position; // xyz 7 bit packed, extra 11 bits for neighbors.
|
||||
uint albedo; //rgb bits 0-15 albedo, bits 16-21 are normal bits (set if geometry exists toward that side), extra 11 bits for neibhbours
|
||||
uint albedo; //rgb bits 0-15 albedo, bits 16-21 are normal bits (set if geometry exists toward that side), extra 11 bits for neighbours
|
||||
uint light; //rgbe8985 encoded total saved light, extra 2 bits for neighbours
|
||||
uint light_aniso; //55555 light anisotropy, extra 2 bits for neighbours
|
||||
//total neighbours: 26
|
||||
|
@ -135,7 +135,7 @@ dispatch_data;
|
|||
|
||||
struct ProcessVoxel {
|
||||
uint position; // xyz 7 bit packed, extra 11 bits for neighbors.
|
||||
uint albedo; //rgb bits 0-15 albedo, bits 16-21 are normal bits (set if geometry exists toward that side), extra 11 bits for neibhbours
|
||||
uint albedo; //rgb bits 0-15 albedo, bits 16-21 are normal bits (set if geometry exists toward that side), extra 11 bits for neighbours
|
||||
uint light; //rgbe8985 encoded total saved light, extra 2 bits for neighbours
|
||||
uint light_aniso; //55555 light anisotropy, extra 2 bits for neighbours
|
||||
//total neighbours: 26
|
||||
|
|
|
@ -308,7 +308,7 @@ public:
|
|||
curly_stack++;
|
||||
break;
|
||||
} else {
|
||||
break; //whathever else
|
||||
break; //whatever else
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -3220,7 +3220,7 @@ TEST_CASE("[SceneTree][CodeEdit] Backspace delete") {
|
|||
code_edit->backspace();
|
||||
CHECK(code_edit->get_line(0) == "backspace");
|
||||
|
||||
/* Move caret up to the previous line on backspace if carret is at the first column. */
|
||||
/* Move caret up to the previous line on backspace if caret is at the first column. */
|
||||
code_edit->set_text("");
|
||||
code_edit->insert_text_at_caret("line 1\nline 2");
|
||||
code_edit->set_caret_line(1);
|
||||
|
|
Loading…
Reference in a new issue