Merge the SeExpr editor into the mainline

Merge branch 'editor' Conflicts: src/demos/segraph/CMakeLists.txt
tuttleofx · Nov 24, 2013 · 6875541 · 6875541
2 parents 23b1bb2 + c02b4c5
commit 6875541
Show file tree

Hide file tree

Showing 142 changed files with 16,025 additions and 1,869 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,38 +1,21 @@
-# PARTIO SOFTWARE
-# Copyright 2010 Disney Enterprises, Inc. All rights reserved
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# 
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-# 
-# * The names "Disney", "Walt Disney Pictures", "Walt Disney Animation
-# Studios" or the names of its contributors may NOT be used to
-# endorse or promote products derived from this software without
-# specific prior written permission from Walt Disney Pictures.
-# 
-# Disclaimer: THIS SOFTWARE IS PROVIDED BY WALT DISNEY PICTURES AND
-# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
-# FOR A PARTICULAR PURPOSE, NONINFRINGEMENT AND TITLE ARE DISCLAIMED.
-# IN NO EVENT SHALL WALT DISNEY PICTURES, THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND BASED ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+# Copyright Disney Enterprises, Inc.  All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License
+# and the following modification to it: Section 6 Trademarks.
+# deleted and replaced with:
+#
+# 6. Trademarks. This License does not grant permission to use the
+# trade names, trademarks, service marks, or product names of the
+# Licensor and its affiliates, except as required for reproducing
+# the content of the NOTICE file.
+#
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
 
 ## CMake compatibility issues: don't modify this, please!
-CMAKE_MINIMUM_REQUIRED( VERSION 2.4.6 )
+CMAKE_MINIMUM_REQUIRED( VERSION 2.4.6 ) 
 MARK_AS_ADVANCED(CMAKE_BACKWARDS_COMPATIBILITY)
 ## allow more human readable "if then else" constructs
 SET( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE )
@@ -52,9 +35,12 @@ if(COMMAND cmake_policy)
       cmake_policy(SET CMP0003 NEW)
     endif(COMMAND cmake_policy)
 
+# macros
+include(src/build/macros.cmake)
 
 ## Setup platform specific helper defines build variants
 IF(WIN32)
+  include (GenerateExportHeader)
   ADD_DEFINITIONS (-DSEEXPR_WIN32)
 ELSE(WIN32)
   ADD_DEFINITIONS (-Wall  -Wextra)
@@ -92,14 +78,22 @@ IF (NOT DEFINED CMAKE_INSTALL_PREFIX)
    SET(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/${VARIANT_DIRECTORY}-${FLAVORDIR}")
 ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX)
 
-## Make modules able to see partio library
-# Setup environment variable to link partio
+## Make modules able to see seexpr library
+# Setup environment variable to link seexpr
 SET( SEEXPR_LIBRARIES SeExpr )
-# make it so partio can be found
+SET( SEEXPR_EDITOR_LIBRARIES SeExprEditor )
+# make it so seexpr can be found
 INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/SeExpr )
+INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/SeExprEditor )
+
+# Allowing to use lib64
+IF (NOT DEFINED CMAKE_INSTALL_LIBDIR)
+    SET(CMAKE_INSTALL_LIBDIR "lib")
+ENDIF()
 
 ## Traverse subdirectories
 ADD_SUBDIRECTORY (src/SeExpr)
+ADD_SUBDIRECTORY (src/SeExprEditor)
 ADD_SUBDIRECTORY (src/doc)
 ADD_SUBDIRECTORY (src/demos)
 ADD_SUBDIRECTORY (src/tests)

diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,14 @@
+Copyright Disney Enterprises, Inc.  All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License
+and the following modification to it: Section 6 Trademarks.
+deleted and replaced with:
+
+6. Trademarks. This License does not grant permission to use the
+trade names, trademarks, service marks, or product names of the
+Licensor and its affiliates, except as required for reproducing
+the content of the NOTICE file.
+
+You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
diff --git a/README b/README
@@ -1,5 +1,5 @@
 ===================================================================
-SeExr - An embeddable expression evaluation engine
+SeExpr - An embeddable expression evaluation engine
 ===================================================================
 
 

