Skip to content
Snippets Groups Projects
Commit 3ce233e2 authored by Nathan Letwory's avatar Nathan Letwory
Browse files

Move mikktspace code to own library, so it is clear that it is also

intended as a standalone library for use in other applications that
want the same tangent space as Blender.

This also keeps blenkernel clean(er) from extra math functions.
parent be8c8942
No related branches found
No related tags found
No related merge requests found
...@@ -33,6 +33,7 @@ add_subdirectory(memutil) ...@@ -33,6 +33,7 @@ add_subdirectory(memutil)
add_subdirectory(iksolver) add_subdirectory(iksolver)
add_subdirectory(opennl) add_subdirectory(opennl)
add_subdirectory(smoke) add_subdirectory(smoke)
add_subdirectory(mikktspace)
if(WITH_MOD_FLUID) if(WITH_MOD_FLUID)
add_subdirectory(elbeem) add_subdirectory(elbeem)
......
...@@ -13,6 +13,7 @@ SConscript(['audaspace/SConscript', ...@@ -13,6 +13,7 @@ SConscript(['audaspace/SConscript',
'itasc/SConscript', 'itasc/SConscript',
'boolop/SConscript', 'boolop/SConscript',
'opennl/SConscript', 'opennl/SConscript',
'mikktspace/SConscript',
'smoke/SConscript']) 'smoke/SConscript'])
# NEW_CSG was intended for intern/csg, but # NEW_CSG was intended for intern/csg, but
......
# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# The Original Code is Copyright (C) 2006, Blender Foundation
# All rights reserved.
#
# The Original Code is: all of this file.
#
# Contributor(s): Daniel Genrich
#
# ***** END GPL LICENSE BLOCK *****
set(INC
.
)
set(SRC
mikktspace.c
)
blender_add_lib(bf_intern_mikktspace "${SRC}" "${INC}")
#!/usr/bin/python
Import ('env')
sources = ['mikktspace.c']
incs = ''
defs = ''
env.BlenderLib ('bf_intern_mikktspace', sources, Split(incs), Split(defs), libtype=['intern'], priority=[100] )
...@@ -48,6 +48,7 @@ set(INC ...@@ -48,6 +48,7 @@ set(INC
../../../intern/memutil ../../../intern/memutil
../../../intern/opennl/extern ../../../intern/opennl/extern
../../../intern/smoke/extern ../../../intern/smoke/extern
../../../intern/mikktspace
../../../source/blender/windowmanager # XXX - BAD LEVEL CALL WM_api.h ../../../source/blender/windowmanager # XXX - BAD LEVEL CALL WM_api.h
${ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}
) )
...@@ -106,7 +107,6 @@ set(SRC ...@@ -106,7 +107,6 @@ set(SRC
intern/mball.c intern/mball.c
intern/mesh.c intern/mesh.c
intern/mesh_validate.c intern/mesh_validate.c
intern/mikktspace.c
intern/modifier.c intern/modifier.c
intern/multires.c intern/multires.c
intern/nla.c intern/nla.c
...@@ -223,7 +223,6 @@ set(SRC ...@@ -223,7 +223,6 @@ set(SRC
BKE_writeffmpeg.h BKE_writeffmpeg.h
BKE_writeframeserver.h BKE_writeframeserver.h
depsgraph_private.h depsgraph_private.h
mikktspace.h
intern/CCGSubSurf.h intern/CCGSubSurf.h
intern/bmesh_private.h intern/bmesh_private.h
nla_private.h nla_private.h
......
...@@ -12,6 +12,7 @@ incs += ' #/extern/bullet2/src' ...@@ -12,6 +12,7 @@ incs += ' #/extern/bullet2/src'
incs += ' #/intern/opennl/extern #/intern/bsp/extern' incs += ' #/intern/opennl/extern #/intern/bsp/extern'
incs += ' ../gpu #/extern/glew/include' incs += ' ../gpu #/extern/glew/include'
incs += ' #/intern/smoke/extern' incs += ' #/intern/smoke/extern'
incs += ' #/intern/mikktspace'
incs += ' #/intern/audaspace/intern' incs += ' #/intern/audaspace/intern'
incs += ' ' + env['BF_OPENGL_INC'] incs += ' ' + env['BF_OPENGL_INC']
......
...@@ -38,6 +38,7 @@ set(INC ...@@ -38,6 +38,7 @@ set(INC
../imbuf ../imbuf
../../kernel/gen_messaging ../../kernel/gen_messaging
../../../intern/smoke/extern ../../../intern/smoke/extern
../../../intern/mikktspace
../../../intern/guardedalloc ../../../intern/guardedalloc
) )
......
...@@ -6,7 +6,7 @@ raysources = env.Glob('intern/raytrace/*.cpp') ...@@ -6,7 +6,7 @@ raysources = env.Glob('intern/raytrace/*.cpp')
incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna ../makesrna' incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna ../makesrna'
incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf' incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf'
incs += ' ../include ../blenloader ../../../intern/smoke/extern' incs += ' ../include ../blenloader ../../../intern/smoke/extern ../../../intern/mikktspace'
cflags_raytrace = env['CCFLAGS'] cflags_raytrace = env['CCFLAGS']
cxxflags_raytrace = env['CXXFLAGS'] cxxflags_raytrace = env['CXXFLAGS']
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment