Browse Source

Rename texture_uv_ to textureUV_

nemerle 10 years ago
parent
commit
e89184b38c

+ 2 - 2
Source/Urho3D/Graphics/OctreeQuery.h

@@ -197,7 +197,7 @@ struct URHO3D_API RayQueryResult
     {
         return position_ != rhs.position_ ||
                 normal_ != rhs.normal_ ||
-                texture_uv_ != rhs.texture_uv_ ||
+                textureUV_ != rhs.textureUV_ ||
                 distance_ != rhs.distance_ ||
                 drawable_ != rhs.drawable_ ||
                 node_ != rhs.node_ ||
@@ -209,7 +209,7 @@ struct URHO3D_API RayQueryResult
     /// Hit normal in world space. Negation of ray direction if per-triangle data not available.
     Vector3 normal_;
     /// Hit texture position
-    Vector2 texture_uv_;
+    Vector2 textureUV_;
     /// Distance from ray origin.
     float distance_;
     /// Drawable.

+ 1 - 1
Source/Urho3D/Graphics/StaticModel.cpp

@@ -124,7 +124,7 @@ void StaticModel::ProcessRayQuery(const RayOctreeQuery& query, PODVector<RayQuer
             result.drawable_ = this;
             result.node_ = node_;
             result.subObject_ = hitBatch;
-            result.texture_uv_ = geometryUV;
+            result.textureUV_ = geometryUV;
             results.Push(result);
         }
         break;

+ 1 - 1
Source/Urho3D/LuaScript/pkgs/Graphics/OctreeQuery.pkg

@@ -24,7 +24,7 @@ struct RayQueryResult
     
     Vector3 position_ @ position;
     Vector3 normal_ @ normal;
-    Vector2 texture_uv_ @ texture_uv;
+    Vector2 textureUV_ @ textureUV;
     float distance_ @ distance;
     Drawable* drawable_ @ drawable;
     Node* node_ @ node;

+ 1 - 1
Source/Urho3D/Script/GraphicsAPI.cpp

@@ -1751,7 +1751,7 @@ static void RegisterOctree(asIScriptEngine* engine)
     engine->RegisterObjectBehaviour("RayQueryResult", asBEHAVE_CONSTRUCT, "void f()", asFUNCTION(ConstructRayQueryResult), asCALL_CDECL_OBJLAST);
     engine->RegisterObjectProperty("RayQueryResult", "Vector3 position", offsetof(RayQueryResult, position_));
     engine->RegisterObjectProperty("RayQueryResult", "Vector3 normal", offsetof(RayQueryResult, normal_));
-    engine->RegisterObjectProperty("RayQueryResult", "Vector2 texture_uv", offsetof(RayQueryResult, texture_uv_));
+    engine->RegisterObjectProperty("RayQueryResult", "Vector2 textureUV", offsetof(RayQueryResult, textureUV_));
     engine->RegisterObjectProperty("RayQueryResult", "float distance", offsetof(RayQueryResult, distance_));
     engine->RegisterObjectMethod("RayQueryResult", "Drawable@+ get_drawable() const", asFUNCTION(RayQueryResultGetDrawable), asCALL_CDECL_OBJLAST);
     engine->RegisterObjectMethod("RayQueryResult", "Node@+ get_node() const", asFUNCTION(RayQueryResultGetNode), asCALL_CDECL_OBJLAST);