[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15261] trunk/blender/source/gameengine/ Converter: Forgot to set Id property on new shape action files
Revision: 15261 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=15261 Author: ben2610 Date: 2008-06-18 09:03:47 +0200 (Wed, 18 Jun 2008) Log Message: --- Forgot to set Id property on new shape action files Modified Paths: -- trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.h trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.h Property Changed: trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.h trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.h Modified: trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp === --- trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp 2008-06-18 06:46:49 UTC (rev 15260) +++ trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp 2008-06-18 07:03:47 UTC (rev 15261) @@ -1,5 +1,5 @@ /** -* $Id: BL_ShapeActionActuator.cpp 1 2008-04-16 22:40:48Z hos $ +* $Id$ * * * BEGIN GPL LICENSE BLOCK * * Property changes on: trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp ___ Name: svn:keywords + Id Modified: trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.h === --- trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.h 2008-06-18 06:46:49 UTC (rev 15260) +++ trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.h 2008-06-18 07:03:47 UTC (rev 15261) @@ -1,5 +1,5 @@ /** - * $Id: BL_ShapeActionActuator.h 1 2008-04-16 22:40:48Z hos $ + * $Id$ * * * BEGIN GPL LICENSE BLOCK * * Property changes on: trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.h ___ Name: svn:keywords + Id Modified: trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp === --- trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp 2008-06-18 06:46:49 UTC (rev 15260) +++ trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp 2008-06-18 07:03:47 UTC (rev 15261) @@ -1,5 +1,5 @@ /** - * $Id: BL_ShapeDeformer.cpp 1 2008-04-16 22:40:48Z hos $ + * $Id$ * * * BEGIN GPL LICENSE BLOCK * * Property changes on: trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp ___ Name: svn:keywords + Id Modified: trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.h === --- trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.h 2008-06-18 06:46:49 UTC (rev 15260) +++ trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.h 2008-06-18 07:03:47 UTC (rev 15261) @@ -1,5 +1,5 @@ /** - * $Id: BL_SkinDeformer.h 1 2008-04-16 22:40:48Z hos $ + * $Id$ * * * BEGIN GPL LICENSE BLOCK * * Property changes on: trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.h ___ Name: svn:keywords + Id ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15263] trunk/blender/source/gameengine/ Converter/BL_SkinMeshObject.cpp: Small fix to be able to compile Blender.
Revision: 15263
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=15263
Author: jiri
Date: 2008-06-18 11:52:31 +0200 (Wed, 18 Jun 2008)
Log Message:
---
Small fix to be able to compile Blender.
Modified Paths:
--
trunk/blender/source/gameengine/Converter/BL_SkinMeshObject.cpp
Modified: trunk/blender/source/gameengine/Converter/BL_SkinMeshObject.cpp
===
--- trunk/blender/source/gameengine/Converter/BL_SkinMeshObject.cpp
2008-06-18 09:06:51 UTC (rev 15262)
+++ trunk/blender/source/gameengine/Converter/BL_SkinMeshObject.cpp
2008-06-18 09:52:31 UTC (rev 15263)
@@ -150,7 +150,7 @@
}
-static get_def_index(Object* ob, const char* vgroup)
+static int get_def_index(Object* ob, const char* vgroup)
{
bDeformGroup *curdef;
int index = 0;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15264] trunk/blender/source:
Revision: 15264
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=15264
Author: blendix
Date: 2008-06-18 12:30:14 +0200 (Wed, 18 Jun 2008)
Log Message:
---
* Fix for a crash in game engine vertex array drawing with texfaces.
* For 2D filters, don't require opengl 2.0 but just the extensions,
so it works on computers without full 2.0 support too.
* In debug mode, don't print memory statistics for preview render.
Modified Paths:
--
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===
--- trunk/blender/source/blender/render/intern/source/convertblender.c
2008-06-18 09:52:31 UTC (rev 15263)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c
2008-06-18 10:30:14 UTC (rev 15264)
@@ -4434,7 +4434,7 @@
LampRen *lar;
/* statistics for debugging render memory usage */
- if(G.f G_DEBUG) {
+ if((G.f G_DEBUG) (G.rendering)) {
if((re-r.scemode R_PREVIEWBUTS)==0) {
BKE_image_print_memlist();
MEM_printmemlist_stats();
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
===
--- trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
2008-06-18 09:52:31 UTC (rev 15263)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
2008-06-18 10:30:14 UTC (rev 15264)
@@ -54,11 +54,13 @@
RAS_2DFilterManager::RAS_2DFilterManager():
-texturewidth(-1), textureheight(-1),
+texname(-1), texturewidth(-1), textureheight(-1),
canvaswidth(-1), canvasheight(-1),
-numberoffilters(0),texname(-1)
+numberoffilters(0)
{
- isshadersupported = GLEW_VERSION_2_0;
+ isshadersupported = GLEW_ARB_shader_objects
+ GLEW_ARB_fragment_shader GLEW_ARB_multitexture;
+
if(!isshadersupported)
{
std::coutshaders not supported! std::endl;
@@ -81,7 +83,6 @@
unsigned int RAS_2DFilterManager::CreateShaderProgram(char* shadersource)
{
GLuint program = 0;
-#if defined(GL_ARB_shader_objects) defined(WITH_GLEXT)
GLuint fShader = glCreateShaderObjectARB(GL_FRAGMENT_SHADER);
GLint success;
@@ -117,7 +118,7 @@
std::cout 2dFilters - Shader program validation
error std::endl;
return 0;
}
-#endif
+
return program;
}
@@ -151,7 +152,6 @@
void RAS_2DFilterManager::StartShaderProgram(unsigned int shaderprogram)
{
-#if defined(GL_ARB_shader_objects) defined(WITH_GLEXT)
GLint uniformLoc;
glUseProgramObjectARB(shaderprogram);
uniformLoc = glGetUniformLocationARB(shaderprogram,
bgl_RenderedTexture);
@@ -178,14 +178,11 @@
{
glUniform1fARB(uniformLoc,textureheight);
}
-#endif
}
void RAS_2DFilterManager::EndShaderProgram()
{
-#if defined(GL_ARB_shader_objects) defined(WITH_GLEXT)
glUseProgramObjectARB(0);
-#endif
}
void RAS_2DFilterManager::SetupTexture()
@@ -295,7 +292,6 @@
{
if(!isshadersupported)
return;
-#if defined(GL_ARB_shader_objects) defined(WITH_GLEXT)
if(pass0 || pass=MAX_RENDER_PASS)
return;
@@ -336,5 +332,4 @@
m_filters[pass] = CreateShaderProgram(mode);
m_enabled[pass] = 1;
}
-#endif
}
Modified:
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
===
---
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
2008-06-18 09:52:31 UTC (rev 15263)
+++
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
2008-06-18 10:30:14 UTC (rev 15264)
@@ -142,6 +142,9 @@
glColor3d(0,0,0);
}
+ EnableTextures(false);
+ glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+
// use glDrawElements to draw each vertexarray
for (vt=0;vtvertexarrays.size();vt++)
{
@@ -168,6 +171,8 @@
}
+
+ glDisableClientState(GL_TEXTURE_COORD_ARRAY);
}
void RAS_VAOpenGLRasterizer::IndexPrimitivesMulti( const vecVertexArray
vertexarrays,
@@ -281,6 +286,8 @@
break;
}
}
+
+ glClientActiveTextureARB(GL_TEXTURE0_ARB);
}
if(GLEW_ARB_vertex_program) {
@@ -359,10 +366,14 @@
break;
}
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15265] branches/apricot: Apricot Branch: svn merge -r 15249:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/ blender/
Revision: 15265
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=15265
Author: blendix
Date: 2008-06-18 13:04:30 +0200 (Wed, 18 Jun 2008)
Log Message:
---
Apricot Branch: svn merge -r 15249:HEAD
https://svn.blender.org/svnroot/bf-blender/trunk/blender/
(game engine shape keys!)
Modified Paths:
--
branches/apricot/extern/make/msvc_7_0/extern.sln
branches/apricot/projectfiles_vc7/blender/blender.vcproj
branches/apricot/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj
branches/apricot/projectfiles_vc7/gameengine/converter/KX_converter.vcproj
branches/apricot/projectfiles_vc7/gameengine/gameplayer/common/GP_common.vcproj
branches/apricot/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
branches/apricot/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
branches/apricot/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj
branches/apricot/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
branches/apricot/source/blender/blenkernel/BKE_action.h
branches/apricot/source/blender/blenkernel/BKE_key.h
branches/apricot/source/blender/blenkernel/intern/action.c
branches/apricot/source/blender/blenkernel/intern/key.c
branches/apricot/source/blender/blenkernel/intern/sca.c
branches/apricot/source/blender/blenloader/intern/readfile.c
branches/apricot/source/blender/blenloader/intern/writefile.c
branches/apricot/source/blender/makesdna/DNA_actuator_types.h
branches/apricot/source/blender/render/intern/source/convertblender.c
branches/apricot/source/blender/src/buttons_logic.c
branches/apricot/source/blender/src/transform_constraints.c
branches/apricot/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/apricot/source/gameengine/Converter/BL_DeformableGameObject.cpp
branches/apricot/source/gameengine/Converter/BL_DeformableGameObject.h
branches/apricot/source/gameengine/Converter/BL_MeshDeformer.cpp
branches/apricot/source/gameengine/Converter/BL_MeshDeformer.h
branches/apricot/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/apricot/source/gameengine/Converter/BL_SkinDeformer.h
branches/apricot/source/gameengine/Converter/BL_SkinMeshObject.cpp
branches/apricot/source/gameengine/Converter/BL_SkinMeshObject.h
branches/apricot/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/apricot/source/gameengine/GameLogic/SCA_IObject.h
branches/apricot/source/gameengine/Ketsji/KX_GameObject.cpp
branches/apricot/source/gameengine/Ketsji/KX_GameObject.h
branches/apricot/source/gameengine/Ketsji/KX_RayCast.cpp
branches/apricot/source/gameengine/Ketsji/KX_Scene.cpp
branches/apricot/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/apricot/source/gameengine/Rasterizer/RAS_Deformer.h
branches/apricot/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/apricot/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/apricot/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
Added Paths:
---
branches/apricot/extern/glew/make/
branches/apricot/extern/glew/make/msvc_7_0/
branches/apricot/extern/glew/make/msvc_7_0/glew_vc7.vcproj
Removed Paths:
-
branches/apricot/extern/glew/make/msvc_7_0/
branches/apricot/extern/glew/make/msvc_7_0/glew_vc7.vcproj
Copied: branches/apricot/extern/glew/make (from rev 15264,
trunk/blender/extern/glew/make)
Copied: branches/apricot/extern/glew/make/msvc_7_0 (from rev 15264,
trunk/blender/extern/glew/make/msvc_7_0)
Deleted: branches/apricot/extern/glew/make/msvc_7_0/glew_vc7.vcproj
===
--- trunk/blender/extern/glew/make/msvc_7_0/glew_vc7.vcproj 2008-06-18
10:30:14 UTC (rev 15264)
+++ branches/apricot/extern/glew/make/msvc_7_0/glew_vc7.vcproj 2008-06-18
11:04:30 UTC (rev 15265)
@@ -1,146 +0,0 @@
-?xml version=1.0 encoding=Windows-1252?
-VisualStudioProject
- ProjectType=Visual C++
- Version=7.10
- Name=glew
- ProjectGUID={BAC615B0-F1AF-418B-8D23-A10FD8870D6A}
- Keyword=Win32Proj
- Platforms
- Platform
- Name=Win32/
- /Platforms
- Configurations
- Configuration
- Name=Blender Debug|Win32
-
OutputDirectory=..\..\..\..\..\build\msvc_7\extern\glew\debug
-
IntermediateDirectory=..\..\..\..\..\build\msvc_7\extern\glew\debug
- ConfigurationType=4
- CharacterSet=2
- Tool
- Name=VCCLCompilerTool
- Optimization=0
- AdditionalIncludeDirectories=..\..\include
-
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15266] branches/apricot/source/gameengine /Converter: Apricot Branch: missed some files in last commit.
Revision: 15266
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=15266
Author: blendix
Date: 2008-06-18 13:16:40 +0200 (Wed, 18 Jun 2008)
Log Message:
---
Apricot Branch: missed some files in last commit.
Added Paths:
---
branches/apricot/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/apricot/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/apricot/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/apricot/source/gameengine/Converter/BL_ShapeDeformer.h
Added: branches/apricot/source/gameengine/Converter/BL_ShapeActionActuator.cpp
===
--- branches/apricot/source/gameengine/Converter/BL_ShapeActionActuator.cpp
(rev 0)
+++ branches/apricot/source/gameengine/Converter/BL_ShapeActionActuator.cpp
2008-06-18 11:16:40 UTC (rev 15266)
@@ -0,0 +1,797 @@
+/**
+* $Id: BL_ShapeActionActuator.cpp 15261 2008-06-18 07:03:47Z ben2610 $
+*
+ * * 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) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * * END GPL LICENSE BLOCK *
+*/
+
+#if defined (__sgi)
+#include math.h
+#else
+#include cmath
+#endif
+
+#include SCA_LogicManager.h
+#include BL_ShapeActionActuator.h
+#include BL_ActionActuator.h
+#include BL_ShapeDeformer.h
+#include KX_GameObject.h
+#include STR_HashedString.h
+#include DNA_action_types.h
+#include DNA_nla_types.h
+#include DNA_actuator_types.h
+#include BKE_action.h
+#include DNA_armature_types.h
+#include MEM_guardedalloc.h
+#include BLI_blenlib.h
+#include BLI_arithb.h
+#include MT_Matrix4x4.h
+#include BKE_utildefines.h
+
+#ifdef HAVE_CONFIG_H
+#include config.h
+#endif
+
+BL_ShapeActionActuator::~BL_ShapeActionActuator()
+{
+}
+
+void BL_ShapeActionActuator::ProcessReplica()
+{
+ m_localtime=m_startframe;
+ m_lastUpdate=-1;
+}
+
+void BL_ShapeActionActuator::SetBlendTime (float newtime)
+{
+ m_blendframe = newtime;
+}
+
+CValue* BL_ShapeActionActuator::GetReplica()
+{
+ BL_ShapeActionActuator* replica = new
BL_ShapeActionActuator(*this);//m_float,GetName());
+ replica-ProcessReplica();
+
+ // this will copy properties and so on...
+ CValue::AddDataToReplica(replica);
+ return replica;
+}
+
+bool BL_ShapeActionActuator::ClampLocalTime()
+{
+ if (m_startframe m_endframe) {
+ if (m_localtime m_startframe)
+ {
+ m_localtime = m_startframe;
+ return true;
+ }
+ else if (m_localtime m_endframe)
+ {
+ m_localtime = m_endframe;
+ return true;
+ }
+ } else {
+ if (m_localtime m_startframe)
+ {
+ m_localtime = m_startframe;
+ return true;
+ }
+ else if (m_localtime m_endframe)
+ {
+ m_localtime = m_endframe;
+ return true;
+ }
+ }
+ return false;
+}
+
+void BL_ShapeActionActuator::SetStartTime(float curtime)
+{
+ float direction = m_startframe m_endframe ? 1.0 : -1.0;
+
+ if (!(m_flag ACT_FLAG_REVERSE))
+ m_starttime = curtime - direction*(m_localtime -
m_startframe)/KX_KetsjiEngine::GetAnimFrameRate();
+ else
+ m_starttime = curtime - direction*(m_endframe -
m_localtime)/KX_KetsjiEngine::GetAnimFrameRate();
+}
+
+void BL_ShapeActionActuator::SetLocalTime(float curtime)
+{
+ float delta_time = (curtime -
m_starttime)*KX_KetsjiEngine::GetAnimFrameRate();
+
+ if (m_endframe m_startframe)
+ delta_time = -delta_time;
+
+ if (!(m_flag ACT_FLAG_REVERSE))
+ m_localtime = m_startframe + delta_time;
+ else
+ m_localtime = m_endframe - delta_time;
+}
+
+void BL_ShapeActionActuator::BlendShape(Key* key, float srcweight)
+{
+ vectorfloat::const_iterator
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15269] trunk/blender/source/blender: Patch #8882 - Falloff in the wave modifier
Revision: 15269
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=15269
Author: artificer
Date: 2008-06-18 17:22:42 +0200 (Wed, 18 Jun 2008)
Log Message:
---
Patch #8882 - Falloff in the wave modifier
This patch adds the ability to specify a falloff radius in the Wave modifier.
Currently only linear falloff is supported.
Thanks to Michael Fox for the patch!
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/modifier.c
trunk/blender/source/blender/makesdna/DNA_modifier_types.h
trunk/blender/source/blender/src/buttons_editing.c
Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===
--- trunk/blender/source/blender/blenkernel/intern/modifier.c 2008-06-18
14:56:12 UTC (rev 15268)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c 2008-06-18
15:22:42 UTC (rev 15269)
@@ -4525,13 +4525,13 @@
/* Wave */
-static void waveModifier_initData(ModifierData *md)
+static void waveModifier_initData(ModifierData *md)
{
WaveModifierData *wmd = (WaveModifierData*) md; // whadya know, moved
here from Iraq
-
+
wmd-flag |= (MOD_WAVE_X | MOD_WAVE_Y | MOD_WAVE_CYCL
| MOD_WAVE_NORM_X | MOD_WAVE_NORM_Y | MOD_WAVE_NORM_Z);
-
+
wmd-objectcenter = NULL;
wmd-texture = NULL;
wmd-map_object = NULL;
@@ -4541,6 +4541,7 @@
wmd-narrow= 1.5f;
wmd-lifetime= 0.0f;
wmd-damp= 10.0f;
+ wmd-falloff= 0.0f;
wmd-texmapping = MOD_WAV_MAP_LOCAL;
wmd-defgrp_name[0] = 0;
}
@@ -4560,6 +4561,7 @@
twmd-starty = wmd-starty;
twmd-timeoffs = wmd-timeoffs;
twmd-width = wmd-width;
+ twmd-falloff = wmd-falloff;
twmd-objectcenter = wmd-objectcenter;
twmd-texture = wmd-texture;
twmd-map_object = wmd-map_object;
@@ -4770,7 +4772,7 @@
if(x wmd-lifetime) {
lifefac = x - wmd-lifetime;
-
+
if(lifefac wmd-damp) lifefac = 0.0;
else lifefac =
(float)(wmd-height * (1.0 - sqrt(lifefac /
wmd-damp)));
@@ -4791,6 +4793,8 @@
float x = co[0] - wmd-startx;
float y = co[1] - wmd-starty;
float amplit= 0.0f;
+ float dist = 0.0f;
+ float falloff_fac = 0.0f;
TexResult texres;
MDeformWeight *def_weight = NULL;
@@ -4813,14 +4817,29 @@
get_texture_value(wmd-texture, tex_co[i],
texres);
}
+ /*get dist*/
+ if(wmd-flag MOD_WAVE_X) {
+ if(wmd-flag MOD_WAVE_Y){
+ dist = (float)sqrt(x*x + y*y);
+ }
+ else{
+ dist = fabs(x);
+ }
+ }
+ else if(wmd-flag MOD_WAVE_Y) {
+ dist = fabs(y);
+ }
+ falloff_fac = (1.0-(dist / wmd-falloff));
+ CLAMP(falloff_fac,0,1);
+
if(wmd-flag MOD_WAVE_X) {
if(wmd-flag MOD_WAVE_Y) amplit =
(float)sqrt(x*x + y*y);
else amplit = x;
}
- else if(wmd-flag MOD_WAVE_Y)
+ else if(wmd-flag MOD_WAVE_Y)
amplit= y;
-
+
/* this way it makes nice circles */
amplit -= (ctime - wmd-timeoffs) * wmd-speed;
@@ -4833,12 +4852,19 @@
if(amplit -wmd-width amplit wmd-width) {
amplit = amplit * wmd-narrow;
amplit = (float)(1.0 / exp(amplit * amplit) -
minfac);
+
+ /*apply texture*/
if(wmd-texture)
amplit = amplit * texres.tin;
+ /*apply weight*/
if(def_weight)
amplit = amplit * def_weight-weight;
+ /*apply falloff*/
+ if (wmd-falloff 0)
+ amplit = amplit * falloff_fac;
+
if(mvert) {
/* move along normals */
if(wmd-flag MOD_WAVE_NORM_X) {
Modified:
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15270] trunk/blender/release/scripts/ vrml97_export.py: == VRML97 export ==
Revision: 15270
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=15270
Author: hos
Date: 2008-06-18 19:13:33 +0200 (Wed, 18 Jun 2008)
Log Message:
---
== VRML97 export ==
Patch #10569 from Michalis Kamburelis (sorry for the delay).
This patch adds a popup menu that lets the user choose whether
they want to export selected, whether thay wanted to export
compressed, and whether they want to export the file from
blender's Z up coordinates to VRML's Y up.
I'm not too crazy about the caching to disk of these options
via GetRegistry/SetRegistry, but since this seems to occur
in many of the other export scripts I'll leave it as is.
Modified Paths:
--
trunk/blender/release/scripts/vrml97_export.py
Modified: trunk/blender/release/scripts/vrml97_export.py
===
--- trunk/blender/release/scripts/vrml97_export.py 2008-06-18 15:22:42 UTC
(rev 15269)
+++ trunk/blender/release/scripts/vrml97_export.py 2008-06-18 17:13:33 UTC
(rev 15270)
@@ -3,9 +3,6 @@
Name: 'VRML97 (.wrl)...'
Blender: 241
Group: 'Export'
-Submenu: 'All Objects...' all
-Submenu: 'All Objects compressed...' comp
-Submenu: 'Selected Objects...' selected
Tooltip: 'Export to VRML97 file (.wrl)'
@@ -55,7 +52,7 @@
import Blender
from Blender import Object, Mesh, Lamp, Draw, BGL, \
-Image, Text, sys, Mathutils
+Image, Text, sys, Mathutils, Registry
from Blender.Scene import Render
import math
@@ -70,8 +67,9 @@
filename = Blender.Get('filename')
_safeOverwrite = True
extension = ''
-ARG=''
+# Matrices below are used only when export_rotate_z_to_y.val:
+#
# Blender is Z up, VRML is Y up, both are right hand coordinate
# systems, so to go from Blender coords to VRML coords we rotate
# by 90 degrees around the X axis. In matrix notation, we have a
@@ -633,8 +631,9 @@
meshVertexList = me.verts
for vertex in meshVertexList:
- blenvert = Mathutils.Vector(vertex.co)
- vrmlvert = M_blen2vrml * blenvert
+ vrmlvert = blenvert = Mathutils.Vector(vertex.co)
+ if export_rotate_z_to_y.val:
+ vrmlvert = M_blen2vrml * vrmlvert
self.writeUnindented(%s %s %s\n % \
(vrmlvert[0], \
vrmlvert[1], \
@@ -1016,7 +1015,10 @@
return
ob_matrix = Mathutils.Matrix(ob.getMatrix('worldspace'))
- matrix = M_blen2vrml * ob_matrix * M_vrml2blen
+ if export_rotate_z_to_y.val:
+ matrix = M_blen2vrml * ob_matrix * M_vrml2blen
+ else:
+ matrix = ob_matrix
e = matrix.rotationPart().toEuler()
v = matrix.translationPart()
@@ -1089,7 +1091,7 @@
self.writeFog()
self.proto = 0
allObj = []
- if ARG == 'selected':
+ if export_selection_only.val:
allObj = list(scene.objects.context)
else:
allObj = list(scene.objects)
@@ -1098,7 +1100,7 @@
for thisObj in allObj:
self.writeObject(thisObj)
- if ARG != 'selected':
+ if not export_selection_only.val:
self.writeScript()
self.cleanup()
@@ -1213,26 +1215,54 @@
wrlexport=VRML2Export(filename)
wrlexport.export(scene, world, worldmat)
+#
+# UI and Registry utilities
+#
+export_selection_only = Draw.Create(0)
+export_rotate_z_to_y = Draw.Create(1)
+export_compressed = Draw.Create(0)
+
+def save_to_registry():
+ d = {}
+ d['selection_only'] = export_selection_only.val
+ d['rotate_z_to_y'] = export_rotate_z_to_y.val
+ d['compressed'] = export_compressed.val
+ Registry.SetKey('vrml97_export', d, True)
+
+def load_from_registry():
+ d = Registry.GetKey('vrml97_export', True)
+ if d:
+ try:
+ export_selection_only.val = d['selection_only']
+ export_rotate_z_to_y.val = d['rotate_z_to_y']
+ export_compressed.val = d['compressed']
+ except: save_to_registry() # If data is not valid, rewrite it.
+
+def show_popup():
+ pup_block = [
+ ('Selection Only', export_selection_only, 'Only export objects
in visible selection. Else export whole scene.'),
+ ('Rotate +Z to +Y', export_rotate_z_to_y, 'Rotate such that +Z
axis (Blender up) becomes +Y (VRML up).'),
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15271] branches/soc-2008-unclezeiv: svn merge -r 15204:15269 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Revision: 15271 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=15271 Author: unclezeiv Date: 2008-06-18 19:21:56 +0200 (Wed, 18 Jun 2008) Log Message: --- svn merge -r 15204:15269 https://svn.blender.org/svnroot/bf-blender/trunk/blender Modified Paths: -- branches/soc-2008-unclezeiv/blenderplayer/CMakeLists.txt branches/soc-2008-unclezeiv/extern/CMakeLists.txt branches/soc-2008-unclezeiv/extern/Makefile branches/soc-2008-unclezeiv/extern/SConscript branches/soc-2008-unclezeiv/extern/make/msvc_7_0/extern.sln branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_SystemX11.cpp branches/soc-2008-unclezeiv/projectfiles_vc7/blender/blender.vcproj branches/soc-2008-unclezeiv/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj branches/soc-2008-unclezeiv/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/converter/KX_converter.vcproj branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/gameplayer/common/GP_common.vcproj branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj branches/soc-2008-unclezeiv/release/scripts/ms3d_import.py branches/soc-2008-unclezeiv/source/Makefile branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_action.h branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_key.h branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_scene.h branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/action.c branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/armature.c branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/key.c branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/modifier.c branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/object.c branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/sca.c branches/soc-2008-unclezeiv/source/blender/blenlib/intern/util.c branches/soc-2008-unclezeiv/source/blender/blenloader/intern/readfile.c branches/soc-2008-unclezeiv/source/blender/blenloader/intern/writefile.c branches/soc-2008-unclezeiv/source/blender/imbuf/intern/cineon/dpxlib.c branches/soc-2008-unclezeiv/source/blender/include/BDR_editcurve.h branches/soc-2008-unclezeiv/source/blender/include/BIF_oops.h branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_actuator_types.h branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_modifier_types.h branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_space_types.h branches/soc-2008-unclezeiv/source/blender/nodes/intern/CMP_nodes/CMP_math.c branches/soc-2008-unclezeiv/source/blender/nodes/intern/SHD_nodes/SHD_math.c branches/soc-2008-unclezeiv/source/blender/render/intern/source/convertblender.c branches/soc-2008-unclezeiv/source/blender/render/intern/source/shadbuf.c branches/soc-2008-unclezeiv/source/blender/src/CMakeLists.txt branches/soc-2008-unclezeiv/source/blender/src/Makefile branches/soc-2008-unclezeiv/source/blender/src/SConscript branches/soc-2008-unclezeiv/source/blender/src/buttons_editing.c branches/soc-2008-unclezeiv/source/blender/src/buttons_logic.c branches/soc-2008-unclezeiv/source/blender/src/drawaction.c branches/soc-2008-unclezeiv/source/blender/src/drawnode.c branches/soc-2008-unclezeiv/source/blender/src/drawoops.c branches/soc-2008-unclezeiv/source/blender/src/editcurve.c branches/soc-2008-unclezeiv/source/blender/src/editobject.c branches/soc-2008-unclezeiv/source/blender/src/header_oops.c branches/soc-2008-unclezeiv/source/blender/src/oops.c branches/soc-2008-unclezeiv/source/blender/src/transform_constraints.c branches/soc-2008-unclezeiv/source/blender/src/transform_snap.c branches/soc-2008-unclezeiv/source/blender/src/usiblender.c branches/soc-2008-unclezeiv/source/blender/src/view.c branches/soc-2008-unclezeiv/source/creator/CMakeLists.txt branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/CMakeLists.txt branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/Makefile
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15272] branches/soc-2008-unclezeiv/source /blender/render/intern/source/shadeoutput.c: fix: early tests in single_light_contrib were still returning
Revision: 15272
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=15272
Author: unclezeiv
Date: 2008-06-18 19:59:37 +0200 (Wed, 18 Jun 2008)
Log Message:
---
fix: early tests in single_light_contrib were still returning a (single) value
as in early versions, instead of updating the (two) passed variables (thanks
Kent!)
Modified Paths:
--
branches/soc-2008-unclezeiv/source/blender/render/intern/source/shadeoutput.c
Modified:
branches/soc-2008-unclezeiv/source/blender/render/intern/source/shadeoutput.c
===
---
branches/soc-2008-unclezeiv/source/blender/render/intern/source/shadeoutput.c
2008-06-18 17:21:56 UTC (rev 15271)
+++
branches/soc-2008-unclezeiv/source/blender/render/intern/source/shadeoutput.c
2008-06-18 17:59:37 UTC (rev 15272)
@@ -2105,12 +2105,17 @@
vn= shi-vn;
- if (lar-energy == 0.0) return 0.0f;
+ if (lar-energy == 0.0) {
+ *pi= *pi_noshad= 0.0f;
+ return;
+ }
/* lampdist, spot angle, area side, ... */
visifac= lamp_get_visibility(lar, shi-co, lv, lampdist);
- if(visifac==0.0f)
- return 0.0f;
+ if(visifac==0.0f) {
+ *pi= *pi_noshad= 0.0f;
+ return;
+ }
/* dot product and reflectivity */
/* inp = dotproduct, is = shader result, i = lamp energy (with shadow),
i_noshad = i without shadow */
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15273] trunk/blender/release/scripts/ vrml97_export.py: == VRML97 export ==
Revision: 15273 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=15273 Author: hos Date: 2008-06-18 21:58:05 +0200 (Wed, 18 Jun 2008) Log Message: --- == VRML97 export == Don't export vertex colors if a mesh doesn't have any (even if a texface has 'shared cols' set). Modified Paths: -- trunk/blender/release/scripts/vrml97_export.py Modified: trunk/blender/release/scripts/vrml97_export.py === --- trunk/blender/release/scripts/vrml97_export.py 2008-06-18 17:59:37 UTC (rev 15272) +++ trunk/blender/release/scripts/vrml97_export.py 2008-06-18 19:58:05 UTC (rev 15273) @@ -454,6 +454,8 @@ if mat: if (mat.mode Blender.Material.Modes['VCOL_PAINT']): self.vcolors = 1 + else: + self.vcolors = 0 # check if object is wireframe only if ob.drawType == Blender.Object.DrawTypes.WIRE: ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15274] branches/blender-2.47: branches/ blender-2.47
Revision: 15274 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=15274 Author: bdiego Date: 2008-06-18 22:18:37 +0200 (Wed, 18 Jun 2008) Log Message: --- branches/blender-2.47 Merge from trunk: Revision: 15239 Revision: 15240 Revision: 15242 Revision: 15247 Revision: 15256 Revision: 15262 Modified Paths: -- branches/blender-2.47/release/scripts/ms3d_import.py branches/blender-2.47/source/blender/imbuf/intern/cineon/dpxlib.c branches/blender-2.47/source/blender/src/transform_constraints.c branches/blender-2.47/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp branches/blender-2.47/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp branches/blender-2.47/source/gameengine/Converter/BL_ActionActuator.cpp branches/blender-2.47/source/gameengine/Ketsji/KX_GameObject.h branches/blender-2.47/source/gameengine/Ketsji/KX_IpoActuator.cpp branches/blender-2.47/source/gameengine/Ketsji/KX_KetsjiEngine.cpp branches/blender-2.47/source/gameengine/Ketsji/KX_KetsjiEngine.h branches/blender-2.47/source/gameengine/Ketsji/KX_RayCast.cpp Modified: branches/blender-2.47/release/scripts/ms3d_import.py === --- branches/blender-2.47/release/scripts/ms3d_import.py2008-06-18 19:58:05 UTC (rev 15273) +++ branches/blender-2.47/release/scripts/ms3d_import.py2008-06-18 20:18:37 UTC (rev 15274) @@ -43,28 +43,28 @@ # Converts ms3d euler angles to a rotation matrix -def RM(a): - sy = sin(a[2]) - cy = cos(a[2]) - sp = sin(a[1]) - cp = cos(a[1]) - sr = sin(a[0]) +def RM(a): + sy = sin(a[2]) + cy = cos(a[2]) + sp = sin(a[1]) + cp = cos(a[1]) + sr = sin(a[0]) cr = cos(a[0]) - return Matrix([cp*cy, sr*sp*cy+cr*-sy, cr*sp*cy+-sr*-sy],[cp*sy, sr*sp*sy+cr*cy, cr*sp*sy+-sr*cy], [-sp, sr*cp, cr*cp]) + return Matrix([cp*cy, cp*sy, -sp], [sr*sp*cy+cr*-sy, sr*sp*sy+cr*cy, sr*cp],[cr*sp*cy+-sr*-sy, cr*sp*sy+-sr*cy, cr*cp]) # Converts ms3d euler angles to a quaternion -def RQ(a): - angle = a[2] * 0.5; - sy = sin(angle); - cy = cos(angle); - angle = a[1] * 0.5; - sp = sin(angle); - cp = cos(angle); - angle = a[0] * 0.5; - sr = sin(angle); - cr = cos(angle); - return Quaternion(cr*cp*cy+sr*sp*sy, sr*cp*cy-cr*sp*sy, cr*sp*cy+sr*cp*sy, cr*cp*sy-sr*sp*cy) +def RQ(a): + angle = a[2] * 0.5; + sy = sin(angle); + cy = cos(angle); + angle = a[1] * 0.5; + sp = sin(angle); + cp = cos(angle); + angle = a[0] * 0.5; + sr = sin(angle); + cr = cos(angle); + return Quaternion(cr*cp*cy+sr*sp*sy, sr*cp*cy-cr*sp*sy, cr*sp*cy+sr*cp*sy, cr*cp*sy-sr*sp*cy) # takes a texture filename and tries to load it @@ -94,15 +94,20 @@ except IOError: return Failed to open the file! - # read id + # get the file size + file.seek(0, os.SEEK_END); + fileSize = file.tell(); + file.seek(0, os.SEEK_SET); + + # read id to check if the file is a MilkShape3D file id = file.read(10) if id!=MS3D00: - return The file is not a MS3D file! + return The file is not a MS3D file! # read version version = struct.unpack(i, file.read(4))[0] if version!=4: - return The file has invalid version! + return The file has invalid version! # Create the mesh scn.objects.selected = [] @@ -118,20 +123,20 @@ for i in xrange(numVertices): # skip flags file.read(1) - + # read coords coords.append(struct.unpack(fff, file.read(3*4))) # read bone ids - boneIds.append(struct.unpack(B, file.read(1))[0]) - + boneIds.append(struct.unpack(b, file.read(1))[0]) + # skip refcount file.read(1) # add the vertices to the mesh mesh.verts.extend(coords) - # read number of triangles + # read number of triangles numTriangles = struct.unpack(H, file.read(2))[0] # read triangles @@ -141,10 +146,10 @@ # skip flags file.read(2) - # read indices (faces) + # read indices (faces) faces.append(struct.unpack(HHH, file.read(3*2))) - # read normals + # read normals normals = struct.unpack(f, file.read(3*3*4)) # read texture coordinates @@ -171,35 +176,36 @@ for i in xrange(numTriangles): mesh.faces[i].uv = [Vector(uvs[i][0]), Vector(uvs[i][1]), Vector(uvs[i][2])] - # read number of groups + # read number
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15275] trunk/blender/release/scripts/ vrml97_export.py: == VRML97 exporter ==
Revision: 15275
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=15275
Author: hos
Date: 2008-06-18 23:16:29 +0200 (Wed, 18 Jun 2008)
Log Message:
---
== VRML97 exporter ==
Faulty indentation of a line sometimes caused a bunch of empty lines to
be printed into the TextureCoordinate and texCoodIndex fields
(benign error, just ugly).
Modified Paths:
--
trunk/blender/release/scripts/vrml97_export.py
Modified: trunk/blender/release/scripts/vrml97_export.py
===
--- trunk/blender/release/scripts/vrml97_export.py 2008-06-18 20:18:37 UTC
(rev 15274)
+++ trunk/blender/release/scripts/vrml97_export.py 2008-06-18 21:16:29 UTC
(rev 15275)
@@ -731,8 +731,8 @@
round(uv[1], self.tp))
j=j+1
indexStr += -1
- texIndexList.append(indexStr)
- texCoordList.append(coordStr)
+ texIndexList.append(indexStr)
+ texCoordList.append(coordStr)
self.writeIndented(texCoord TextureCoordinate {\n, 1)
self.writeIndented(point [\n, 1)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15276] trunk/blender/source/gameengine/ Ketsji/KX_GameObject.cpp: BGE patch #13625: getLinearVelocity() rewrite to use only vector and matrix operati
Revision: 15276
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=15276
Author: ben2610
Date: 2008-06-18 23:22:17 +0200 (Wed, 18 Jun 2008)
Log Message:
---
BGE patch #13625: getLinearVelocity() rewrite to use only vector and matrix
operations
Modified Paths:
--
trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
Modified: trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
===
--- trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp2008-06-18
21:16:29 UTC (rev 15275)
+++ trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp2008-06-18
21:22:17 UTC (rev 15276)
@@ -646,8 +646,8 @@
MT_Vector3 KX_GameObject::GetLinearVelocity(bool local)
{
- MT_Vector3 velocity(0.0,0.0,0.0);
- MT_Matrix3x3 ori, locvel;
+ MT_Vector3 velocity(0.0,0.0,0.0), locvel;
+ MT_Matrix3x3 ori;
int i, j;
if (m_pPhysicsController1)
{
@@ -657,11 +657,8 @@
{
ori = GetSGNode()-GetWorldOrientation();
- for(i=0; i 3; i++)
- for(j=0; j 3; j++)
- locvel[i][j]= velocity[i]*ori[i][j];
- for(i=0; i 3; i++)
- velocity[i] = locvel[0][i] + locvel[1][i] +
locvel[2][i];
+ locvel = velocity * ori;
+ return locvel;
}
}
return velocity;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
