Remove get_ prefix from accessors

This commit is contained in:
Layl 2019-05-12 20:53:14 +02:00
parent 1edb5486ca
commit f9a5d92eab
3 changed files with 18 additions and 18 deletions

View File

@ -20,23 +20,23 @@ fn vertex(mesh: &Mesh, face: usize, vert: usize) -> &Vertex {
}
impl mikktspace::Geometry for Mesh {
fn get_num_faces(&self) -> usize {
fn num_faces(&self) -> usize {
self.faces.len()
}
fn get_num_vertices_of_face(&self, _face: usize) -> usize {
fn num_vertices_of_face(&self, _face: usize) -> usize {
3
}
fn get_position(&self, face: usize, vert: usize) -> Point3<f32> {
fn position(&self, face: usize, vert: usize) -> Point3<f32> {
vertex(self, face, vert).position
}
fn get_normal(&self, face: usize, vert: usize) -> Vector3<f32> {
fn normal(&self, face: usize, vert: usize) -> Vector3<f32> {
vertex(self, face, vert).normal
}
fn get_tex_coord(&self, face: usize, vert: usize) -> Point2<f32> {
fn tex_coord(&self, face: usize, vert: usize) -> Point2<f32> {
vertex(self, face, vert).tex_coord
}

View File

@ -179,14 +179,14 @@ pub unsafe fn genTangSpace<I: Geometry>(
let mut iNrMaxGroups = 0;
let mut iNrActiveGroups: i32 = 0i32;
let mut index = 0;
let iNrFaces = geometry.get_num_faces();
let iNrFaces = geometry.num_faces();
let mut bRes: bool = false;
let fThresCos: f32 = ((fAngularThreshold * 3.14159265358979323846f64 as f32
/ 180.0f32) as f64)
.cos() as f32;
f = 0;
while f < iNrFaces {
let verts = geometry.get_num_vertices_of_face(f);
let verts = geometry.num_vertices_of_face(f);
if verts == 3 {
iNrTrianglesIn += 1
} else if verts == 4 {
@ -284,7 +284,7 @@ pub unsafe fn genTangSpace<I: Geometry>(
index = 0;
f = 0;
while f < iNrFaces {
let verts_0 = geometry.get_num_vertices_of_face(f);
let verts_0 = geometry.num_vertices_of_face(f);
if !(verts_0 != 3 && verts_0 != 4) {
i = 0;
while i < verts_0 {
@ -1697,8 +1697,8 @@ unsafe fn GenerateInitialVerticesIndexList<I: Geometry>(
let mut t: usize = 0;
let mut iDstTriIndex = 0;
f = 0;
while f < geometry.get_num_faces() {
let verts = geometry.get_num_vertices_of_face(f);
while f < geometry.num_faces() {
let verts = geometry.num_vertices_of_face(f);
if !(verts != 3 && verts != 4) {
pTriInfos[iDstTriIndex].iOrgFaceNumber = f as i32;
pTriInfos[iDstTriIndex].iTSpacesOffs = iTSpacesOffs as i32;

View File

@ -5,19 +5,19 @@ use nalgebra::{Point2, Point3, Vector3, Vector4};
/// The interface by which mikktspace interacts with your geometry.
pub trait Geometry {
/// Returns the number of faces.
fn get_num_faces(&self) -> usize;
fn num_faces(&self) -> usize;
/// Returns the number of vertices of a face.
fn get_num_vertices_of_face(&self, face: usize) -> usize;
fn num_vertices_of_face(&self, face: usize) -> usize;
/// Returns the position of a vertex.
fn get_position(&self, face: usize, vert: usize) -> Point3<f32>;
fn position(&self, face: usize, vert: usize) -> Point3<f32>;
/// Returns the normal of a vertex.
fn get_normal(&self, face: usize, vert: usize) -> Vector3<f32>;
fn normal(&self, face: usize, vert: usize) -> Vector3<f32>;
/// Returns the texture coordinate of a vertex.
fn get_tex_coord(&self, face: usize, vert: usize) -> Point2<f32>;
fn tex_coord(&self, face: usize, vert: usize) -> Point2<f32>;
/// Sets a vertex' generated tangent.
fn set_tangent(
@ -51,17 +51,17 @@ pub fn generate_tangents_default<I: Geometry>(geometry: &mut I) -> bool {
fn get_position<I: Geometry>(geometry: &mut I, index: usize) -> Vector3<f32> {
let (face, vert) = index_to_face_vert(index);
geometry.get_position(face, vert).coords
geometry.position(face, vert).coords
}
fn get_tex_coord<I: Geometry>(geometry: &mut I, index: usize) -> Vector3<f32> {
let (face, vert) = index_to_face_vert(index);
geometry.get_tex_coord(face, vert).coords.insert_row(2, 1.0)
geometry.tex_coord(face, vert).coords.insert_row(2, 1.0)
}
fn get_normal<I: Geometry>(geometry: &mut I, index: usize) -> Vector3<f32> {
let (face, vert) = index_to_face_vert(index);
geometry.get_normal(face, vert)
geometry.normal(face, vert)
}
fn index_to_face_vert(index: usize) -> (usize, usize) {