TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

misc fixes

Browse Source
This commit is contained in:
Josh Yelon 2005-10-02 05:48:25 +00:00
parent fb46c04ad6
commit bc5fc1af02
10 changed files with 883 additions and 865 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/makepanda/makepanda.bat
View File

@ -9,9 +9,9 @@ REM
if not exist makepanda\makepanda.py goto :missing1
if not exist thirdparty\win-python\python.exe goto :missing2
thirdparty\win-python\python.exe makepanda\makepanda.py %*
if errorlevel 1 if x%1 == x--slavebuild exit 1
goto done
:missing1
echo You need to change directory to the root of the panda source tree
echo before invoking makepanda. For further install instructions, read

1651
doc/makepanda/makepanda.py
View File

File diff suppressed because it is too large Load Diff

1
panda/src/framework/framework_composite.cxx Normal file
View File

@ -0,0 +1 @@
#include "framework_composite1.cxx"

3
panda/src/framework/framework_composite1.cxx Normal file
View File

@ -0,0 +1,3 @@
#include "config_framework.cxx"
#include "pandaFramework.cxx"
#include "windowFramework.cxx"

1
panda/src/pnmtext/pnmtext_composite.cxx Normal file
View File

@ -0,0 +1 @@
#include "pnmtext_composite1.cxx"

4
panda/src/pnmtext/pnmtext_composite1.cxx Normal file
View File

@ -0,0 +1,4 @@
#include "config_pnmtext.cxx"
#include "freetypeFont.cxx"
#include "pnmTextGlyph.cxx"
#include "pnmTextMaker.cxx"

2
pandatool/src/maya/mayaShader.cxx
View File

@ -189,7 +189,7 @@ read_surface_shader(MObject shader) {
MayaShaderColorDef *color_p = new MayaShaderColorDef;
for (size_t i = 0; i < color_pa.length(); i++) {
maya_cat.spam() << "color_pa[" << i << "]:" << color_pa[i].name() << endl;
maya_cat.spam() << "color_pa[" << i << "]:" << color_pa[i].name().asChar() << endl;
color_p->read_surface_color(this, color_pa[0].node());
}

8
pandatool/src/maya/mayaShaderColorDef.cxx
View File

@ -334,14 +334,14 @@ read_surface_color(MayaShader *shader, MObject color, bool trans) {
string pla_name = pla[j].name().asChar();
// sometimes, by default, maya gives a outAlpha on subsequent plugs, ignore that
if (pla_name.find("outAlpha") != string::npos) {
maya_cat.debug() << pl.name() << " ignoring: " << pla_name << endl;
maya_cat.debug() << pl.name().asChar() << " ignoring: " << pla_name << endl;
// In this case the artist is wanting to retain alpha at the result
// So make sure that this alpha is not thrown out by the egg file
_alpha_is_luminance = true;
continue;
}
if (!first) {
maya_cat.debug() << pl.name() << " next:connectedTo: " << pla_name << endl;
maya_cat.debug() << pl.name().asChar() << " next:connectedTo: " << pla_name << endl;
MayaShaderColorDef *color_p = new MayaShaderColorDef;
color_p->read_surface_color(shader, pla[j].node());
color_p->_texture_name.assign(pla[j].name().asChar());
@ -352,7 +352,7 @@ read_surface_color(MayaShader *shader, MObject color, bool trans) {
maya_cat.debug() << "uv_name : " << color_p->_texture_name << endl;
}
else {
maya_cat.debug() << pl.name() << " first:connectedTo: " << pla_name << endl;
maya_cat.debug() << pl.name().asChar() << " first:connectedTo: " << pla_name << endl;
read_surface_color(shader, pla[j].node());
_texture_name.assign(pla[j].name().asChar());
size_t loc = _texture_name.find('.',0);
@ -367,7 +367,7 @@ read_surface_color(MayaShader *shader, MObject color, bool trans) {
MPlug pl_temp = pla[j];
MPlugArray pla_temp;
pl_temp.connectedTo(pla_temp, true, false);
maya_cat.debug() << pl_temp.name() << " connectedTo:" << pla_temp.length() << " plugs\n";
maya_cat.debug() << pl_temp.name().asChar() << " connectedTo:" << pla_temp.length() << " plugs\n";
}
/*
string blah;

4
pandatool/src/maya/maya_funcs.cxx
View File

@ -545,9 +545,9 @@ describe_compound_attribute(MObject &node) {
if (status) {
MString blah;
status = enu.getDefault(blah);
maya_cat.info() << "found a string :" << blah << endl;
maya_cat.info() << "found a string :" << blah.asChar() << endl;
MPlug plug = MPlug(node, child);
maya_cat.info() << "plug name" << plug.name() << endl;
maya_cat.info() << "plug name" << plug.name().asChar() << endl;
}
}
}

2
pandatool/src/mayaegg/mayaToEggConverter.cxx
View File

@ -1657,7 +1657,7 @@ make_polyset(MayaNodeDesc *node_desc, const MDagPath &dag_path,
//return;
}
for (size_t ui=0; ui<maya_uvset_names.length(); ++ui) {
mayaegg_cat.debug() << "uv_set[" << ui << "] name: " << maya_uvset_names[ui] << endl;
mayaegg_cat.debug() << "uv_set[" << ui << "] name: " << maya_uvset_names[ui].asChar() << endl;
uvset_names.push_back(maya_uvset_names[ui].asChar());
}