Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(335)

Unified Diff: src/core/SkPoint3.h

Issue 1304673002: Revert "Update SkLightingShader to support rotation" (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkLightingShader.cpp ('k') | src/core/SkPoint3.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkPoint3.h
diff --git a/src/core/SkPoint3.h b/src/core/SkPoint3.h
deleted file mode 100644
index af24a8df58eac82c5987d7540f43e089df2bf87e..0000000000000000000000000000000000000000
--- a/src/core/SkPoint3.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkPoint3_DEFINED
-#define SkPoint3_DEFINED
-
-#include "SkScalar.h"
-
-struct SK_API SkPoint3 {
- SkScalar fX, fY, fZ;
-
- static SkPoint3 Make(SkScalar x, SkScalar y, SkScalar z) {
- SkPoint3 pt;
- pt.set(x, y, z);
- return pt;
- }
-
- SkScalar x() const { return fX; }
- SkScalar y() const { return fY; }
- SkScalar z() const { return fZ; }
-
- void set(SkScalar x, SkScalar y, SkScalar z) { fX = x; fY = y; fZ = z; }
-
- friend bool operator==(const SkPoint3& a, const SkPoint3& b) {
- return a.fX == b.fX && a.fY == b.fY && a.fZ == b.fZ;
- }
-
- friend bool operator!=(const SkPoint3& a, const SkPoint3& b) {
- return !(a == b);
- }
-
- /** Returns the Euclidian distance from (0,0,0) to (x,y,z)
- */
- static SkScalar Length(SkScalar x, SkScalar y, SkScalar z);
-
- /** Return the Euclidian distance from (0,0,0) to the point
- */
- SkScalar length() const { return SkPoint3::Length(fX, fY, fZ); }
-
- /** Set the point (vector) to be unit-length in the same direction as it
- already points. If the point has a degenerate length (i.e., nearly 0)
- then set it to (0,0,0) and return false; otherwise return true.
- */
- bool normalize();
-
- /** Return a new point whose X, Y and Z coordinates are scaled.
- */
- SkPoint3 makeScale(SkScalar scale) const {
- SkPoint3 p;
- p.set(scale * fX, scale * fY, scale * fZ);
- return p;
- }
-
- /** Scale the point's coordinates by scale.
- */
- void scale(SkScalar value) {
- fX *= value;
- fY *= value;
- fZ *= value;
- }
-
- /** Return a new point whose X, Y and Z coordinates are the negative of the
- original point's
- */
- SkPoint3 operator-() const {
- SkPoint3 neg;
- neg.fX = -fX;
- neg.fY = -fY;
- neg.fZ = -fZ;
- return neg;
- }
-
- /** Returns a new point whose coordinates are the difference between
- a and b (i.e., a - b)
- */
- friend SkPoint3 operator-(const SkPoint3& a, const SkPoint3& b) {
- SkPoint3 v;
- v.set(a.fX - b.fX, a.fY - b.fY, a.fZ - b.fZ);
- return v;
- }
-
- /** Returns a new point whose coordinates are the sum of a and b (a + b)
- */
- friend SkPoint3 operator+(const SkPoint3& a, const SkPoint3& b) {
- SkPoint3 v;
- v.set(a.fX + b.fX, a.fY + b.fY, a.fZ + b.fZ);
- return v;
- }
-
- /** Add v's coordinates to the point's
- */
- void operator+=(const SkPoint3& v) {
- fX += v.fX;
- fY += v.fY;
- fZ += v.fZ;
- }
-
- /** Subtract v's coordinates from the point's
- */
- void operator-=(const SkPoint3& v) {
- fX -= v.fX;
- fY -= v.fY;
- fZ -= v.fZ;
- }
-
- /** Returns the dot product of a and b, treating them as 3D vectors
- */
- static SkScalar DotProduct(const SkPoint3& a, const SkPoint3& b) {
- return a.fX * b.fX + a.fY * b.fY + a.fZ * b.fZ;
- }
-
- SkScalar dot(const SkPoint3& vec) const {
- return DotProduct(*this, vec);
- }
-};
-
-typedef SkPoint3 SkVector3;
-typedef SkPoint3 SkColor3f;
-
-#endif
« no previous file with comments | « src/core/SkLightingShader.cpp ('k') | src/core/SkPoint3.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698