[Bf-blender-cvs] [8d92407] cycles-ptex-06: Import ptex-2.0.42 into extern/ptex

Nicholas Bishop noreply at git.blender.org
Fri Jan 16 12:54:32 CET 2015


Commit: 8d92407d6f0adfa30160526be61d2f3f18ced45d
Author: Nicholas Bishop
Date:   Fri Jan 16 12:03:49 2015 +0100
Branches: cycles-ptex-06
https://developer.blender.org/rB8d92407d6f0adfa30160526be61d2f3f18ced45d

Import ptex-2.0.42 into extern/ptex

===================================================================

A	extern/ptex/README
A	extern/ptex/src/CMakeLists.txt
A	extern/ptex/src/Makefile
A	extern/ptex/src/doc/CMakeLists.txt
A	extern/ptex/src/doc/Doxyfile
A	extern/ptex/src/doc/Doxyfile_API_only
A	extern/ptex/src/doc/FilterFootprint.html
A	extern/ptex/src/doc/License.txt
A	extern/ptex/src/doc/Makefile
A	extern/ptex/src/doc/README
A	extern/ptex/src/doc/apiintro.txt
A	extern/ptex/src/doc/main.txt
A	extern/ptex/src/doc/uvellipse.png
A	extern/ptex/src/ptex/CMakeLists.txt
A	extern/ptex/src/ptex/Makefile
A	extern/ptex/src/ptex/Makefile.deps
A	extern/ptex/src/ptex/PtexCache.cpp
A	extern/ptex/src/ptex/PtexCache.h
A	extern/ptex/src/ptex/PtexDict.h
A	extern/ptex/src/ptex/PtexFilters.cpp
A	extern/ptex/src/ptex/PtexHalf.cpp
A	extern/ptex/src/ptex/PtexHalf.h
A	extern/ptex/src/ptex/PtexHashMap.h
A	extern/ptex/src/ptex/PtexIO.h
A	extern/ptex/src/ptex/PtexInt.h
A	extern/ptex/src/ptex/PtexMutex.h
A	extern/ptex/src/ptex/PtexPlatform.h
A	extern/ptex/src/ptex/PtexReader.cpp
A	extern/ptex/src/ptex/PtexReader.h
A	extern/ptex/src/ptex/PtexSeparableFilter.cpp
A	extern/ptex/src/ptex/PtexSeparableFilter.h
A	extern/ptex/src/ptex/PtexSeparableKernel.cpp
A	extern/ptex/src/ptex/PtexSeparableKernel.h
A	extern/ptex/src/ptex/PtexTriangleFilter.cpp
A	extern/ptex/src/ptex/PtexTriangleFilter.h
A	extern/ptex/src/ptex/PtexTriangleKernel.cpp
A	extern/ptex/src/ptex/PtexTriangleKernel.h
A	extern/ptex/src/ptex/PtexUtils.cpp
A	extern/ptex/src/ptex/PtexUtils.h
A	extern/ptex/src/ptex/PtexWriter.cpp
A	extern/ptex/src/ptex/PtexWriter.h
A	extern/ptex/src/ptex/Ptexture.h
A	extern/ptex/src/tests/CMakeLists.txt
A	extern/ptex/src/tests/Makefile
A	extern/ptex/src/tests/compare_test.cmake
A	extern/ptex/src/tests/ftest.cpp
A	extern/ptex/src/tests/ftestok.dat
A	extern/ptex/src/tests/halftest.cpp
A	extern/ptex/src/tests/rtest.cpp
A	extern/ptex/src/tests/rtestok.dat
A	extern/ptex/src/tests/run_tests.py
A	extern/ptex/src/tests/wtest.cpp
A	extern/ptex/src/utils/CMakeLists.txt
A	extern/ptex/src/utils/Makefile
A	extern/ptex/src/utils/ptxinfo.cpp

===================================================================

