FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Marco Jez, VS.NET warning fixes.

Browse Source
This commit is contained in:
Robert Osfield
2004-08-05 13:41:52 +00:00
parent 66397b3962
commit b57a4ec323
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgPlugins/lib3ds/tracks.cpp
View File

@@ -467,7 +467,7 @@ lib3ds_lin1_track_eval(Lib3dsLin1Track *track, Lib3dsFloat *p, Lib3dsFloat t)
}
if (!k->next) {
if (track->flags&LIB3DS_REPEAT) {
nt=(Lib3dsFloat)fmod(t, k->tcb.frame);
nt=(Lib3dsFloat)fmod(t, (float)k->tcb.frame);
for (k=track->keyL; k->next!=0; k=k->next) {
if ((nt>=(Lib3dsFloat)k->tcb.frame) && (nt<(Lib3dsFloat)k->next->tcb.frame)) {
break;
@@ -775,7 +775,7 @@ lib3ds_lin3_track_eval(Lib3dsLin3Track *track, Lib3dsVector p, Lib3dsFloat t)
}
if (!k->next) {
if (track->flags&LIB3DS_REPEAT) {
nt=(Lib3dsFloat)fmod(t, k->tcb.frame);
nt=(Lib3dsFloat)fmod(t, (float)k->tcb.frame);
for (k=track->keyL; k->next!=0; k=k->next) {
if ((nt>=(Lib3dsFloat)k->tcb.frame) && (nt<(Lib3dsFloat)k->next->tcb.frame)) {
break;
@@ -1122,7 +1122,7 @@ lib3ds_quat_track_eval(Lib3dsQuatTrack *track, Lib3dsQuat q, Lib3dsFloat t)
}
if (!k->next) {
if (track->flags&LIB3DS_REPEAT) {
nt=(Lib3dsFloat)fmod(t, k->tcb.frame);
nt=(Lib3dsFloat)fmod(t, (float)k->tcb.frame);
for (k=track->keyL; k->next!=0; k=k->next) {
if ((nt>=k->tcb.frame) && (nt<k->next->tcb.frame)) {
break;

3
src/osgPlugins/txp/trpage_sys.h
View File

@@ -37,11 +37,12 @@
#include <windows.h>
#ifdef __MSC_VER
#ifdef _MSC_VER
// Microsoft Developer warnings that annoy me
#pragma warning ( disable : 4251)
#pragma warning ( disable : 4275)
#pragma warning ( disable : 4786)
#pragma warning ( disable : 4251)
#endif
// Somewhat system independent file deletion macro