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

Changed the *(itr++) instances with *(itr), *(itr+1) with a seperate itr+=n etc. This

Browse Source 
has been done to avoid VC6.0 optimization ordering problems.
This commit is contained in:
Robert Osfield
2004-06-09 16:28:51 +00:00
parent f75a7c6294
commit 3adacbdeb7
2 changed files with 67 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/osgPlugins/lwo/iffparser.h
View File

@@ -92,10 +92,11 @@ namespace iff
{
std::string tag;
for (int i=0; i<4; ++i) tag += *(it++);
unsigned int len = ((static_cast<unsigned int>(*(it++)) & 0xFF) << 24) |
((static_cast<unsigned int>(*(it++)) & 0xFF) << 16) |
((static_cast<unsigned int>(*(it++)) & 0xFF) << 8) |
(static_cast<unsigned int>(*(it++)) & 0xFF);
unsigned int len = ((static_cast<unsigned int>(*(it)) & 0xFF) << 24) |
((static_cast<unsigned int>(*(it+1)) & 0xFF) << 16) |
((static_cast<unsigned int>(*(it+2)) & 0xFF) << 8) |
(static_cast<unsigned int>(*(it+3)) & 0xFF);
it += 4;
os_ << "DEBUG INFO: iffparser: reading chunk " << tag << ", length = " << len << ", context = " << context << "\n";
Chunk *chk = parse_chunk_data(tag, context, it, it+len);
if (!chk) os_ << "DEBUG INFO: iffparser: \tprevious chunk not handled\n";

116
src/osgPlugins/lwo/lwo2read.h
View File

@@ -1,9 +1,9 @@
/****************************************************************************
Functions for reading basic data types from LWO2 files
Functions for reading basic data types from LWO2 files
Copyright (C) 2002 by Marco Jez
Copyright (C) 2002 by Marco Jez
****************************************************************************/
@@ -18,128 +18,136 @@ namespace lwo2
template<class Iter>
I1 read_I1(Iter &it)
{
return static_cast<I1>(*(it++));
return static_cast<I1>(*(it++));
}
template<class Iter>
I2 read_I2(Iter &it)
{
return ((static_cast<I2>(*(it++)) & 0xFF) << 8) |
(static_cast<I2>(*(it++)) & 0xFF);
I2 i2(((static_cast<I2>(*(it)) & 0xFF) << 8) |
(static_cast<I2>(*(it+1)) & 0xFF));
it += 2;
return i2;
}
template<class Iter>
I4 read_I4(Iter &it)
{
return ((static_cast<I4>(*(it++)) & 0xFF) << 24) |
((static_cast<I4>(*(it++)) & 0xFF) << 16) |
((static_cast<I4>(*(it++)) & 0xFF) << 8) |
(static_cast<I4>(*(it++)) & 0xFF);
I4 i4(((static_cast<I4>(*(it)) & 0xFF) << 24) |
((static_cast<I4>(*(it+1)) & 0xFF) << 16) |
((static_cast<I4>(*(it+2)) & 0xFF) << 8) |
(static_cast<I4>(*(it+3)) & 0xFF));
it += 4;
return i4;
}
template<class Iter>
U1 read_U1(Iter &it)
{
return static_cast<U1>(*(it++));
return static_cast<U1>(*(it++));
}
template<class Iter>
U2 read_U2(Iter &it)
{
return ((static_cast<U2>(*(it++)) & 0xFF) << 8) |
(static_cast<U2>(*(it++)) & 0xFF);
U2 u2(((static_cast<U2>(*(it)) & 0xFF) << 8) |
(static_cast<U2>(*(it+1)) & 0xFF));
it += 2;
return u2;
}
template<class Iter>
U4 read_U4(Iter &it)
{
return ((static_cast<U4>(*(it++)) & 0xFF) << 24) |
((static_cast<U4>(*(it++)) & 0xFF) << 16) |
((static_cast<U4>(*(it++)) & 0xFF) << 8) |
(static_cast<U4>(*(it++)) & 0xFF);
U4 u4(((static_cast<U4>(*(it)) & 0xFF) << 24) |
((static_cast<U4>(*(it+1)) & 0xFF) << 16) |
((static_cast<U4>(*(it+2)) & 0xFF) << 8) |
(static_cast<U4>(*(it+3)) & 0xFF));
it += 4;
return u4;
}
template<class Iter>
F4 read_F4(Iter &it)
{
U4 u4 = read_U4(it);
return *reinterpret_cast<F4 *>(&u4);
U4 u4 = read_U4(it);
return *reinterpret_cast<F4 *>(&u4);
}
template<class Iter>
ID4 read_ID4(Iter &it)
{
ID4 value;
for (int i=0; i<4; ++i) value.id[i] = *(it++);
return value;
ID4 value;
for (int i=0; i<4; ++i) value.id[i] = *(it++);
return value;
}
template<class Iter>
S0 read_S0(Iter &it)
{
S0 value;
while (*it) {
value += *(it++);
}
++it;
if (value.length() % 2 == 0) ++it;
return value;
S0 value;
while (*it) {
value += *(it++);
}
++it;
if (value.length() % 2 == 0) ++it;
return value;
}
template<class Iter>
VX read_VX(Iter &it)
{
VX vx;
if ((*it & 0xFF) == 0xFF) {
vx.index = read_U4(it) & 0x00FFFFFF;
} else {
vx.index = static_cast<U4>(read_U2(it));
}
return vx;
VX vx;
if ((*it & 0xFF) == 0xFF) {
vx.index = read_U4(it) & 0x00FFFFFF;
} else {
vx.index = static_cast<U4>(read_U2(it));
}
return vx;
}
template<class Iter>
COL12 read_COL12(Iter &it)
{
COL12 value;
value.red = read_F4(it);
value.green = read_F4(it);
value.blue = read_F4(it);
return value;
COL12 value;
value.red = read_F4(it);
value.green = read_F4(it);
value.blue = read_F4(it);
return value;
}
template<class Iter>
VEC12 read_VEC12(Iter &it)
{
VEC12 value;
value.X = read_F4(it);
value.Y = read_F4(it);
value.Z = read_F4(it);
return value;
VEC12 value;
value.X = read_F4(it);
value.Y = read_F4(it);
value.Z = read_F4(it);
return value;
}
template<class Iter>
FP4 read_FP4(Iter &it)
{
FP4 value;
value.fraction = read_F4(it);
return value;
FP4 value;
value.fraction = read_F4(it);
return value;
}
template<class Iter>
ANG4 read_ANG4(Iter &it)
{
ANG4 value;
value.radians = read_F4(it);
return value;
ANG4 value;
value.radians = read_F4(it);
return value;
}
template<class Iter>
FNAM0 read_FNAM0(Iter &it)
{
FNAM0 value;
value.name = read_S0(it);
return value;
FNAM0 value;
value.name = read_S0(it);
return value;
}
}