Skip to content

Commit 4b249ba

Browse files
author
zhangjipeng
committed
rename 'ps_matrix_reset' to 'ps_matrix_identity'
1 parent 14478e0 commit 4b249ba

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

demos/tiger.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ void on_draw(ps_context* gc)
255255
ps_set_composite_operator(gc, COMPOSITE_SRC);
256256

257257
ps_identity(gc);
258-
ps_matrix_reset(matrix);
258+
ps_matrix_identity(matrix);
259259
ps_matrix_translate(matrix, tx, ty);
260260
ps_matrix_translate(matrix, 0.5f*(width-tigerMaxX*scale), -(float)height/12.0f);
261261
ps_matrix_scale(matrix, scale, scale);

include/picasso.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -2691,27 +2691,27 @@ PEXPORT void PICAPI ps_matrix_shear(ps_matrix* matrix, float shx, float shy);
26912691
*
26922692
* \param matrix Pointer to an existing matrix object.
26932693
*
2694-
* \sa ps_matrix_flip_x, ps_matrix_flip_y, ps_matrix_reset
2694+
* \sa ps_matrix_flip_x, ps_matrix_flip_y, ps_matrix_identity
26952695
*/
26962696
PEXPORT void PICAPI ps_matrix_invert(ps_matrix* matrix);
26972697

26982698
/**
2699-
* \fn void ps_matrix_reset(ps_matrix* matrix)
2699+
* \fn void ps_matrix_identity(ps_matrix* matrix)
27002700
* \brief Reset a matrix to identity matrix.
27012701
*
27022702
* \param matrix Pointer to an existing matrix object.
27032703
*
27042704
* \sa ps_matrix_flip_x, ps_matrix_flip_y, ps_matrix_invert
27052705
*/
2706-
PEXPORT void PICAPI ps_matrix_reset(ps_matrix* matrix);
2706+
PEXPORT void PICAPI ps_matrix_identity(ps_matrix* matrix);
27072707

27082708
/**
27092709
* \fn void ps_matrix_flip_x(ps_matrix* matrix)
27102710
* \brief Flip a matrix in the horizontal direction.
27112711
*
27122712
* \param matrix Pointer to an existing matrix object.
27132713
*
2714-
* \sa ps_matrix_reset, ps_matrix_flip_y, ps_matrix_invert
2714+
* \sa ps_matrix_identity, ps_matrix_flip_y, ps_matrix_invert
27152715
*/
27162716
PEXPORT void PICAPI ps_matrix_flip_x(ps_matrix* matrix);
27172717

@@ -2721,7 +2721,7 @@ PEXPORT void PICAPI ps_matrix_flip_x(ps_matrix* matrix);
27212721
*
27222722
* \param matrix Pointer to an existing matrix object.
27232723
*
2724-
* \sa ps_matrix_reset, ps_matrix_flip_x, ps_matrix_invert
2724+
* \sa ps_matrix_identity, ps_matrix_flip_x, ps_matrix_invert
27252725
*/
27262726
PEXPORT void PICAPI ps_matrix_flip_y(ps_matrix* matrix);
27272727

src/picasso.def

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ EXPORTS
138138
ps_matrix_rotate
139139
ps_matrix_shear
140140
ps_matrix_invert
141-
ps_matrix_reset
141+
ps_matrix_identity
142142
ps_matrix_flip_x
143143
ps_matrix_flip_y
144144
ps_matrix_multiply

src/picasso_matrix_api.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ void PICAPI ps_matrix_flip_y(ps_matrix* matrix)
314314
global_status = STATUS_SUCCEED;
315315
}
316316

317-
void PICAPI ps_matrix_reset(ps_matrix* matrix)
317+
void PICAPI ps_matrix_identity(ps_matrix* matrix)
318318
{
319319
if (!picasso::is_valid_system_device()) {
320320
global_status = STATUS_DEVICE_ERROR;

wasm/export.list

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
_ps_matrix_rotate
136136
_ps_matrix_shear
137137
_ps_matrix_invert
138-
_ps_matrix_reset
138+
_ps_matrix_identity
139139
_ps_matrix_flip_x
140140
_ps_matrix_flip_y
141141
_ps_matrix_multiply

wasm/lib.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ class Matrix2D {
389389
this._ps_matrix_invert = _getExportWrapper(instance, 'ps_matrix_invert'); // USE
390390
this._ps_matrix_flip_x = _getExportWrapper(instance, 'ps_matrix_flip_x'); // USE
391391
this._ps_matrix_flip_y = _getExportWrapper(instance, 'ps_matrix_flip_y'); //USE
392-
this._ps_matrix_reset = _getExportWrapper(instance, 'ps_matrix_reset'); // USE
392+
this._ps_matrix_identity = _getExportWrapper(instance, 'ps_matrix_identity'); // USE
393393
this._ps_matrix_multiply= _getExportWrapper(instance, 'ps_matrix_multiply'); // USE
394394
this._ps_matrix_is_equal = _getExportWrapper(instance, 'ps_matrix_is_equal'); // USE
395395
this._ps_matrix_is_identity = _getExportWrapper(instance, 'ps_matrix_is_identity'); // USE
@@ -470,7 +470,7 @@ class Matrix2D {
470470
}
471471

472472
identity() {
473-
this._ps_matrix_reset(this._data);
473+
this._ps_matrix_identity(this._data);
474474
}
475475

476476
multiply(m) {

wasm/picasso.wasm

3 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)