diff --git a/src/SeExpr/CMakeLists.txt b/src/SeExpr/CMakeLists.txt
@@ -1,94 +1,81 @@
-# SEEXPR SOFTWARE
-# Copyright 2011 Disney Enterprises, Inc. All rights reserved
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# 
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-# 
-# * The names "Disney", "Walt Disney Pictures", "Walt Disney Animation
-# Studios" or the names of its contributors may NOT be used to
-# endorse or promote products derived from this software without
-# specific prior written permission from Walt Disney Pictures.
-# 
-# Disclaimer: THIS SOFTWARE IS PROVIDED BY WALT DISNEY PICTURES AND
-# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-# BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
-# FOR A PARTICULAR PURPOSE, NONINFRINGEMENT AND TITLE ARE DISCLAIMED.
-# IN NO EVENT SHALL WALT DISNEY PICTURES, THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND BASED ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-FILE(GLOB io_cpp "*.cpp")
+# Copyright Disney Enterprises, Inc.  All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License
+# and the following modification to it: Section 6 Trademarks.
+# deleted and replaced with:
+#
+# 6. Trademarks. This License does not grant permission to use the
+# trade names, trademarks, service marks, or product names of the
+# Licensor and its affiliates, except as required for reproducing
+# the content of the NOTICE file.
+#
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
 
-## find our parser generators
-find_program(BISON_EXE bison)
-find_program(FLEX_EXE flex)
-find_program(SED_EXE sed)
+FILE(GLOB io_cpp "*.cpp")
 
-if((BISON_EXE STREQUAL "BISON_EXE-NOTFOUND") OR (FLEX_EXE STREQUAL "FLEX_EXE-NOTFOUND")  OR (SED_EXE STREQUAL "SED_EXE-NOTFOUND"))
-     # don't have flex/bison/sed, use pregenerated versions
-    set (parser_cpp generated/SeExprParser.cpp generated/SeExprParserLex.cpp )
-else ((BISON_EXE STREQUAL "BISON_EXE-NOTFOUND") OR (FLEX_EXE STREQUAL "FLEX_EXE-NOTFOUND")  OR (SED_EXE STREQUAL "SED_EXE-NOTFOUND"))
-     ## build the parser from the flex/yacc sources
 
