UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed up conversion warnings in VS2010.

Browse Source
This commit is contained in:
NathanSweet 2013-04-25 23:39:46 +02:00
parent 90747edd74
commit 99ec8957f8
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-c/Spine-C.sln
View File

@ -1,7 +1,7 @@
 
Microsoft Visual Studio Solution File, Format Version 11.00 Microsoft Visual Studio Solution File, Format Version 11.00
# Visual C++ Express 2010 # Visual C++ Express 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Spine-C", "Spine-C.vcxproj", "{5D74934A-7512-45EE-8402-7B95D3642E85}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spine-c", "spine-c.vcxproj", "{5D74934A-7512-45EE-8402-7B95D3642E85}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution

2
spine-c/include/spine/Atlas.h
View File

@ -72,7 +72,7 @@ struct AtlasRegion {
const char* name; const char* name;
int x, y, width, height; int x, y, width, height;
float u, v, u2, v2; float u, v, u2, v2;
float offsetX, offsetY; int offsetX, offsetY;
int originalWidth, originalHeight; int originalWidth, originalHeight;
int index; int index;
int/*bool*/rotate; int/*bool*/rotate;

6
spine-c/include/spine/RegionAttachment.h
View File

@ -45,9 +45,9 @@ struct RegionAttachment {
float x, y, scaleX, scaleY, rotation, width, height; float x, y, scaleX, scaleY, rotation, width, height;
void* texture; void* texture;
float regionOffsetX, regionOffsetY; /* Pixels stripped from the bottom left, unrotated. */ int regionOffsetX, regionOffsetY; /* Pixels stripped from the bottom left, unrotated. */
float regionWidth, regionHeight; /* Unrotated, stripped size. */ int regionWidth, regionHeight; /* Unrotated, stripped pixel size. */
float regionOriginalWidth, regionOriginalHeight; /* Unrotated, unstripped size. */ int regionOriginalWidth, regionOriginalHeight; /* Unrotated, unstripped pixel size. */
float offset[8]; float offset[8];
float vertices[8]; float vertices[8];

4
spine-c/src/spine/Animation.c
View File

@ -54,7 +54,7 @@ void Animation_apply (const Animation* self, Skeleton* skeleton, float time, int
#ifdef __STDC_VERSION__ #ifdef __STDC_VERSION__
if (loop && self->duration) time = fmodf(time, self->duration); if (loop && self->duration) time = fmodf(time, self->duration);
#else #else
if (loop && self->duration) time = fmod(time, self->duration); if (loop && self->duration) time = (float)fmod(time, self->duration);
#endif #endif
for (i = 0; i < n; ++i) for (i = 0; i < n; ++i)
@ -67,7 +67,7 @@ void Animation_mix (const Animation* self, Skeleton* skeleton, float time, int/*
#ifdef __STDC_VERSION__ #ifdef __STDC_VERSION__
if (loop && self->duration) time = fmodf(time, self->duration); if (loop && self->duration) time = fmodf(time, self->duration);
#else #else
if (loop && self->duration) time = fmod(time, self->duration); if (loop && self->duration) time = (float)fmod(time, self->duration);
#endif #endif
for (i = 0; i < n; ++i) for (i = 0; i < n; ++i)

4
spine-c/src/spine/Atlas.c
View File

@ -272,8 +272,8 @@ Atlas* Atlas_readAtlas (const char* begin, int length, const char* dir) {
region->originalHeight = toInt(tuple + 1); region->originalHeight = toInt(tuple + 1);
readTuple(end, tuple); readTuple(end, tuple);
region->offsetX = (float)toInt(tuple); region->offsetX = toInt(tuple);
region->offsetY = (float)toInt(tuple + 1); region->offsetY = toInt(tuple + 1);
if (!readValue(end, &str)) return abortAtlas(self); if (!readValue(end, &str)) return abortAtlas(self);
region->index = toInt(&str); region->index = toInt(&str);

4
spine-c/src/spine/Bone.c
View File

@ -77,8 +77,8 @@ void Bone_updateWorldTransform (Bone* self, int flipX, int flipY) {
cosine = cosf(radians); cosine = cosf(radians);
sine = sinf(radians); sine = sinf(radians);
#else #else
cosine = cos(radians); cosine = (float)cos(radians);
sine = sin(radians); sine = (float)sin(radians);
#endif #endif
CONST_CAST(float, self->m00) = cosine * self->worldScaleX; CONST_CAST(float, self->m00) = cosine * self->worldScaleX;
CONST_CAST(float, self->m10) = sine * self->worldScaleX; CONST_CAST(float, self->m10) = sine * self->worldScaleX;

2
spine-c/src/spine/Json.c
View File

@ -92,7 +92,7 @@ static const char* parse_number (Json *item, const char* num) {
subscale = (subscale * 10) + (*num++ - '0'); /* Number? */ subscale = (subscale * 10) + (*num++ - '0'); /* Number? */
} }
n = sign * n * pow(10.0f, (scale + subscale * signsubscale)); /* number = +/- number.fraction * 10^+/- exponent */ n = sign * n * (float)pow(10.0f, (scale + subscale * signsubscale)); /* number = +/- number.fraction * 10^+/- exponent */
item->valuefloat = n; item->valuefloat = n;
item->valueint = (int)n; item->valueint = (int)n;

4
spine-c/src/spine/RegionAttachment.c
View File

@ -73,8 +73,8 @@ void RegionAttachment_updateOffset (RegionAttachment* self) {
float cosine = cosf(radians); float cosine = cosf(radians);
float sine = sinf(radians); float sine = sinf(radians);
#else #else
float cosine = cos(radians); float cosine = (float)cos(radians);
float sine = sin(radians); float sine = (float)sin(radians);
#endif #endif
float localXCos = localX * cosine + self->x; float localXCos = localX * cosine + self->x;
float localXSin = localX * sine; float localXSin = localX * sine;