Browse Source

Fix some additional warnings in GCC

Michael Ragazzon 5 years ago
parent
commit
089939aaae

+ 3 - 3
Samples/basic/sfml2/src/RenderInterfaceSFML.cpp

@@ -151,10 +151,10 @@ Rml::Core::CompiledGeometryHandle RmlUiSFMLRenderer::CompileGeometry(Rml::Core::
 #ifdef ENABLE_GLEW
 	std::vector<RmlUiSFMLRendererVertex> Data(num_vertices);
 
-	for(unsigned long i = 0; i < Data.size(); i++)
+	for(std::size_t i = 0; i < Data.size(); i++)
 	{
-		Data[i].Position = *(sf::Vector2f*)&vertices[i].position;
-		Data[i].TexCoord = *(sf::Vector2f*)&vertices[i].tex_coord;
+		Data[i].Position = sf::Vector2f(vertices[i].position.x, vertices[i].position.y);
+		Data[i].TexCoord = sf::Vector2f(vertices[i].tex_coord.x, vertices[i].tex_coord.y);
 		Data[i].Color = sf::Color(vertices[i].colour.red, vertices[i].colour.green,
 			vertices[i].colour.blue, vertices[i].colour.alpha);
 	};

+ 2 - 2
Source/Core/ElementAnimation.cpp

@@ -200,9 +200,9 @@ static PrepareTransformResult PrepareTransformPair(Transform& t0, Transform& t1,
 			if (Primitive::TryConvertToMatchingGenericType(prims0[i], prims1[i]))
 			{
 				if (prims0[i].primitive.type != p0_type)
-					(int&)result |= (int)PrepareTransformResult::ChangedT0;
+					result = PrepareTransformResult((int)result | (int)PrepareTransformResult::ChangedT0);
 				if (prims1[i].primitive.type != p1_type)
-					(int&)result |= (int)PrepareTransformResult::ChangedT1;
+					result = PrepareTransformResult((int)result | (int)PrepareTransformResult::ChangedT1);
 			}
 			else
 			{

+ 10 - 10
Source/Core/ElementAnimation.h

@@ -53,21 +53,21 @@ enum class ElementAnimationOrigin : uint8_t { User, Animation, Transition };
 class ElementAnimation
 {
 private:
-	PropertyId property_id;
+	PropertyId property_id = PropertyId::Invalid;
 
-	float duration;           // for a single iteration
-	int num_iterations;       // -1 for infinity
-	bool alternate_direction; // between iterations
+	float duration = 0;           // for a single iteration
+	int num_iterations = 0;       // -1 for infinity
+	bool alternate_direction = 0; // between iterations
 
 	std::vector<AnimationKey> keys;
 
-	double last_update_world_time;
-	float time_since_iteration_start;
-	int current_iteration;
-	bool reverse_direction;
+	double last_update_world_time = 0;
+	float time_since_iteration_start = 0;
+	int current_iteration = 0;
+	bool reverse_direction = false;
 
-	bool animation_complete;
-	ElementAnimationOrigin origin;
+	bool animation_complete = true;
+	ElementAnimationOrigin origin = ElementAnimationOrigin::User;
 
 	bool InternalAddKey(float time, const Property& property, Element& element, Tween tween);