Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

Fix some array size function definition mismatch.

4.0
Fabio Alessandrelli 2022-08-04 13:06:17 +07:00
parent 40eafcfab4
commit 55845bac26
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/input/input.cpp
Unescape Escape View File

@ -1187,7 +1187,7 @@ Input::JoyEvent Input::_get_mapped_axis_event(const JoyDeviceMapping &mapping, J
return event; return event;
} }
void Input::_get_mapped_hat_events(const JoyDeviceMapping &mapping, HatDir p_hat, JoyEvent r_events[]) { void Input::_get_mapped_hat_events(const JoyDeviceMapping &mapping, HatDir p_hat, JoyEvent r_events[(size_t)HatDir::MAX]) {
for (int i = 0; i < mapping.bindings.size(); i++) { for (int i = 0; i < mapping.bindings.size(); i++) {
const JoyBinding binding = mapping.bindings[i]; const JoyBinding binding = mapping.bindings[i];
if (binding.inputType == TYPE_HAT && binding.input.hat.hat == p_hat) { if (binding.inputType == TYPE_HAT && binding.input.hat.hat == p_hat) {

2
modules/csg/csg.cpp
Unescape Escape View File

@ -729,7 +729,7 @@ void CSGBrushOperation::MeshMerge::mark_inside_faces() {
} }
} }
void CSGBrushOperation::MeshMerge::add_face(const Vector3 p_points[], const Vector2 p_uvs[], bool p_smooth, bool p_invert, const Ref<Material> &p_material, bool p_from_b) { void CSGBrushOperation::MeshMerge::add_face(const Vector3 p_points[3], const Vector2 p_uvs[3], bool p_smooth, bool p_invert, const Ref<Material> &p_material, bool p_from_b) {
int indices[3]; int indices[3];
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
VertexKey vk; VertexKey vk;

2
modules/lightmapper_rd/lightmapper_rd.h
Unescape Escape View File

@ -183,7 +183,7 @@ class LightmapperRD : public Lightmapper {
} }
}; };
void _plot_triangle_into_triangle_index_list(int p_size, const Vector3i &p_ofs, const AABB &p_bounds, const Vector3 p_points[], uint32_t p_triangle_index, LocalVector<TriangleSort> &triangles, uint32_t p_grid_size); void _plot_triangle_into_triangle_index_list(int p_size, const Vector3i &p_ofs, const AABB &p_bounds, const Vector3 p_points[3], uint32_t p_triangle_index, LocalVector<TriangleSort> &triangles, uint32_t p_grid_size);
struct RasterPushConstant { struct RasterPushConstant {
float atlas_size[2] = {}; float atlas_size[2] = {};