-    ADD_CUSTOM_COMMAND(
-      SOURCE "SeExprParserLex.l"
-      COMMAND "flex"
-      ARGS "-oSeExprParserLexIn.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/SeExprParserLex.l"
-      OUTPUT SeExprParserLexIn.cpp
-      DEPENDS SeExprParserLex.l
-    )
-
-    ADD_CUSTOM_COMMAND(
-      SOURCE "SeExprParserLexIn.cpp"
-      COMMAND "sed"
+## find our parser generators
+#find_program(BISON_EXE bison)
+#find_program(FLEX_EXE flex)
+#find_program(SED_EXE sed)
+#
+#if((BISON_EXE STREQUAL "BISON_EXE-NOTFOUND") OR (FLEX_EXE STREQUAL "FLEX_EXE-NOTFOUND")  OR (SED_EXE STREQUAL "SED_EXE-NOTFOUND"))
+#     # don't have flex/bison/sed, use pregenerated versions
+#    set (parser_cpp generated/SeExprParser.cpp generated/SeExprParserLex.cpp )
+#else ((BISON_EXE STREQUAL "BISON_EXE-NOTFOUND") OR (FLEX_EXE STREQUAL "FLEX_EXE-NOTFOUND")  OR (SED_EXE STREQUAL "SED_EXE-NOTFOUND"))
+#     ## build the parser from the flex/yacc sources
+#
+#    ADD_CUSTOM_COMMAND(
+#      SOURCE "SeExprParserLex.l"
+#      COMMAND "flex"
+#      ARGS "-oSeExprParserLexIn.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/SeExprParserLex.l"
+#      OUTPUT SeExprParserLexIn.cpp
+#      DEPENDS SeExprParserLex.l
+#    )
+#    
+#    ADD_CUSTOM_COMMAND(
+#      SOURCE "SeExprParserLexIn.cpp"
+#      COMMAND "sed"
+##      ARGS -e "'s/SeExprwrap(n)/SeExprwrap()/g'" -e "'s/yy/SeExpr/g'" -e "'s/YY/SeExprYY/g'"  SeExprParserLexIn.cpp | tee SeExprParserLex.cpp ${CMAKE_CURRENT_SOURCE_DIR}/generated/SeExprParserLex.cpp > /dev/null
 #      ARGS -e "'s/SeExprwrap(n)/SeExprwrap()/g'" -e "'s/yy/SeExpr/g'" -e "'s/YY/SeExprYY/g'"  SeExprParserLexIn.cpp | tee SeExprParserLex.cpp ${CMAKE_CURRENT_SOURCE_DIR}/generated/SeExprParserLex.cpp > /dev/null
-      ARGS -e "'s/SeExprwrap(n)/SeExprwrap()/g'" -e "'s/yy/SeExpr/g'" -e "'s/YY/SeExprYY/g'"  SeExprParserLexIn.cpp | tee SeExprParserLex.cpp ${CMAKE_CURRENT_SOURCE_DIR}/generated/SeExprParserLex.cpp > /dev/null
-      OUTPUT SeExprParserLex.cpp
-      DEPENDS SeExprParserLexIn.cpp
-    )
-
-    ADD_CUSTOM_COMMAND(
-      SOURCE "SeExprParser.y"
-      COMMAND "bison"
-      ARGS "--defines" "--verbose" "--fixed-output-files" "-p" "SeExpr" "${CMAKE_CURRENT_SOURCE_DIR}/SeExprParser.y"
-      OUTPUT y.tab.c y.tab.h
-      DEPENDS SeExprParser.y
-    )
-
-    ADD_CUSTOM_COMMAND(
-      SOURCE "y.tab.h"
-      COMMAND "sed"
-      ARGS -e "'s/yy/SeExpr/g'" -e "'s/YY/SeExprYY/g'" y.tab.h | tee  SeExprParser.tab.h ${CMAKE_CURRENT_SOURCE_DIR}/generated/SeExprParser.tab.h > /dev/null
-      OUTPUT SeExprParser.tab.h
-      DEPENDS y.tab.h
-    )
-
-    ADD_CUSTOM_COMMAND(
-      SOURCE "y.tab.c"
-      COMMAND "sed"
-      ARGS -e "'s/yy/SeExpr/g'" -e "'s/YY/SeExprYY/g'" y.tab.c | tee SeExprParser.cpp  "${CMAKE_CURRENT_SOURCE_DIR}/generated/SeExprParser.cpp" > /dev/null
-      OUTPUT SeExprParser.cpp
-      DEPENDS y.tab.c SeExprParser.tab.h
-    )
+#      OUTPUT SeExprParserLex.cpp
+#      DEPENDS SeExprParserLexIn.cpp
+#    )
+#    
+#    ADD_CUSTOM_COMMAND(
+#      SOURCE "SeExprParser.y"
+#      COMMAND "bison"
+#      ARGS "--defines" "--verbose" "--fixed-output-files" "-p" "SeExpr" "${CMAKE_CURRENT_SOURCE_DIR}/SeExprParser.y"
+#      OUTPUT y.tab.c y.tab.h
+#      DEPENDS SeExprParser.y
+#    )
+#    
+#    ADD_CUSTOM_COMMAND(
+#      SOURCE "y.tab.h"
+#      COMMAND "sed"
+#      ARGS -e "'s/yy/SeExpr/g'" -e "'s/YY/SeExprYY/g'" y.tab.h | tee  SeExprParser.tab.h ${CMAKE_CURRENT_SOURCE_DIR}/generated/SeExprParser.tab.h > /dev/null
+#      OUTPUT SeExprParser.tab.h
+#      DEPENDS y.tab.h
+#    )
+#    
+#    ADD_CUSTOM_COMMAND(
+#      SOURCE "y.tab.c"
+#      COMMAND "sed"
+#      ARGS -e "'s/yy/SeExpr/g'" -e "'s/YY/SeExprYY/g'" y.tab.c | tee SeExprParser.cpp  "${CMAKE_CURRENT_SOURCE_DIR}/generated/SeExprParser.cpp" > /dev/null
+#      OUTPUT SeExprParser.cpp
+#      DEPENDS y.tab.c SeExprParser.tab.h
+#    )
+#
+#    ## set build files
+#    set (parser_cpp SeExprParser.cpp SeExprParserLex.cpp )
+#
+#endif( (BISON_EXE STREQUAL "BISON_EXE-NOTFOUND") OR (FLEX_EXE STREQUAL "FLEX_EXE-NOTFOUND")  OR (SED_EXE STREQUAL "SED_EXE-NOTFOUND"))
 
