mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-20 22:20:59 -04:00
fix warnings in linux build
This commit is contained in:
parent
f612d6c510
commit
9c6ec62e46
@ -403,7 +403,7 @@ ChanConfig::ChanConfig(GraphicsPipe* pipe, std::string cfg, Node *render,
|
|||||||
ChanViewport V(0., 1., 0., 1.);
|
ChanViewport V(0., 1., 0., 1.);
|
||||||
chan_eval(win, W, L, S, V, W.getChanOffset()+1, sizeX, sizeY,
|
chan_eval(win, W, L, S, V, W.getChanOffset()+1, sizeX, sizeY,
|
||||||
render, want_cameras);
|
render, want_cameras);
|
||||||
for(int dr_index=0; dr_index<_display_region.size(); dr_index++)
|
for(size_t dr_index=0; dr_index<_display_region.size(); dr_index++)
|
||||||
_group_membership.push_back(W.getCameraGroup(dr_index));
|
_group_membership.push_back(W.getCameraGroup(dr_index));
|
||||||
|
|
||||||
// sanity check
|
// sanity check
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
#include <notify.h>
|
#include <notify.h>
|
||||||
|
|
||||||
INLINE void ChanEatFrontWhite(std::string& S) {
|
INLINE void ChanEatFrontWhite(std::string& S) {
|
||||||
int i = S.find_first_not_of(" \t\r\f\n");
|
size_t i = S.find_first_not_of(" \t\r\f\n");
|
||||||
if ((i != std::string::npos) && (i != 0))
|
if ((i != std::string::npos) && (i != 0))
|
||||||
S.erase(0, i);
|
S.erase(0, i);
|
||||||
}
|
}
|
||||||
|
@ -35,7 +35,7 @@ INLINE std::string ChanReadLine(istream& is) {
|
|||||||
#endif /* BROKEN_EXCEPTIONS */
|
#endif /* BROKEN_EXCEPTIONS */
|
||||||
std::string S;
|
std::string S;
|
||||||
std::getline(is, S);
|
std::getline(is, S);
|
||||||
int i = S.find_first_not_of(" /t/f/r/n");
|
size_t i = S.find_first_not_of(" /t/f/r/n");
|
||||||
if ((i == std::string::npos) || (S[i] == ';'))
|
if ((i == std::string::npos) || (S[i] == ';'))
|
||||||
return ChanReadLine(is); // all white space or comment
|
return ChanReadLine(is); // all white space or comment
|
||||||
if (i != 0)
|
if (i != 0)
|
||||||
|
@ -141,7 +141,7 @@ void SetupParseFunctor::operator()(std::string S) {
|
|||||||
<< qf.getVert() << endl;
|
<< qf.getVert() << endl;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
chancfg_cat->debug() << " FOV is of an unknown type (" << qf.getType()
|
chancfg_cat->debug() << " FOV is of an unknown type (" << (int)qf.getType()
|
||||||
<< ")" << endl;
|
<< ")" << endl;
|
||||||
}
|
}
|
||||||
switch (s.getOrientation()) {
|
switch (s.getOrientation()) {
|
||||||
@ -159,7 +159,7 @@ void SetupParseFunctor::operator()(std::string S) {
|
|||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
chancfg_cat->debug() << " setup has an unknown orientation ("
|
chancfg_cat->debug() << " setup has an unknown orientation ("
|
||||||
<< s.getOrientation() << ")" << endl;
|
<< (int)s.getOrientation() << ")" << endl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
(*SetupDB)[sym] = s;
|
(*SetupDB)[sym] = s;
|
||||||
|
@ -98,7 +98,7 @@ INLINE int WindowItem::getCameraGroup(int display_region) const {
|
|||||||
}
|
}
|
||||||
INLINE int WindowItem::getNumCameraGroups(void) const {
|
INLINE int WindowItem::getNumCameraGroups(void) const {
|
||||||
int largestIndex=0;
|
int largestIndex=0;
|
||||||
for(int j=0;j<_camera_group.size();j++)
|
for(size_t j=0;j<_camera_group.size();j++)
|
||||||
if(_camera_group[j]>largestIndex)largestIndex=_camera_group[j];
|
if(_camera_group[j]>largestIndex)largestIndex=_camera_group[j];
|
||||||
return largestIndex+1;
|
return largestIndex+1;
|
||||||
}
|
}
|
||||||
|
@ -82,7 +82,7 @@ void WindowParseFunctor::operator()(std::string S) {
|
|||||||
//0 based. We don't know yet how much room we actually need
|
//0 based. We don't know yet how much room we actually need
|
||||||
//as the information is in the un-analyzed layout. cameraGroup
|
//as the information is in the un-analyzed layout. cameraGroup
|
||||||
//and sv are handled the same in this manner.
|
//and sv are handled the same in this manner.
|
||||||
while(sv.size()<region_number+1) {
|
while((int)sv.size() < region_number+1) {
|
||||||
sv.push_back("");
|
sv.push_back("");
|
||||||
cameraGroup.push_back(0);
|
cameraGroup.push_back(0);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user