summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--source/Piston.h49
1 files changed, 30 insertions, 19 deletions
diff --git a/source/Piston.h b/source/Piston.h
index d52b92b3d..ee0d32f5e 100644
--- a/source/Piston.h
+++ b/source/Piston.h
@@ -18,29 +18,40 @@ public:
cPiston( cWorld* a_World );
- static char RotationPitchToMetaData( float a_Rotation, float a_Pitch )
+ static NIBBLETYPE RotationPitchToMetaData(float a_Rotation, float a_Pitch)
{
- LOGD("pre:a_Rotation %f \n",a_Rotation);
- LOGD("a_Pitch %f \n",a_Pitch);
-
- if (a_Pitch >= 50.f ){
+ if (a_Pitch >= 50.f)
+ {
return 0x1;
- } else if ( a_Pitch <= -50.f ) {
+ }
+ else if (a_Pitch <= -50.f)
+ {
return 0x0;
- } else {
-
- a_Rotation += 90 + 45; // So its not aligned with axis
- std::printf("a_Rotation %f \n",a_Rotation);
-
- if( a_Rotation > 360.f ) a_Rotation -= 360.f;
- if( a_Rotation >= 0.f && a_Rotation < 90.f )
- { LOG("1111\n");return 0x4;}
- else if( a_Rotation >= 180 && a_Rotation < 270 )
- { LOG("2222\n");return 0x5;}
- else if( a_Rotation >= 90 && a_Rotation < 180 )
- { LOG("3333\n");return 0x2;}
+ }
+ else
+ {
+ a_Rotation += 90 + 45; // So its not aligned with axis
+
+ if (a_Rotation > 360.f)
+ {
+ a_Rotation -= 360.f;
+ }
+ if ((a_Rotation >= 0.f) && (a_Rotation < 90.f))
+ {
+ return 0x4;
+ }
+ else if ((a_Rotation >= 180) && (a_Rotation < 270))
+ {
+ return 0x5;
+ }
+ else if ((a_Rotation >= 90) && (a_Rotation < 180))
+ {
+ return 0x2;
+ }
else
- { LOG("4444\n");return 0x3;}
+ {
+ return 0x3;
+ }
}
}