[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12393] branches/qdune/blender/extern/ qdune: Minor code modification to still allow the standalone version of QD to

[Alfredo de Greef]

Revision: 12393
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12393
Author:   eeshlo
Date:     2007-10-25 20:19:12 +0200 (Thu, 25 Oct 2007)

Log Message:
-----------
Minor code modification to still allow the standalone version of QD to
compile without including the blender specific code.

Modified Paths:
--------------
    branches/qdune/blender/extern/qdune/SConstruct
    branches/qdune/blender/extern/qdune/blender/BlenderShader.cpp

Modified: branches/qdune/blender/extern/qdune/SConstruct
===================================================================
--- branches/qdune/blender/extern/qdune/SConstruct	2007-10-25 16:42:17 UTC (rev 12392)
+++ branches/qdune/blender/extern/qdune/SConstruct	2007-10-25 18:19:12 UTC (rev 12393)
@@ -12,7 +12,7 @@
 # for athlon64 by default, omit-frame-pointer is turned on by default with O3, and fast-math might not produce correct results either
 
 if debug:
-	# for gdb/valgrind, lflags as normal (note: don't use CImg in this case!, will detect lots of leaks in Xwin)
+	# for gdb/valgrind, lflags as normal
 	cppflags  = Split("-Wall -g -O0 -fno-inline -I/usr/X11R6/include `pkg-config --cflags OpenEXR`")
 else:
 	cppflags = Split("-Wall -Wextra -Wno-unused -Wwrite-strings -O3 -march=athlon64 -ffast-math -I/usr/X11R6/include `pkg-config --cflags OpenEXR`")
@@ -28,11 +28,17 @@
 	cppflags.append("-DWITH_CIMG")
 	lflags.extend(Split("-L/usr/X11R6/lib64 -lpthread -lX11 -lXext"))
 
-incfiles = Split("core framebuffer framework hider imgio mpgrid primitives qdtl ribparse svm")
 
+incfiles = Split("blender core framebuffer framework hider imgio mpgrid primitives qdtl ribparse svm")
+
 # main program
 src = ["qdrender.cpp"]
 
+# new blender directory, could omit this, but may be useful to detect possible issues in the (non-blender specific) code
+src += ["blender/BlenderOptions.cpp", "blender/BlenderShader.cpp"]
+# but do omit the real blender specific code (in BlenderShader)
+cppflags.append("-DQDONLY")
+
 # core directory
 src += ["core/Attributes.cpp", "core/Bound.cpp", "core/Camera.cpp", "core/Color.cpp",
         "core/HierarchicalZbuffer.cpp", "core/Mathutil.cpp", "core/Noise.cpp",
@@ -55,7 +61,8 @@
 src += ["mpgrid/MicroPolygon.cpp", "mpgrid/MicroPolygonGrid.cpp"]
 
 # primitives directory
-src += ["primitives/CCSubdivision.cpp", "primitives/Curves.cpp", "primitives/Nurbs.cpp",
+src += ["primitives/ccdata50.cpp",
+        "primitives/CCSubdivision.cpp", "primitives/Curves.cpp", "primitives/Nurbs.cpp",
         "primitives/Parametric.cpp", "primitives/Patches.cpp", "primitives/Points.cpp",
         "primitives/Polygons.cpp", "primitives/Primitive.cpp", "primitives/Quadrics.cpp"]
 

Modified: branches/qdune/blender/extern/qdune/blender/BlenderShader.cpp
===================================================================
--- branches/qdune/blender/extern/qdune/blender/BlenderShader.cpp	2007-10-25 16:42:17 UTC (rev 12392)
+++ branches/qdune/blender/extern/qdune/blender/BlenderShader.cpp	2007-10-25 18:19:12 UTC (rev 12393)
@@ -8,12 +8,14 @@
 
 //#include <iostream>
 
+#ifndef QDONLY
 /* blender includes for structs only, no function calls */
 extern "C" {
 #include "RE_shader_ext.h"
 #include "DNA_material_types.h"
 #include "DNA_scene_types.h"
 }
+#endif
 
 RtBlenderThread *BLENDER_THREAD = NULL; // TODO
 
@@ -32,6 +34,7 @@
 
 RtVoid BlenderShader::run(MicroPolygonGrid* grid, bool displace)
 {
+#ifndef QDONLY
 	Material *mat;
 	RtPoint *P;
 	RtVector *I, *Idu = NULL, *Idv = NULL;
@@ -475,6 +478,7 @@
 			delete [] uv_t_dv[a];
 		}
 	}
+#endif
 }
 
 __END_QDRENDER