diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/bullet/godot_result_callbacks.cpp | 1 | ||||
| -rw-r--r-- | modules/mono/glue/Managed/Files/Colors.cs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/modules/bullet/godot_result_callbacks.cpp b/modules/bullet/godot_result_callbacks.cpp index 0117bb375f..3dc9f3fce5 100644 --- a/modules/bullet/godot_result_callbacks.cpp +++ b/modules/bullet/godot_result_callbacks.cpp @@ -304,6 +304,7 @@ btScalar GodotRestInfoContactResultCallback::addSingleResult(btManifoldPoint &cp colObj = static_cast<CollisionObjectBullet *>(colObj1Wrap->getCollisionObject()->getUserPointer()); m_result->shape = cp.m_index1; B_TO_G(cp.getPositionWorldOnB(), m_result->point); + B_TO_G(cp.m_normalWorldOnB, m_result->normal); m_rest_info_bt_point = cp.getPositionWorldOnB(); m_rest_info_collision_object = colObj1Wrap->getCollisionObject(); } else { diff --git a/modules/mono/glue/Managed/Files/Colors.cs b/modules/mono/glue/Managed/Files/Colors.cs index 942375b0fe..bc2a1a3bd7 100644 --- a/modules/mono/glue/Managed/Files/Colors.cs +++ b/modules/mono/glue/Managed/Files/Colors.cs @@ -8,7 +8,7 @@ namespace Godot // Color names and values are derived from core/color_names.inc internal static readonly Dictionary<string, Color> namedColors = new Dictionary<string, Color> { {"aliceblue", new Color(0.94f, 0.97f, 1.00f)}, - {"antiqueWhite", new Color(0.98f, 0.92f, 0.84f)}, + {"antiquewhite", new Color(0.98f, 0.92f, 0.84f)}, {"aqua", new Color(0.00f, 1.00f, 1.00f)}, {"aquamarine", new Color(0.50f, 1.00f, 0.83f)}, {"azure", new Color(0.94f, 1.00f, 1.00f)}, |