From 2d08c0518c474c28ff409d1fd3e5344f16a80aa3 Mon Sep 17 00:00:00 2001 From: Christophe Mateos Date: Mon, 19 Dec 2016 23:45:54 +0100 Subject: [PATCH] PicoModel Backport: Fixed compilation. --- libs/picomodel.h | 1 + libs/picomodel/picomodel.vcxproj | 1 + libs/picomodel/picomodel.vcxproj.filters | 3 +++ libs/picomodel/pm_lwo.c | 4 ++-- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libs/picomodel.h b/libs/picomodel.h index f33c6da6..23cda9bd 100644 --- a/libs/picomodel.h +++ b/libs/picomodel.h @@ -267,6 +267,7 @@ void PicoSetSurfaceIndex( picoSurface_t *surface, int num void PicoSetSurfaceIndexes( picoSurface_t *surface, int num, picoIndex_t *index, int count ); void PicoSetFaceNormal( picoSurface_t *surface, int num, picoVec3_t normal ); void PicoSetSurfaceSpecial( picoSurface_t *surface, int num, int special ); +void PicoSetSurfaceSmoothingGroup( picoSurface_t *surface, int num, picoIndex_t smoothingGroup ); /* getter functions */ diff --git a/libs/picomodel/picomodel.vcxproj b/libs/picomodel/picomodel.vcxproj index f5c872a5..2faa101c 100644 --- a/libs/picomodel/picomodel.vcxproj +++ b/libs/picomodel/picomodel.vcxproj @@ -147,6 +147,7 @@ + diff --git a/libs/picomodel/picomodel.vcxproj.filters b/libs/picomodel/picomodel.vcxproj.filters index 2760cddb..d22ec524 100644 --- a/libs/picomodel/picomodel.vcxproj.filters +++ b/libs/picomodel/picomodel.vcxproj.filters @@ -77,5 +77,8 @@ src\lwo + + src + \ No newline at end of file diff --git a/libs/picomodel/pm_lwo.c b/libs/picomodel/pm_lwo.c index 5b4f2d60..dfb64c6e 100644 --- a/libs/picomodel/pm_lwo.c +++ b/libs/picomodel/pm_lwo.c @@ -285,8 +285,8 @@ static picoModel_t *_lwo_load( PM_PARAMS_LOAD ){ ///* doom3 lwo data doesn't seem to have smoothing-angle information */ //#if 0 -// if ( surface->smooth <= 0 ) { -// /* use face normals */ + if ( surface->smooth <= 0 ) { + /* use face normals */ normal[ 0 ] = v->norm[ 0 ]; normal[ 1 ] = v->norm[ 2 ]; normal[ 2 ] = v->norm[ 1 ];