diff --git a/extern/ptex/README b/extern/ptex/README
new file mode 100644
index 0000000..0ef2645
--- /dev/null
+++ b/extern/ptex/README
@@ -0,0 +1,30 @@
+Building with make (Linux):
+> cd src
+> make
+
+This will build, install to a local 'install' directory, and
+run regression tests.
+
+Contents of install directory:
+install/bin:
+ptxinfo
+
+install/include:
+PtexHalf.h  PtexInt.h  Ptexture.h  PtexUtils.h
+
+install/lib:
+libPtex.a  libPtex.so
+
+
+
+Building with cmake:
+mkdir build
+cd build
+cmake ../src
+make
+make test
+make install
+make doc
+
+Note: docs will be generated into local 'install' directory.
+(TODO: generate in build directory.)
\ No newline at end of file
diff --git a/extern/ptex/src/CMakeLists.txt b/extern/ptex/src/CMakeLists.txt
new file mode 100644
index 0000000..68bc391
--- /dev/null
+++ b/extern/ptex/src/CMakeLists.txt
@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 2.8)
+project(ptex)
+
+# enable testing for the project
+include(CTest)
+enable_testing()
+
+include(FindZLIB)
+include(FindThreads)
+
+include_directories(ptex)
+include_directories(${ZLIB_INCLUDE_DIR})
+
+add_subdirectory(ptex)
+add_subdirectory(utils)
+add_subdirectory(tests)
+add_subdirectory(doc)
diff --git a/extern/ptex/src/Makefile b/extern/ptex/src/Makefile
new file mode 100644
index 0000000..e4936ac
--- /dev/null
+++ b/extern/ptex/src/Makefile
@@ -0,0 +1,15 @@
+SUBDIRS = ptex utils tests
+INSTALLDIR = ../../install
+LIBDIR = lib
+
+.PHONY: subdirs $(SUBDIRS)
+
+subdirs: $(SUBDIRS)
+
+clean:
+	for s in $(SUBDIRS); do \
+		$(MAKE) -C $$s clean; \
+	done
+
+$(SUBDIRS):
+	$(MAKE) -C $@ INSTALLDIR=$(INSTALLDIR) LIBDIR=$(LIBDIR)
diff --git a/extern/ptex/src/doc/CMakeLists.txt b/extern/ptex/src/doc/CMakeLists.txt
new file mode 100644
index 0000000..b66b499
--- /dev/null
+++ b/extern/ptex/src/doc/CMakeLists.txt
@@ -0,0 +1,13 @@
+find_package ( Doxygen )
+
+file ( MAKE_DIRECTORY ${CMAKE_SOURCE_DIR}/../install/doc)
+
+if (DOXYGEN_FOUND)
+  set (generated_doc_location ${CMAKE_SOURCE_DIR}/../install/doc/ptex/)
+  set (doxyfile_location ${CMAKE_SOURCE_DIR}/doc/)
+  set (perm OWNER_READ GROUP_READ WORLD_READ)
+  add_custom_target (doc
+      ${DOXYGEN_EXECUTABLE} ${doxyfile_location}/Doxyfile
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/doc
+    )
+endif (DOXYGEN_FOUND)
diff --git a/extern/ptex/src/doc/Doxyfile b/extern/ptex/src/doc/Doxyfile
new file mode 100644
index 0000000..8b8ca11
--- /dev/null
+++ b/extern/ptex/src/doc/Doxyfile
@@ -0,0 +1,1287 @@
+# Doxyfile 1.5.2-4
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file that 
+# follow. The default is UTF-8 which is also the encoding used for all text before 
+# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into 
+# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of 
+# possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = Ptex
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
+# This could be handy for archiving the generated documentation or 
+# if some version control system is used.
+
+PROJECT_NUMBER         = 
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+# base path where the generated documentation will be put. 
+# If a relative path is entered, it will be relative to the location 
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = ../../install/doc
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of 
+# source files, where putting all generated files in the same directory would 
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+# documentation generated by doxygen is written. Doxygen will use this 
+# information to generate all constant output in the proper language. 
+# The default language is English, other supported languages are: 
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
+# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, 
+# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, 
+# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, 
+# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+# include brief member descriptions after the members that are listed in 
+# the file and class documentation (similar to JavaDoc). 
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
+# the brief description of a member or function before the detailed description. 
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator 
+# that is used to form the text in various listings. Each string 
+# in this list, if found as the leading text of the brief description, will be 
+# stripped from the text and the result after processing the whole list, is 
+# used as the annotated text. Otherwise, the brief description is used as-is. 
+# If left blank, the following values are used ("$name" is automatically 
+# replaced with the name of the entity): "The $name class" "The $name widget" 
+# "The $name file" "is" "provides" "specifies" "contains" 
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       = 
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
+# Doxygen will generate a detailed section even if there is only a brief 
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
+# inherited members of a class in the documentation of that class as if those 
+# members were ordinary class members. Constructors, destructors and assignment 
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
+# path before files name in the file list and in the header files. If set 
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
+# can be used to strip a user-defined part of the path. Stripping is 
+# only done if one of the specified strings matches the left-hand part of 
+# the path. The tag can be used to show relative paths in the file list. 
+# If left blank the directory from which doxygen is run is used as the 
+# path to strip.
+
+STRIP_FROM_PATH        = 
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
+# (but less readable) file names. This can be useful is your file systems 
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+# will interpret the first line (until the first dot) of a JavaDoc-style 
+# comment as the brief description. If set to NO, the JavaDoc 
+# comments will behave just like regular Qt-style comments 
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF      = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
+# interpret the first line (until the first dot) of a Qt-style 
+# comment as the brief description. If set to NO, the comments 
+# will behave just like regular Qt-style comments (thus requiring 
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
+# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
+# comments) as a brief description. This used to be the default behaviour. 
+# The new default is to treat a multi-line C++ comment block as a detailed 
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
+# will output the detailed description near the top, like JavaDoc.
+# If set to NO, the detailed description appears after the member 
+# documentation.
+
+DETAILS_AT_TOP         = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
+# member inherits the documentation from any documented member that it 
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
+# a new page for each member. If set to NO, the docume

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list