[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash/server matrix.cpp matrix.h [release_0_7_2]
From: |
Udo Giacomozzi |
Subject: |
[Gnash-commit] gnash/server matrix.cpp matrix.h [release_0_7_2] |
Date: |
Fri, 03 Nov 2006 16:10:41 +0000 |
CVSROOT: /cvsroot/gnash
Module name: gnash
Branch: release_0_7_2
Changes by: Udo Giacomozzi <udog> 06/11/03 16:10:41
Modified files:
server : matrix.cpp matrix.h
Log message:
Backporting...
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/matrix.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.4.2.1&r2=1.4.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/matrix.h?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.2.2.1&r2=1.2.2.2
Patches:
Index: matrix.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/matrix.cpp,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -b -r1.4.2.1 -r1.4.2.2
--- matrix.cpp 30 Oct 2006 14:28:49 -0000 1.4.2.1
+++ matrix.cpp 3 Nov 2006 16:10:41 -0000 1.4.2.2
@@ -18,7 +18,7 @@
//
// Original author: Thatcher Ulrich <address@hidden> 2003
//
-// $Id: matrix.cpp,v 1.4.2.1 2006/10/30 14:28:49 rsavoye Exp $
+// $Id: matrix.cpp,v 1.4.2.2 2006/11/03 16:10:41 udog Exp $
//
#ifdef HAVE_CONFIG_H
@@ -125,6 +125,15 @@
m_[1][1] *= infinite_to_fzero(scale);
}
+void
+matrix::concatenate_scales(float x, float y)
+// Just like concatenate_scale() but with different scales for x/y
+{
+ m_[0][0] *= infinite_to_fzero(x);
+ m_[0][1] *= infinite_to_fzero(x);
+ m_[1][0] *= infinite_to_fzero(y);
+ m_[1][1] *= infinite_to_fzero(y);
+}
void
matrix::set_lerp(const matrix& m1, const matrix& m2, float t)
Index: matrix.h
===================================================================
RCS file: /cvsroot/gnash/gnash/server/matrix.h,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- matrix.h 30 Oct 2006 14:28:49 -0000 1.2.2.1
+++ matrix.h 3 Nov 2006 16:10:41 -0000 1.2.2.2
@@ -18,7 +18,7 @@
//
// Original author: Thatcher Ulrich <address@hidden> 2003
//
-// $Id: matrix.h,v 1.2.2.1 2006/10/30 14:28:49 rsavoye Exp $
+// $Id: matrix.h,v 1.2.2.2 2006/11/03 16:10:41 udog Exp $
//
#ifndef GNASH_MATRIX_H
@@ -97,6 +97,9 @@
///
void concatenate_scale(float s);
+ /// Just like concatenate_scale() but with different scales for x/y
+ void concatenate_scales(float x, float y);
+
/// Set this matrix to a blend of m1 and m2, parameterized by t.
void set_lerp(const matrix& m1, const matrix& m2, float t);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash/server matrix.cpp matrix.h [release_0_7_2],
Udo Giacomozzi <=