8cab401d08
-=-=-=-=-=-=-=-=-=-=-=-=-=-
3D Physics:
-Fixed "Bounce" parameter in 3D
-Fixed bug affecting Area (sometims it would not detect properly)
-Vehicle Body has seen heavy work
-Added Query API for doing space queries in 3D. Needs some docs though.
-Added JOINTS! Adapted Bullet Joints: and created easy gizmos for setting them up:
-PinJoint
-HingeJoint (with motor)
-SliderJoint
-ConeTwistJoint
-Generic6DOFJoint
-Added OBJECT PICKING! based on the new query API. Any physics object now (Area or Body) has the following signals and virtual functions:
-input_event (mouse or multitouch input over the body)
-mouse_enter (mouse entered the body area)
-mouse_exit (mouse exited body area)
For Area it needs to be activated manually, as it isn't by default (ray goes thru).
Other:
-Begun working on Windows 8 (RT) port. Compiles but does not work yet.
-Added TheoraPlayer library for improved to-texture and portable video support.
-Fixed a few bugs in the renderer, collada importer, collada exporter, etc.
128 lines
3.2 KiB
C++
128 lines
3.2 KiB
C++
//
|
|
// Copyright (c) 2013-2014 The ANGLE Project Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
//
|
|
// ShaderVars.h:
|
|
// Types to represent GL variables (varyings, uniforms, etc)
|
|
//
|
|
|
|
#ifndef _COMPILER_INTERFACE_VARIABLES_
|
|
#define _COMPILER_INTERFACE_VARIABLES_
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
#include <algorithm>
|
|
|
|
// Assume ShaderLang.h is included before ShaderVars.h, for sh::GLenum
|
|
|
|
namespace sh
|
|
{
|
|
|
|
// Varying interpolation qualifier, see section 4.3.9 of the ESSL 3.00.4 spec
|
|
enum InterpolationType
|
|
{
|
|
INTERPOLATION_SMOOTH,
|
|
INTERPOLATION_CENTROID,
|
|
INTERPOLATION_FLAT
|
|
};
|
|
|
|
// Uniform block layout qualifier, see section 4.3.8.3 of the ESSL 3.00.4 spec
|
|
enum BlockLayoutType
|
|
{
|
|
BLOCKLAYOUT_STANDARD,
|
|
BLOCKLAYOUT_PACKED,
|
|
BLOCKLAYOUT_SHARED
|
|
};
|
|
|
|
// Base class for all variables defined in shaders, including Varyings, Uniforms, etc
|
|
// Note: we must override the copy constructor and assignment operator so we can
|
|
// work around excessive GCC binary bloating:
|
|
// See https://code.google.com/p/angleproject/issues/detail?id=697
|
|
struct ShaderVariable
|
|
{
|
|
ShaderVariable();
|
|
ShaderVariable(GLenum typeIn, unsigned int arraySizeIn);
|
|
~ShaderVariable();
|
|
ShaderVariable(const ShaderVariable &other);
|
|
ShaderVariable &operator=(const ShaderVariable &other);
|
|
|
|
bool isArray() const { return arraySize > 0; }
|
|
unsigned int elementCount() const { return std::max(1u, arraySize); }
|
|
|
|
GLenum type;
|
|
GLenum precision;
|
|
std::string name;
|
|
std::string mappedName;
|
|
unsigned int arraySize;
|
|
bool staticUse;
|
|
};
|
|
|
|
struct Uniform : public ShaderVariable
|
|
{
|
|
Uniform();
|
|
~Uniform();
|
|
Uniform(const Uniform &other);
|
|
Uniform &operator=(const Uniform &other);
|
|
|
|
bool isStruct() const { return !fields.empty(); }
|
|
|
|
std::vector<Uniform> fields;
|
|
};
|
|
|
|
struct Attribute : public ShaderVariable
|
|
{
|
|
Attribute();
|
|
~Attribute();
|
|
Attribute(const Attribute &other);
|
|
Attribute &operator=(const Attribute &other);
|
|
|
|
int location;
|
|
};
|
|
|
|
struct InterfaceBlockField : public ShaderVariable
|
|
{
|
|
InterfaceBlockField();
|
|
~InterfaceBlockField();
|
|
InterfaceBlockField(const InterfaceBlockField &other);
|
|
InterfaceBlockField &operator=(const InterfaceBlockField &other);
|
|
|
|
bool isStruct() const { return !fields.empty(); }
|
|
|
|
bool isRowMajorMatrix;
|
|
std::vector<InterfaceBlockField> fields;
|
|
};
|
|
|
|
struct Varying : public ShaderVariable
|
|
{
|
|
Varying();
|
|
~Varying();
|
|
Varying(const Varying &other);
|
|
Varying &operator=(const Varying &other);
|
|
|
|
bool isStruct() const { return !fields.empty(); }
|
|
|
|
InterpolationType interpolation;
|
|
std::vector<Varying> fields;
|
|
std::string structName;
|
|
};
|
|
|
|
struct InterfaceBlock
|
|
{
|
|
InterfaceBlock();
|
|
~InterfaceBlock();
|
|
InterfaceBlock(const InterfaceBlock &other);
|
|
InterfaceBlock &operator=(const InterfaceBlock &other);
|
|
|
|
std::string name;
|
|
std::string mappedName;
|
|
unsigned int arraySize;
|
|
BlockLayoutType layout;
|
|
bool isRowMajorLayout;
|
|
bool staticUse;
|
|
std::vector<InterfaceBlockField> fields;
|
|
};
|
|
|
|
}
|
|
|
|
#endif // _COMPILER_INTERFACE_VARIABLES_
|