Ver Fonte

src/*: code-style: remove extra namespace

Daniele Bartolini há 3 anos atrás
pai
commit
06cf56d26b

+ 0 - 4
src/resource/expression_language.cpp

@@ -9,8 +9,6 @@
 
 namespace crown
 {
-namespace skinny
-{
 namespace expression_language
 {
 	/// Byte code constants.
@@ -484,6 +482,4 @@ namespace expression_language
 } // namespace expression_language
 #endif // CROWN_CAN_COMPILE
 
-} // namespace skinny
-
 } // namespace crown

+ 0 - 4
src/resource/expression_language.h

@@ -28,8 +28,6 @@
 
 namespace crown
 {
-namespace skinny
-{
 namespace expression_language
 {
 	/// Represents the working stack.
@@ -81,6 +79,4 @@ namespace expression_language
 } // namespace expression_language
 #endif
 
-} // namespace skinny
-
 } // namespace crown

+ 2 - 2
src/resource/state_machine_resource.cpp

@@ -388,7 +388,7 @@ namespace state_machine_internal
 
 				for (u32 i = 0; i < vector::size(si.animations); ++i)
 				{
-					const u32 num = skinny::expression_language::compile(si.animations[i].weight.c_str()
+					const u32 num = expression_language::compile(si.animations[i].weight.c_str()
 						, num_variables
 						, variables
 						, num_constants
@@ -402,7 +402,7 @@ namespace state_machine_internal
 					written += num;
 				}
 
-				const u32 num = skinny::expression_language::compile(si.speed.c_str()
+				const u32 num = expression_language::compile(si.speed.c_str()
 					, num_variables
 					, variables
 					, num_constants

+ 3 - 3
src/world/animation_state_machine.cpp

@@ -142,7 +142,7 @@ void AnimationStateMachine::trigger(StateMachineInstance state_machine, StringId
 void AnimationStateMachine::update(float dt)
 {
 	f32 stack_data[32];
-	skinny::expression_language::Stack stack(stack_data, countof(stack_data));
+	expression_language::Stack stack(stack_data, countof(stack_data));
 
 	for (u32 ii = 0; ii < array::size(_animations); ++ii)
 	{
@@ -162,7 +162,7 @@ void AnimationStateMachine::update(float dt)
 			const crown::Animation* animation = state_machine::animation(aa, jj);
 
 			stack.size = 0;
-			skinny::expression_language::run(&byte_code[animation->bytecode_entry], variables, stack);
+			expression_language::run(&byte_code[animation->bytecode_entry], variables, stack);
 			const f32 cur = stack.size > 0 ? stack_data[stack.size-1] : 0.0f;
 			if (cur > max_v || max_i == UINT32_MAX)
 			{
@@ -174,7 +174,7 @@ void AnimationStateMachine::update(float dt)
 
 		// Evaluate animation speed
 		stack.size = 0;
-		skinny::expression_language::run(&byte_code[anim_i.state->speed_bytecode], variables, stack);
+		expression_language::run(&byte_code[anim_i.state->speed_bytecode], variables, stack);
 		const f32 speed = stack.size > 0 ? stack_data[stack.size-1] : 1.0f;
 
 		// Advance animation