[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22064] branches/blender2.5/blender: SVN maintenance.
gsr b3d
gsr.b3d at infernal-iceberg.com
Thu Jul 30 20:39:23 CEST 2009
Revision: 22064
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22064
Author: gsrb3d
Date: 2009-07-30 20:39:22 +0200 (Thu, 30 Jul 2009)
Log Message:
-----------
SVN maintenance.
Modified Paths:
--------------
branches/blender2.5/blender/intern/smoke/CMakeLists.txt
branches/blender2.5/blender/intern/smoke/Makefile
branches/blender2.5/blender/intern/smoke/extern/smoke_API.h
branches/blender2.5/blender/intern/smoke/intern/EIGENVALUE_HELPER.h
branches/blender2.5/blender/intern/smoke/intern/FFT_NOISE.h
branches/blender2.5/blender/intern/smoke/intern/FLUID_3D.cpp
branches/blender2.5/blender/intern/smoke/intern/FLUID_3D.h
branches/blender2.5/blender/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
branches/blender2.5/blender/intern/smoke/intern/FLUID_3D_STATIC.cpp
branches/blender2.5/blender/intern/smoke/intern/IMAGE.h
branches/blender2.5/blender/intern/smoke/intern/INTERPOLATE.h
branches/blender2.5/blender/intern/smoke/intern/LICENSE.txt
branches/blender2.5/blender/intern/smoke/intern/LU_HELPER.h
branches/blender2.5/blender/intern/smoke/intern/MERSENNETWISTER.h
branches/blender2.5/blender/intern/smoke/intern/Makefile
branches/blender2.5/blender/intern/smoke/intern/OBSTACLE.h
branches/blender2.5/blender/intern/smoke/intern/SPHERE.cpp
branches/blender2.5/blender/intern/smoke/intern/SPHERE.h
branches/blender2.5/blender/intern/smoke/intern/VEC3.h
branches/blender2.5/blender/intern/smoke/intern/WAVELET_NOISE.h
branches/blender2.5/blender/intern/smoke/intern/WTURBULENCE.cpp
branches/blender2.5/blender/intern/smoke/intern/WTURBULENCE.h
branches/blender2.5/blender/intern/smoke/intern/smoke_API.cpp
branches/blender2.5/blender/intern/smoke/intern/tnt/jama_eig.h
branches/blender2.5/blender/intern/smoke/intern/tnt/jama_lu.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_array1d.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_array1d_utils.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_array2d.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_array2d_utils.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_array3d.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_array3d_utils.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_cmat.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_fortran_array1d.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_fortran_array1d_utils.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_fortran_array2d.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_fortran_array2d_utils.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_fortran_array3d.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_fortran_array3d_utils.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_i_refvec.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_math_utils.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_sparse_matrix_csr.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_stopwatch.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_subscript.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_vec.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_version.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_smoke.h
branches/blender2.5/blender/source/blender/blenkernel/intern/smoke.c
branches/blender2.5/blender/source/blender/makesdna/DNA_smoke_types.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_smoke.c
Property Changed:
----------------
branches/blender2.5/blender/intern/smoke/CMakeLists.txt
branches/blender2.5/blender/intern/smoke/Makefile
branches/blender2.5/blender/intern/smoke/extern/smoke_API.h
branches/blender2.5/blender/intern/smoke/intern/EIGENVALUE_HELPER.h
branches/blender2.5/blender/intern/smoke/intern/FFT_NOISE.h
branches/blender2.5/blender/intern/smoke/intern/FLUID_3D.cpp
branches/blender2.5/blender/intern/smoke/intern/FLUID_3D.h
branches/blender2.5/blender/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
branches/blender2.5/blender/intern/smoke/intern/FLUID_3D_STATIC.cpp
branches/blender2.5/blender/intern/smoke/intern/IMAGE.h
branches/blender2.5/blender/intern/smoke/intern/INTERPOLATE.h
branches/blender2.5/blender/intern/smoke/intern/LICENSE.txt
branches/blender2.5/blender/intern/smoke/intern/LU_HELPER.h
branches/blender2.5/blender/intern/smoke/intern/MERSENNETWISTER.h
branches/blender2.5/blender/intern/smoke/intern/Makefile
branches/blender2.5/blender/intern/smoke/intern/OBSTACLE.h
branches/blender2.5/blender/intern/smoke/intern/SPHERE.cpp
branches/blender2.5/blender/intern/smoke/intern/SPHERE.h
branches/blender2.5/blender/intern/smoke/intern/VEC3.h
branches/blender2.5/blender/intern/smoke/intern/WAVELET_NOISE.h
branches/blender2.5/blender/intern/smoke/intern/WTURBULENCE.cpp
branches/blender2.5/blender/intern/smoke/intern/WTURBULENCE.h
branches/blender2.5/blender/intern/smoke/intern/smoke_API.cpp
branches/blender2.5/blender/intern/smoke/intern/tnt/jama_eig.h
branches/blender2.5/blender/intern/smoke/intern/tnt/jama_lu.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_array1d.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_array1d_utils.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_array2d.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_array2d_utils.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_array3d.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_array3d_utils.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_cmat.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_fortran_array1d.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_fortran_array1d_utils.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_fortran_array2d.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_fortran_array2d_utils.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_fortran_array3d.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_fortran_array3d_utils.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_i_refvec.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_math_utils.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_sparse_matrix_csr.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_stopwatch.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_subscript.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_vec.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_version.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_smoke.h
branches/blender2.5/blender/source/blender/blenkernel/intern/smoke.c
branches/blender2.5/blender/source/blender/makesdna/DNA_smoke_types.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_smoke.c
Modified: branches/blender2.5/blender/intern/smoke/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/intern/smoke/CMakeLists.txt 2009-07-30 18:32:20 UTC (rev 22063)
+++ branches/blender2.5/blender/intern/smoke/CMakeLists.txt 2009-07-30 18:39:22 UTC (rev 22064)
@@ -1,38 +1,38 @@
-# $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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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 ${PNG_INC} ${ZLIB_INC} intern ../../extern/bullet2/src ../memutil ../guardealloc)
-# ${FFTW3_INC}
-
-FILE(GLOB SRC intern/*.cpp)
-
-IF(WITH_OPENMP)
- ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-
-BLENDERLIB(bf_smoke "${SRC}" "${INC}")
-#, libtype='blender', priority = 0 )
+# $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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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 ${PNG_INC} ${ZLIB_INC} intern ../../extern/bullet2/src ../memutil ../guardealloc)
+# ${FFTW3_INC}
+
+FILE(GLOB SRC intern/*.cpp)
+
+IF(WITH_OPENMP)
+ ADD_DEFINITIONS(-DPARALLEL=1)
+ENDIF(WITH_OPENMP)
+
+
+BLENDERLIB(bf_smoke "${SRC}" "${INC}")
+#, libtype='blender', priority = 0 )
Property changes on: branches/blender2.5/blender/intern/smoke/CMakeLists.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: branches/blender2.5/blender/intern/smoke/Makefile
===================================================================
--- branches/blender2.5/blender/intern/smoke/Makefile 2009-07-30 18:32:20 UTC (rev 22063)
+++ branches/blender2.5/blender/intern/smoke/Makefile 2009-07-30 18:39:22 UTC (rev 22064)
@@ -1,7 +1,7 @@
# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
# vim: tabstop=8
#
-# $Id: Makefile 19330 2009-03-19 01:50:45Z hos $
+# $Id$
#
# ***** BEGIN GPL LICENSE BLOCK *****
#
Property changes on: branches/blender2.5/blender/intern/smoke/Makefile
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: branches/blender2.5/blender/intern/smoke/extern/smoke_API.h
===================================================================
--- branches/blender2.5/blender/intern/smoke/extern/smoke_API.h 2009-07-30 18:32:20 UTC (rev 22063)
+++ branches/blender2.5/blender/intern/smoke/extern/smoke_API.h 2009-07-30 18:39:22 UTC (rev 22064)
@@ -1,62 +1,62 @@
-/**
- * $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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2009 by Daniel Genrich
- * All rights reserved.
- *
- * Contributor(s): None
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef SMOKE_API_H_
-#define SMOKE_API_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct FLUID_3D *smoke_init(int *res, int amplify, float *p0, float *p1, float dt);
-void smoke_free(struct FLUID_3D *fluid);
-
-void smoke_initBlenderRNA(struct FLUID_3D *fluid, float *alpha, float *beta);
-
-void smoke_step(struct FLUID_3D *fluid);
-
-float *smoke_get_density(struct FLUID_3D *fluid);
-float *smoke_get_bigdensity(struct FLUID_3D *fluid);
-float *smoke_get_heat(struct FLUID_3D *fluid);
-float *smoke_get_velocity_x(struct FLUID_3D *fluid);
-float *smoke_get_velocity_y(struct FLUID_3D *fluid);
-float *smoke_get_velocity_z(struct FLUID_3D *fluid);
-
-unsigned char *smoke_get_obstacle(struct FLUID_3D *fluid);
-
-size_t smoke_get_index(int x, int max_x, int y, int max_y, int z, int max_z);
-size_t smoke_get_index2d(int x, int max_x, int y, int max_y, int z, int max_z);
-
-void smoke_set_noise(struct FLUID_3D *fluid, int type);
-
-void smoke_get_bigres(struct FLUID_3D *fluid, int *res);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SMOKE_API_H_ */
+/**
+ * $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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2009 by Daniel Genrich
+ * All rights reserved.
+ *
+ * Contributor(s): None
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef SMOKE_API_H_
+#define SMOKE_API_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct FLUID_3D *smoke_init(int *res, int amplify, float *p0, float *p1, float dt);
+void smoke_free(struct FLUID_3D *fluid);
+
+void smoke_initBlenderRNA(struct FLUID_3D *fluid, float *alpha, float *beta);
+
+void smoke_step(struct FLUID_3D *fluid);
+
+float *smoke_get_density(struct FLUID_3D *fluid);
+float *smoke_get_bigdensity(struct FLUID_3D *fluid);
+float *smoke_get_heat(struct FLUID_3D *fluid);
+float *smoke_get_velocity_x(struct FLUID_3D *fluid);
+float *smoke_get_velocity_y(struct FLUID_3D *fluid);
+float *smoke_get_velocity_z(struct FLUID_3D *fluid);
+
+unsigned char *smoke_get_obstacle(struct FLUID_3D *fluid);
+
+size_t smoke_get_index(int x, int max_x, int y, int max_y, int z, int max_z);
+size_t smoke_get_index2d(int x, int max_x, int y, int max_y, int z, int max_z);
+
+void smoke_set_noise(struct FLUID_3D *fluid, int type);
+
+void smoke_get_bigres(struct FLUID_3D *fluid, int *res);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SMOKE_API_H_ */
Property changes on: branches/blender2.5/blender/intern/smoke/extern/smoke_API.h
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: branches/blender2.5/blender/intern/smoke/intern/EIGENVALUE_HELPER.h
===================================================================
--- branches/blender2.5/blender/intern/smoke/intern/EIGENVALUE_HELPER.h 2009-07-30 18:32:20 UTC (rev 22063)
+++ branches/blender2.5/blender/intern/smoke/intern/EIGENVALUE_HELPER.h 2009-07-30 18:39:22 UTC (rev 22064)
@@ -1,47 +1,47 @@
-//////////////////////////////////////////////////////////////////////
-// This file is part of Wavelet Turbulence.
-//
-// Wavelet Turbulence 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 3 of the License, or
-// (at your option) any later version.
-//
-// Wavelet Turbulence 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 Wavelet Turbulence. If not, see <http://www.gnu.org/licenses/>.
-//
-// Copyright 2008 Theodore Kim and Nils Thuerey
-//
-//////////////////////////////////////////////////////////////////////
-// Helper function, compute eigenvalues of 3x3 matrix
-//////////////////////////////////////////////////////////////////////
-
-#include "tnt/jama_eig.h"
-
-//////////////////////////////////////////////////////////////////////
-// eigenvalues of 3x3 non-symmetric matrix
-//////////////////////////////////////////////////////////////////////
-int inline computeEigenvalues3x3(
- float dout[3],
- float a[3][3])
-{
- TNT::Array2D<float> A = TNT::Array2D<float>(3,3, &a[0][0]);
- TNT::Array1D<float> eig = TNT::Array1D<float>(3);
- TNT::Array1D<float> eigImag = TNT::Array1D<float>(3);
- JAMA::Eigenvalue<float> jeig = JAMA::Eigenvalue<float>(A);
- jeig.getRealEigenvalues(eig);
-
- // complex ones
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list