Revision: 44801
http://brlcad.svn.sourceforge.net/brlcad/?rev=44801&view=rev
Author: kunigami
Date: 2011-06-07 18:51:59 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
Moved osl-renderer.h from /include to /src/liboptical. there's no need to such
headers to be public
Modified Paths:
--------------
brlcad/trunk/include/CMakeLists.txt
brlcad/trunk/src/liboptical/CMakeLists.txt
brlcad/trunk/src/liboptical/osl-renderer.cpp
brlcad/trunk/src/liboptical/sh_osl.c
Added Paths:
-----------
brlcad/trunk/src/liboptical/osl-renderer.h
Modified: brlcad/trunk/include/CMakeLists.txt
===================================================================
--- brlcad/trunk/include/CMakeLists.txt 2011-06-07 17:33:01 UTC (rev 44800)
+++ brlcad/trunk/include/CMakeLists.txt 2011-06-07 18:51:59 UTC (rev 44801)
@@ -71,12 +71,6 @@
wdb.h
)
-# Just add the osl-renderer.h if we are going to enable OSL
-IF(BRLCAD-ENABLE_OSL)
- SET(brlcadinclude_wanted ${brlcadinclude_wanted} osl-renderer.h)
-ENDIF(BRLCAD-ENABLE_OSL)
-
-
# headers used by multiple packages but still considered private.
# public headers should NOT include these headers.
SET(brlcadnoinst_HEADERS
Modified: brlcad/trunk/src/liboptical/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/liboptical/CMakeLists.txt 2011-06-07 17:33:01 UTC (rev
44800)
+++ brlcad/trunk/src/liboptical/CMakeLists.txt 2011-06-07 18:51:59 UTC (rev
44801)
@@ -60,19 +60,27 @@
# gcc >= 4.3. My poor mac doesn't have that.
add_definitions("-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID -Wno-error
-no-pedantic -DOSL_ENABLED")
- include_directories(${OSL_INCLUDES} ${OPENIMAGEIO_INCLUDES})
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${OSL_INCLUDES}
+ ${OPENIMAGEIO_INCLUDES})
message("Oslexec: ${OSLEXEC_LIBRARY}")
message("Oslcomp: ${OSLCOMP_LIBRARY}")
message("Oslquery: ${OSLQUERY_LIBRARY}")
- set (OSLRT_SOURCES osl-renderer.cpp)
- set (OSLRT_LIBS ${OSLEXEC_LIBRARY}
- ${OSLCOMP_LIBRARY} ${OSLQUERY_LIBRARY} ${OPENIMAGEIO_LIBRARY}
- ${Boost_LIBRARIES})
+ set (OSLRT_SOURCES osl-renderer.cpp render_svc.cpp)
+ #set (OSLRT_LIBS ${OSLEXEC_LIBRARY} ${OSLCOMP_LIBRARY} ${OSLQUERY_LIBRARY}
${OPENIMAGEIO_LIBRARY} ${Boost_LIBRARIES})
- BRLCAD_ADDLIB(osl-renderer ${OSLRT_SOURCES} ${OSLRT_LIBS})
+ message("OSLRT_SOURCES: ${OSLRT_SOURCES}")
+ message("OSLRT_LIBRARIES: ${OSLRT_LIBS}")
+ # BRLCAD_ADDLIB(osl-renderer "${OSLRT_SOURCES}" "${OSLRT_LIBS}")
+
+ BRLCAD_ADDLIB(osl-renderer "${OSLRT_SOURCES}"
"/Users/kunigami/dev/osl/dist/macosx/lib/liboslexec.dylib
/Users/kunigami/dev/osl/dist/macosx/lib/liboslcomp.dylib
/Users/kunigami/dev/osl/dist/macosx/lib/liboslquery.dylib
/Users/kunigami/dev/oiio/dist/macosx/lib/libOpenImageIO.dylib
/opt/local/lib/libboost_filesystem-mt.dylib
/opt/local/lib/libboost_regex-mt.dylib /opt/local/lib/libboost_system-mt.dylib
/opt/local/lib/libboost_thread-mt.dylib")
+
+ #BRLCAD_ADDLIB(osl-renderer "${OSLRT_SOURCES}"
"/Users/kunigami/dev/osl/dist/macosx/lib/liboslexec.dylib;/Users/kunigami/dev/osl/dist/macosx/lib/liboslcomp.dylib;/Users/kunigami/dev/osl/dist/macosx/lib/liboslquery.dylib;/Users/kunigami/dev/oiio/dist/macosx/lib/libOpenImageIO.dylib;/opt/local/lib/libboost_filesystem-mt.dylib;/opt/local/lib/libboost_regex-mt.dylib;/opt/local/lib/libboost_system-mt.dylib;/opt/local/lib/libboost_thread-mt.dylib")
+
##########################################
# OSL Shader
##########################################
Modified: brlcad/trunk/src/liboptical/osl-renderer.cpp
===================================================================
--- brlcad/trunk/src/liboptical/osl-renderer.cpp 2011-06-07 17:33:01 UTC
(rev 44800)
+++ brlcad/trunk/src/liboptical/osl-renderer.cpp 2011-06-07 18:51:59 UTC
(rev 44801)
@@ -1,6 +1,7 @@
#include "osl-renderer.h"
+#include "render_svc.h"
-int Renderer(point_t *p){
+int Renderer2(point_t *p){
(*p)[0] = 0.0;
(*p)[1] = 1.0;
(*p)[2] = 0.0;
Added: brlcad/trunk/src/liboptical/osl-renderer.h
===================================================================
--- brlcad/trunk/src/liboptical/osl-renderer.h (rev 0)
+++ brlcad/trunk/src/liboptical/osl-renderer.h 2011-06-07 18:51:59 UTC (rev
44801)
@@ -0,0 +1,35 @@
+#ifndef OSL_RENDERER_H
+#define OSL_RENDERER_H
+
+#include "vmath.h"
+
+#ifdef __cplusplus
+
+#include "render_svc.h"
+
+/* Class 'OSLRenderer' holds global information about OSL shader system.
+ These information are hidden from the calling C code */
+class OSLRenderer {
+
+
+
+};
+
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+ /* Wrappers for OSLREnderer class methods */
+ int Renderer2(point_t *p);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
+
+#endif
Property changes on: brlcad/trunk/src/liboptical/osl-renderer.h
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: brlcad/trunk/src/liboptical/sh_osl.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_osl.c 2011-06-07 17:33:01 UTC (rev
44800)
+++ brlcad/trunk/src/liboptical/sh_osl.c 2011-06-07 18:51:59 UTC (rev
44801)
@@ -284,7 +284,7 @@
}
*/
- Renderer(swp->sw_color);
+ Renderer2(swp->sw_color);
/* OSL perform shading operations here */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
