quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

del douplicated code in seamless texturing->line

Browse Source
This commit is contained in:
Garux 2017-09-17 11:52:23 +03:00
parent 0b3f42ffbc
commit 65e6d4a560
3 changed files with 3 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
radiant/surfacedialog.cpp
View File

@ -1453,51 +1453,6 @@ void Face_getTexture( Face& face, CopiedString& shader, TextureProjection& proje
typedef Function4<Face&, CopiedString&, TextureProjection&, ContentsFlagsValue&, void, Face_getTexture> FaceGetTexture; typedef Function4<Face&, CopiedString&, TextureProjection&, ContentsFlagsValue&, void, Face_getTexture> FaceGetTexture;
/* copied from winding.cpp */
inline bool float_is_largest_absolute( double axis, double other ){
return fabs( axis ) > fabs( other );
}
/// \brief Returns the index of the component of \p v that has the largest absolute value.
inline int vector3_largest_absolute_component_index( const DoubleVector3& v ){
return ( float_is_largest_absolute( v[1], v[0] ) )
? ( float_is_largest_absolute( v[1], v[2] ) )
? 1
: 2
: ( float_is_largest_absolute( v[0], v[2] ) )
? 0
: 2;
}
/// \brief Returns the infinite line that is the intersection of \p plane and \p other.
inline DoubleLine plane3_intersect_plane3( const Plane3& plane, const Plane3& other ){
DoubleLine line;
line.direction = vector3_cross( plane.normal(), other.normal() );
switch ( vector3_largest_absolute_component_index( line.direction ) )
{
case 0:
line.origin.x() = 0;
line.origin.y() = ( -other.dist() * plane.normal().z() - -plane.dist() * other.normal().z() ) / line.direction.x();
line.origin.z() = ( -plane.dist() * other.normal().y() - -other.dist() * plane.normal().y() ) / line.direction.x();
break;
case 1:
line.origin.x() = ( -plane.dist() * other.normal().z() - -other.dist() * plane.normal().z() ) / line.direction.y();
line.origin.y() = 0;
line.origin.z() = ( -other.dist() * plane.normal().x() - -plane.dist() * other.normal().x() ) / line.direction.y();
break;
case 2:
line.origin.x() = ( -other.dist() * plane.normal().y() - -plane.dist() * other.normal().y() ) / line.direction.z();
line.origin.y() = ( -plane.dist() * other.normal().x() - -other.dist() * plane.normal().x() ) / line.direction.z();
line.origin.z() = 0;
break;
default:
break;
}
return line;
}
void Face_setTexture_Seamless( Face& face, const char* shader, const TextureProjection& projection, const ContentsFlagsValue& flags ){ void Face_setTexture_Seamless( Face& face, const char* shader, const TextureProjection& projection, const ContentsFlagsValue& flags ){
face.SetShader( shader ); face.SetShader( shader );

2
radiant/winding.cpp
View File

@ -59,7 +59,7 @@ inline int vector3_largest_absolute_component_index( const DoubleVector3& v ){
} }
/// \brief Returns the infinite line that is the intersection of \p plane and \p other. /// \brief Returns the infinite line that is the intersection of \p plane and \p other.
inline DoubleLine plane3_intersect_plane3( const Plane3& plane, const Plane3& other ){ DoubleLine plane3_intersect_plane3( const Plane3& plane, const Plane3& other ){
DoubleLine line; DoubleLine line;
line.direction = vector3_cross( plane.normal(), other.normal() ); line.direction = vector3_cross( plane.normal(), other.normal() );
switch ( vector3_largest_absolute_component_index( line.direction ) ) switch ( vector3_largest_absolute_component_index( line.direction ) )

2
radiant/winding.h
View File

@ -286,4 +286,6 @@ inline void Winding_printConnectivity( Winding& winding ){
} }
} }
DoubleLine plane3_intersect_plane3( const Plane3& plane, const Plane3& other );
#endif #endif