7b8a808b7d
When closing a namespace a } is sufficient. It doesn't need to be }; like closing a class or enum. Within frameworks/base/libs/hwui there is a mix between } and }; when closing a namespace. There are even mixes between a .h and the corresponding .cpp files. In a separate CL I was asked to not close with };. That was a good comment. I adopted the style from nearby code. This CL cleans up the nearby code. Test: I made sure the code still built as expected. Change-Id: Ieb314a4f48d6e33752463f3be4361fdc9be97482
120 lines
3.0 KiB
C++
120 lines
3.0 KiB
C++
/*
|
|
* Copyright (C) 2010 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef ANDROID_HWUI_VECTOR_H
|
|
#define ANDROID_HWUI_VECTOR_H
|
|
|
|
#include <math.h>
|
|
#include <utils/Log.h>
|
|
|
|
namespace android {
|
|
namespace uirenderer {
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
// Classes
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
// MUST BE A POD - this means no ctor or dtor!
|
|
struct Vector2 {
|
|
float x;
|
|
float y;
|
|
|
|
float lengthSquared() const { return x * x + y * y; }
|
|
|
|
float length() const { return sqrt(x * x + y * y); }
|
|
|
|
void operator+=(const Vector2& v) {
|
|
x += v.x;
|
|
y += v.y;
|
|
}
|
|
|
|
void operator-=(const Vector2& v) {
|
|
x -= v.x;
|
|
y -= v.y;
|
|
}
|
|
|
|
void operator+=(const float v) {
|
|
x += v;
|
|
y += v;
|
|
}
|
|
|
|
void operator-=(const float v) {
|
|
x -= v;
|
|
y -= v;
|
|
}
|
|
|
|
void operator/=(float s) {
|
|
x /= s;
|
|
y /= s;
|
|
}
|
|
|
|
void operator*=(float s) {
|
|
x *= s;
|
|
y *= s;
|
|
}
|
|
|
|
Vector2 operator+(const Vector2& v) const { return (Vector2){x + v.x, y + v.y}; }
|
|
|
|
Vector2 operator-(const Vector2& v) const { return (Vector2){x - v.x, y - v.y}; }
|
|
|
|
Vector2 operator/(float s) const { return (Vector2){x / s, y / s}; }
|
|
|
|
Vector2 operator*(float s) const { return (Vector2){x * s, y * s}; }
|
|
|
|
void normalize() {
|
|
float s = 1.0f / length();
|
|
x *= s;
|
|
y *= s;
|
|
}
|
|
|
|
Vector2 copyNormalized() const {
|
|
Vector2 v = {x, y};
|
|
v.normalize();
|
|
return v;
|
|
}
|
|
|
|
float dot(const Vector2& v) const { return x * v.x + y * v.y; }
|
|
|
|
float cross(const Vector2& v) const { return x * v.y - y * v.x; }
|
|
|
|
void dump() { ALOGD("Vector2[%.2f, %.2f]", x, y); }
|
|
}; // class Vector2
|
|
|
|
// MUST BE A POD - this means no ctor or dtor!
|
|
class Vector3 {
|
|
public:
|
|
float x;
|
|
float y;
|
|
float z;
|
|
|
|
Vector3 operator+(const Vector3& v) const { return (Vector3){x + v.x, y + v.y, z + v.z}; }
|
|
|
|
Vector3 operator-(const Vector3& v) const { return (Vector3){x - v.x, y - v.y, z - v.z}; }
|
|
|
|
Vector3 operator/(float s) const { return (Vector3){x / s, y / s, z / s}; }
|
|
|
|
Vector3 operator*(float s) const { return (Vector3){x * s, y * s, z * s}; }
|
|
|
|
void dump(const char* label = "Vector3") const {
|
|
ALOGD("%s[%.2f, %.2f, %.2f]", label, x, y, z);
|
|
}
|
|
};
|
|
|
|
} // namespace uirenderer
|
|
} // namespace android
|
|
|
|
#endif // ANDROID_HWUI_VECTOR_H
|