TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 01:07:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into deploy-ng

Browse Source
This commit is contained in:
rdb 2018-12-02 16:26:13 +01:00
commit f2f4b4c264
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
makepanda/makepanda.py
View File

@ -710,10 +710,17 @@ if (COMPILER == "MSVC"):
suffix = "" suffix = ""
if os.path.isfile(GetThirdpartyDir() + "openexr/lib/IlmImf-2_2.lib"): if os.path.isfile(GetThirdpartyDir() + "openexr/lib/IlmImf-2_2.lib"):
suffix = "-2_2" suffix = "-2_2"
elif os.path.isfile(GetThirdpartyDir() + "openexr/lib/IlmImf-2_3.lib"):
suffix = "-2_3"
if os.path.isfile(GetThirdpartyDir() + "openexr/lib/IlmImf" + suffix + "_s.lib"):
suffix += "_s"
LibName("OPENEXR", GetThirdpartyDir() + "openexr/lib/IlmImf" + suffix + ".lib") LibName("OPENEXR", GetThirdpartyDir() + "openexr/lib/IlmImf" + suffix + ".lib")
LibName("OPENEXR", GetThirdpartyDir() + "openexr/lib/IlmThread" + suffix + ".lib") LibName("OPENEXR", GetThirdpartyDir() + "openexr/lib/IlmThread" + suffix + ".lib")
LibName("OPENEXR", GetThirdpartyDir() + "openexr/lib/Iex" + suffix + ".lib") LibName("OPENEXR", GetThirdpartyDir() + "openexr/lib/Iex" + suffix + ".lib")
LibName("OPENEXR", GetThirdpartyDir() + "openexr/lib/Half.lib") if suffix == "-2_2":
LibName("OPENEXR", GetThirdpartyDir() + "openexr/lib/Half.lib")
else:
LibName("OPENEXR", GetThirdpartyDir() + "openexr/lib/Half" + suffix + ".lib")
IncDirectory("OPENEXR", GetThirdpartyDir() + "openexr/include/OpenEXR") IncDirectory("OPENEXR", GetThirdpartyDir() + "openexr/include/OpenEXR")
if (PkgSkip("JPEG")==0): LibName("JPEG", GetThirdpartyDir() + "jpeg/lib/jpeg-static.lib") if (PkgSkip("JPEG")==0): LibName("JPEG", GetThirdpartyDir() + "jpeg/lib/jpeg-static.lib")
if (PkgSkip("ZLIB")==0): LibName("ZLIB", GetThirdpartyDir() + "zlib/lib/zlibstatic.lib") if (PkgSkip("ZLIB")==0): LibName("ZLIB", GetThirdpartyDir() + "zlib/lib/zlibstatic.lib")
@ -744,8 +751,7 @@ if (COMPILER == "MSVC"):
IncDirectory("FCOLLADA", GetThirdpartyDir() + "fcollada/include/FCollada") IncDirectory("FCOLLADA", GetThirdpartyDir() + "fcollada/include/FCollada")
if (PkgSkip("ASSIMP")==0): if (PkgSkip("ASSIMP")==0):
LibName("ASSIMP", GetThirdpartyDir() + "assimp/lib/assimp.lib") LibName("ASSIMP", GetThirdpartyDir() + "assimp/lib/assimp.lib")
path = GetThirdpartyDir() + "assimp/lib/IrrXML.lib" if os.path.isfile(GetThirdpartyDir() + "assimp/lib/IrrXML.lib"):
if os.path.isfile(path):
LibName("ASSIMP", GetThirdpartyDir() + "assimp/lib/IrrXML.lib") LibName("ASSIMP", GetThirdpartyDir() + "assimp/lib/IrrXML.lib")
IncDirectory("ASSIMP", GetThirdpartyDir() + "assimp/include") IncDirectory("ASSIMP", GetThirdpartyDir() + "assimp/include")
if (PkgSkip("SQUISH")==0): if (PkgSkip("SQUISH")==0):

2
panda/src/windisplay/winGraphicsWindow.cxx
View File

@ -138,7 +138,7 @@ get_pointer(int device) const {
double time = ClockObject::get_global_clock()->get_real_time(); double time = ClockObject::get_global_clock()->get_real_time();
result._xpos = cpos.x; result._xpos = cpos.x;
result._ypos = cpos.y; result._ypos = cpos.y;
((GraphicsWindowInputDevice &)_input_devices[0]).set_pointer_in_window(result._xpos, result._ypos, time); ((GraphicsWindowInputDevice *)_input_devices[0].p())->set_pointer_in_window(result._xpos, result._ypos, time);
} }
} }
return result; return result;

2
panda/src/x11display/x11GraphicsWindow.cxx
View File

@ -164,7 +164,7 @@ get_pointer(int device) const {
double time = ClockObject::get_global_clock()->get_real_time(); double time = ClockObject::get_global_clock()->get_real_time();
result._xpos = event.xbutton.x; result._xpos = event.xbutton.x;
result._ypos = event.xbutton.y; result._ypos = event.xbutton.y;
((GraphicsWindowInputDevice &)_input_devices[0]).set_pointer_in_window(result._xpos, result._ypos, time); ((GraphicsWindowInputDevice *)_input_devices[0].p())->set_pointer_in_window(result._xpos, result._ypos, time);
} }
x11GraphicsPipe::_x_mutex.release(); x11GraphicsPipe::_x_mutex.release();
} }

4
pandatool/src/mayaegg/mayaEggLoader.cxx
View File

@ -975,7 +975,9 @@ MayaEggMesh *MayaEggLoader::GetMesh(EggVertexPool *pool, EggGroup *parent)
MayaEggMesh *result = _mesh_tab[parent]; MayaEggMesh *result = _mesh_tab[parent];
if (result == 0) { if (result == 0) {
result = new MayaEggMesh; result = new MayaEggMesh;
result->_name = parent->get_name(); if (parent != nullptr) {
result->_name = parent->get_name();
}
result->_pool = pool; result->_pool = pool;
result->_parent = parent; result->_parent = parent;
result->_vert_count = 0; result->_vert_count = 0;