[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49934] branches/soc-2011-tomato: svn merge ^/trunk/blender -r49929:49933
Campbell Barton
ideasman42 at gmail.com
Thu Aug 16 12:15:05 CEST 2012
Revision: 49934
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49934
Author: campbellbarton
Date: 2012-08-16 10:15:05 +0000 (Thu, 16 Aug 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r49929:49933
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49929
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryBuffer.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_SocketReader.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DisplaceOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MapUVOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ReadBufferOperation.h
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-49929
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-49933
Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryBuffer.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryBuffer.cpp 2012-08-16 10:13:04 UTC (rev 49933)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryBuffer.cpp 2012-08-16 10:15:05 UTC (rev 49934)
@@ -259,7 +259,10 @@
return x;
}
-void MemoryBuffer::readEWA(float result[4], float fx, float fy, float dx, float dy)
+/**
+ * \note \a sampler at the moment is either 'COM_PS_NEAREST' or not, other values won't matter.
+ */
+void MemoryBuffer::readEWA(float result[4], float fx, float fy, float dx, float dy, PixelSampler sampler)
{
const int width = this->getWidth(), height = this->getHeight();
@@ -280,7 +283,7 @@
// Use a different radius based on interpolation switch, just enough to anti-alias when interpolation is off,
// and slightly larger to make result a bit smoother than bilinear interpolation when interpolation is on
// (minimum values: const float rmin = intpol ? 1.f : 0.5f;)
- const float rmin = 1.5625f / ff2;
+ const float rmin = ((sampler != COM_PS_NEAREST) ? 1.5625f : 0.765625f) / ff2;
imp2radangle(A, B, C, F, &a, &b, &th, &ecc);
if ((b2 = b * b) < rmin) {
if ((a2 = a * a) < rmin) {
Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryBuffer.h
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryBuffer.h 2012-08-16 10:13:04 UTC (rev 49933)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryBuffer.h 2012-08-16 10:15:05 UTC (rev 49934)
@@ -202,7 +202,7 @@
- void readEWA(float result[4], float fx, float fy, float dx, float dy);
+ void readEWA(float result[4], float fx, float fy, float dx, float dy, PixelSampler sampler);
/**
* @brief is this MemoryBuffer a temporarily buffer (based on an area, not on a chunk)
Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_SocketReader.h
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_SocketReader.h 2012-08-16 10:13:04 UTC (rev 49933)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_SocketReader.h 2012-08-16 10:15:05 UTC (rev 49934)
@@ -88,7 +88,7 @@
* @param dy
* @param inputBuffers chunks that can be read by their ReadBufferOperation.
*/
- virtual void executePixel(float output[4], float x, float y, float dx, float dy) {}
+ virtual void executePixel(float output[4], float x, float y, float dx, float dy, PixelSampler sampler) {}
public:
inline void read(float *result, float x, float y, PixelSampler sampler) {
@@ -97,8 +97,8 @@
inline void read(float *result, int x, int y, void *chunkData) {
executePixel(result, x, y, chunkData);
}
- inline void read(float *result, float x, float y, float dx, float dy) {
- executePixel(result, x, y, dx, dy);
+ inline void read(float *result, float x, float y, float dx, float dy, PixelSampler sampler) {
+ executePixel(result, x, y, dx, dy, sampler);
}
virtual void *initializeTileData(rcti *rect) { return 0; }
Modified: branches/soc-2011-tomato/source/blender/compositor/operations/COM_DisplaceOperation.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/operations/COM_DisplaceOperation.cpp 2012-08-16 10:13:04 UTC (rev 49933)
+++ branches/soc-2011-tomato/source/blender/compositor/operations/COM_DisplaceOperation.cpp 2012-08-16 10:15:05 UTC (rev 49934)
@@ -95,8 +95,8 @@
dxt = signf(dxt) * maxf(fabsf(dxt), DISPLACE_EPSILON) / this->getWidth();
dyt = signf(dyt) * maxf(fabsf(dyt), DISPLACE_EPSILON) / this->getHeight();
- /* EWA filtering */
- this->m_inputColorProgram->read(output, u, v, dxt, dyt);
+ /* EWA filtering (without nearest it gets blurry with NO distortion) */
+ this->m_inputColorProgram->read(output, u, v, dxt, dyt, COM_PS_NEAREST);
}
void DisplaceOperation::deinitExecution()
Modified: branches/soc-2011-tomato/source/blender/compositor/operations/COM_MapUVOperation.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/operations/COM_MapUVOperation.cpp 2012-08-16 10:13:04 UTC (rev 49933)
+++ branches/soc-2011-tomato/source/blender/compositor/operations/COM_MapUVOperation.cpp 2012-08-16 10:15:05 UTC (rev 49934)
@@ -107,7 +107,7 @@
u = inputUV[0] * this->m_inputColorProgram->getWidth();
v = inputUV[1] * this->m_inputColorProgram->getHeight();
- this->m_inputColorProgram->read(output, u, v, dx, dy);
+ this->m_inputColorProgram->read(output, u, v, dx, dy, COM_PS_NEAREST);
/* "premul" */
if (alpha < 1.0f) {
Modified: branches/soc-2011-tomato/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/operations/COM_ReadBufferOperation.cpp 2012-08-16 10:13:04 UTC (rev 49933)
+++ branches/soc-2011-tomato/source/blender/compositor/operations/COM_ReadBufferOperation.cpp 2012-08-16 10:15:05 UTC (rev 49934)
@@ -59,9 +59,9 @@
}
}
-void ReadBufferOperation::executePixel(float output[4], float x, float y, float dx, float dy)
+void ReadBufferOperation::executePixel(float output[4], float x, float y, float dx, float dy, PixelSampler sampler)
{
- m_buffer->readEWA(output, x, y, dx, dy);
+ m_buffer->readEWA(output, x, y, dx, dy, sampler);
}
bool ReadBufferOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
Modified: branches/soc-2011-tomato/source/blender/compositor/operations/COM_ReadBufferOperation.h
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/operations/COM_ReadBufferOperation.h 2012-08-16 10:13:04 UTC (rev 49933)
+++ branches/soc-2011-tomato/source/blender/compositor/operations/COM_ReadBufferOperation.h 2012-08-16 10:15:05 UTC (rev 49934)
@@ -40,7 +40,7 @@
void *initializeTileData(rcti *rect);
void executePixel(float output[4], float x, float y, PixelSampler sampler);
- void executePixel(float output[4], float x, float y, float dx, float dy);
+ void executePixel(float output[4], float x, float y, float dx, float dy, PixelSampler sampler);
const bool isReadBufferOperation() const { return true; }
void setOffset(unsigned int offset) { this->m_offset = offset; }
unsigned int getOffset() { return this->m_offset; }
Property changes on: branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-49929
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-49933
Property changes on: branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-49929
+ /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-49933
More information about the Bf-blender-cvs
mailing list