v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kimkulling/fix pyassimp compatibility (#5563) 

* Use correct exception message access

* Add missing docs
pull/5559/head^2
Kim Kulling 2024-05-06 21:38:29 +02:00 committed by GitHub
parent 00b6db86ab
commit c953739487
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/Geometry/GeometryUtils.h
View File

@ -49,6 +49,10 @@ namespace Assimp {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
class ASSIMP_API GeometryUtils { class ASSIMP_API GeometryUtils {
public: public:
/// @brief Will calculate the area of a triangle.
/// @param a The first vertex of the triangle.
/// @param b The first vertex of the triangle.
/// @param c The first vertex of the triangle.
static ai_real heron( ai_real a, ai_real b, ai_real c ); static ai_real heron( ai_real a, ai_real b, ai_real c );
/// @brief Will compute the distance between 2 3D-vectors /// @brief Will compute the distance between 2 3D-vectors

4
port/PyAssimp/scripts/3d_viewer.py
View File

@ -466,8 +466,8 @@ class PyAssimp3DViewer:
try: try:
self.set_shaders_v130() self.set_shaders_v130()
self.prepare_shaders() self.prepare_shaders()
except RuntimeError, message: except RuntimeError as e:
sys.stderr.write("%s\n" % message) sys.stderr.write("%s\n" % e.message)
sys.stdout.write("Could not compile shaders in version 1.30, trying version 1.20\n") sys.stdout.write("Could not compile shaders in version 1.30, trying version 1.20\n")
if not shader_compilation_succeeded: if not shader_compilation_succeeded: