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

Compile Fixes for Win32.

Browse Source
This commit is contained in:
Robert Osfield
2002-06-22 15:46:43 +00:00
parent 7dd82beaa9
commit bbc129e5c6
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
VisualStudio/Demos/osggeometry/osggeometry.dsp
View File

@@ -1,4 +1,4 @@
# Microsoft Developer Studio Project File - Name="Demo osggeoemtry" - Package Owner=<4>
# Microsoft Developer Studio Project File - Name="Demo osggeometry" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
@@ -10,7 +10,7 @@
CFG=Demo osggeoemtry - Win32 Release
CFG=Demo osggeometry - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -18,7 +18,7 @@ CFG=Demo osggeoemtry - Win32 Release
!MESSAGE
!MESSAGE NMAKE /f "osggeoemtry.mak".
!MESSAGE NMAKE /f "osggeometry.mak".
!MESSAGE
@@ -28,7 +28,7 @@ CFG=Demo osggeoemtry - Win32 Release
!MESSAGE
!MESSAGE NMAKE /f "osggeoemtry.mak" CFG="Demo osggeoemtry - Win32 Release"
!MESSAGE NMAKE /f "osggeometry.mak" CFG="Demo osggeometry - Win32 Release"
!MESSAGE
@@ -36,9 +36,9 @@ CFG=Demo osggeoemtry - Win32 Release
!MESSAGE
!MESSAGE "Demo osggeoemtry - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "Demo osggeometry - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "Demo osggeoemtry - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE "Demo osggeometry - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
@@ -58,7 +58,7 @@ RSC=rc.exe
!IF "$(CFG)" == "Demo osggeoemtry - Win32 Release"
!IF "$(CFG)" == "Demo osggeometry - Win32 Release"
@@ -102,11 +102,11 @@ LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 /nologo /subsystem:console /pdb:none /machine:I386 /out:"../../../bin/osggeoemtry.exe" /libpath:"../../../lib"
# ADD LINK32 /nologo /subsystem:console /pdb:none /machine:I386 /out:"../../../bin/osggeometry.exe" /libpath:"../../../lib"
!ELSEIF "$(CFG)" == "Demo osggeoemtry - Win32 Debug"
!ELSEIF "$(CFG)" == "Demo osggeometry - Win32 Debug"
@@ -150,7 +150,7 @@ LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../../../bin/osggeoemtryd.exe" /pdbtype:sept /libpath:"../../../lib"
# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../../../bin/osggeometryd.exe" /pdbtype:sept /libpath:"../../../lib"
# SUBTRACT LINK32 /incremental:no
@@ -164,15 +164,15 @@ LINK32=link.exe
# Name "Demo osggeoemtry - Win32 Release"
# Name "Demo osggeometry - Win32 Release"
# Name "Demo osggeoemtry - Win32 Debug"
# Name "Demo osggeometry - Win32 Debug"
# Begin Source File
SOURCE=..\..\..\src\Demos\osggeoemtry\osggeoemtry.cpp
SOURCE=..\..\..\src\Demos\osggeometry\osggeometry.cpp
# End Source File

4
src/osgPlugins/bmp/ReaderWriterBMP.cpp
View File

@@ -199,11 +199,11 @@ int *numComponents_ret)
// previous size calculation, see new calcs below.
long size_prev = hd.siz[1]+hd.siz[0]*65536;
osg::notify(osg::INFO) << "previous size calc = "<<size_prev<<" hd.siz[1]="<<hd.siz[1]<<" hd.siz[0]="<<hd.siz[0]<<endl;
osg::notify(osg::INFO) << "previous size calc = "<<size_prev<<" hd.siz[1]="<<hd.siz[1]<<" hd.siz[0]="<<hd.siz[0]<<std::endl;
// order of size calculation swapped, by Christo Zietsman to fix size bug.
long size = hd.siz[1]*65536+hd.siz[0];
osg::notify(osg::INFO) << "new size calc = "<<size<<" hd.siz[1]="<<hd.siz[1]<<" hd.siz[0]="<<hd.siz[0]<<endl;
osg::notify(osg::INFO) << "new size calc = "<<size<<" hd.siz[1]="<<hd.siz[1]<<" hd.siz[0]="<<hd.siz[0]<<std::endl;
int ncpal=4; // default number of colours per palette entry

12
src/osgPlugins/lwo/ReaderWriterLWO.cpp
View File

@@ -133,12 +133,12 @@ osgDB::ReaderWriter::ReadResult ReaderWriterLWO::readNode(const std::string& fil
osg::Vec3* coord = new osg::Vec3[vertexCount];
for (int i=0;i<lw->vertex_cnt;++i)
{
// From the spec_low.lxt :
// "By convention, the +X direction is to the right or east, the +Y
// direction is upward, and the +Z direction is forward or north"
// However, the osg sticks to the more conventional, y to the north,
// z upwards, x is the same - rigth/east. To handle this difference
// simple exchange osg_z for lwo_y, and osg_y for lwo_z.
// From the spec_low.lxt :
// "By convention, the +X direction is to the right or east, the +Y
// direction is upward, and the +Z direction is forward or north"
// However, the osg sticks to the more conventional, y to the north,
// z upwards, x is the same - rigth/east. To handle this difference
// simple exchange osg_z for lwo_y, and osg_y for lwo_z.
if (cim[i]>=0) coord[cim[i]].set(lw->vertex[i*3], lw->vertex[i*3+2], lw->vertex[i*3+1]);
}