-    ## set build files
-    set (parser_cpp SeExprParser.cpp SeExprParserLex.cpp )
+BuildParserScanner(SeExprParserLex SeExprParser SeExpr parser_cpp)
 
-endif( (BISON_EXE STREQUAL "BISON_EXE-NOTFOUND") OR (FLEX_EXE STREQUAL "FLEX_EXE-NOTFOUND")  OR (SED_EXE STREQUAL "SED_EXE-NOTFOUND"))
 
 ## Make the SeExpr library
 ADD_LIBRARY (SeExpr SHARED ${io_cpp} ${core_cpp} ${parser_cpp})
@@ -102,8 +89,5 @@ IF(NOT WIN32)
 ENDIF(NOT WIN32)
 ## Install binary and includes
 FILE(GLOB public_includes "*.h")
-IF (NOT DEFINED CMAKE_INSTALL_LIBDIR)
-    SET(CMAKE_INSTALL_LIBDIR "lib")
-ENDIF (NOT DEFINED CMAKE_INSTALL_LIBDIR)
 INSTALL (TARGETS SeExpr SeExpr-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
 INSTALL (FILES ${public_includes} DESTINATION include)
diff --git a/src/SeExpr/SeCurve.cpp b/src/SeExpr/SeCurve.cpp
@@ -1,36 +1,18 @@
 /*
- SEEXPR SOFTWARE
- Copyright 2011 Disney Enterprises, Inc. All rights reserved
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- 
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
- 
- * The names "Disney", "Walt Disney Pictures", "Walt Disney Animation
- Studios" or the names of its contributors may NOT be used to
- endorse or promote products derived from this software without
- specific prior written permission from Walt Disney Pictures.
- 
- Disclaimer: THIS SOFTWARE IS PROVIDED BY WALT DISNEY PICTURES AND
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
- FOR A PARTICULAR PURPOSE, NONINFRINGEMENT AND TITLE ARE DISCLAIMED.
- IN NO EVENT SHALL WALT DISNEY PICTURES, THE COPYRIGHT HOLDER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND BASED ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+* Copyright Disney Enterprises, Inc.  All rights reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License
+* and the following modification to it: Section 6 Trademarks.
+* deleted and replaced with:
+*
+* 6. Trademarks. This License does not grant permission to use the
+* trade names, trademarks, service marks, or product names of the
+* Licensor and its affiliates, except as required for reproducing
+* the content of the NOTICE file.
+*
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
 */
 #include "SeExpression.h"
 #include "SeExprBuiltins.h"

diff --git a/src/SeExpr/SeCurve.h b/src/SeExpr/SeCurve.h
@@ -1,36 +1,18 @@
 /*
- SEEXPR SOFTWARE
- Copyright 2011 Disney Enterprises, Inc. All rights reserved
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- 
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
- 
- * The names "Disney", "Walt Disney Pictures", "Walt Disney Animation
- Studios" or the names of its contributors may NOT be used to
- endorse or promote products derived from this software without
- specific prior written permission from Walt Disney Pictures.
- 
- Disclaimer: THIS SOFTWARE IS PROVIDED BY WALT DISNEY PICTURES AND
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
- FOR A PARTICULAR PURPOSE, NONINFRINGEMENT AND TITLE ARE DISCLAIMED.
- IN NO EVENT SHALL WALT DISNEY PICTURES, THE COPYRIGHT HOLDER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND BASED ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+* Copyright Disney Enterprises, Inc.  All rights reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License
+* and the following modification to it: Section 6 Trademarks.
+* deleted and replaced with:
+*
+* 6. Trademarks. This License does not grant permission to use the
+* trade names, trademarks, service marks, or product names of the
+* Licensor and its affiliates, except as required for reproducing
+* the content of the NOTICE file.
+*
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
 */
 #ifndef _CurveData_h_
 #define _CurveData_h_