Compare commits
2 Commits
master
...
kimkulling
Author | SHA1 | Date |
---|---|---|
Kim Kulling | 965405b34d | |
Kim Kulling | 30ff0eb422 |
|
@ -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
|
||||||
|
|
|
@ -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:
|
||||||
|
|
Loading…
Reference in New Issue