"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "layer1/Ray.h" between
pymol-open-source-2.2.0.tar.gz and pymol-open-source-2.3.0.tar.gz

About: PyMOL is a Python-enhanced molecular graphics tool. It excels at 3D visualization of proteins, small molecules, density, surfaces, and trajectories. It also includes molecular editing, ray tracing, and movies. Open Source version.

Ray.h  (pymol-open-source-2.2.0)	:	Ray.h  (pymol-open-source-2.3.0)
skipping to change at line 20		skipping to change at line 20
H* -------------------------------------------------------------------		H* -------------------------------------------------------------------
I* Additional authors of this source file include:		I* Additional authors of this source file include:
-*		-*
-*		-*
-*		-*
Z* -------------------------------------------------------------------		Z* -------------------------------------------------------------------
*/		*/
#ifndef _H_Ray		#ifndef _H_Ray
#define _H_Ray		#define _H_Ray
		#include <vector>
#include"Base.h"		#include"Base.h"
#include"Basis.h"		#include"Basis.h"
#include"PyMOLGlobals.h"		#include"PyMOLGlobals.h"
		#include"Image.h"
#define cRayMaxBasis 10		#define cRayMaxBasis 10
typedef struct _CRayAntiThreadInfo CRayAntiThreadInfo;		typedef struct _CRayAntiThreadInfo CRayAntiThreadInfo;
typedef struct _CRayHashThreadInfo CRayHashThreadInfo;		typedef struct _CRayHashThreadInfo CRayHashThreadInfo;
typedef struct _CRayThreadInfo CRayThreadInfo;		typedef struct _CRayThreadInfo CRayThreadInfo;
CRay *RayNew(PyMOLGlobals * G, int antialias);		CRay *RayNew(PyMOLGlobals * G, int antialias);
void RayFree(CRay * I);		void RayFree(CRay * I);
void RayPrepare(CRay * I, float v0, float v1, float v2,		void RayPrepare(CRay * I, float v0, float v1, float v2,
skipping to change at line 90		skipping to change at line 93
int x1, y1, z1;		int x1, y1, z1;
int x2, y2, z2;		int x2, y2, z2;
int x3, y3, z3;		int x3, y3, z3;
int c;		int c;
int r;		int r;
} G3dPrimitive;		} G3dPrimitive;
G3dPrimitive *RayRenderG3d(CRay * I, int width, int height, float front,		G3dPrimitive *RayRenderG3d(CRay * I, int width, int height, float front,
float back, float fov, int quiet);		float back, float fov, int quiet);
		namespace cgo{
		namespace draw{
		class cylinder;
		class custom_cylinder;
		class custom_cylinder_alpha;
		}
		};
struct _CRay {		struct _CRay {
// methods		// methods
int sphere3fv(const float *v, float r);		int sphere3fv(const float *v, float r);
int cylinder3fv(const float *v1, const float *v2, float r, const float *c1, co		int cylinder3fv(const cgo::draw::cylinder &cyl);
nst float *c2);		int cylinder3fv(const cgo::draw::cylinder &cyl, const float alpha1, const floa
		t alpha2);
		int customCylinder3fv(const cgo::draw::custom_cylinder &cyl, const float alpha
		1, const float alpha2);
		int customCylinder3fv(const cgo::draw::custom_cylinder &cyl);
int customCylinder3fv(const float *v1, const float *v2, float r, const float * c1,		int customCylinder3fv(const float *v1, const float *v2, float r, const float * c1,
const float *c2, int cap1, int cap2);		const float *c2, const int cap1, const int cap2,
		const float alpha1, const float alpha2);
		int customCylinder3fv(const float *v1, const float *v2, float r, const float *
		c1,
		const float *c2, const int cap1, const int cap2);
		int customCylinderAlpha3fv(const cgo::draw::custom_cylinder_alpha &cyl);
int cone3fv(const float *v1, const float *v2, float r1, float r2, const float *c1,		int cone3fv(const float *v1, const float *v2, float r1, float r2, const float *c1,
const float *c2, int cap1, int cap2);		const float *c2, int cap1, int cap2);
int sausage3fv(const float *v1, const float *v2, float r, const float *c1, con st float *c2);		int sausage3fv(const float *v1, const float *v2, float r, const float *c1, con st float *c2);
void color3fv(const float *c);		void color3fv(const float *c);
int triangle3fv(		int triangle3fv(
const float *v1, const float *v2, const float *v3,		const float *v1, const float *v2, const float *v3,
const float *n1, const float *n2, const float *n3, const f loat *c1, const float *c2, const float *c3);		const float *n1, const float *n2, const float *n3, const f loat *c1, const float *c2, const float *c3);
int triangleTrans3fv(		int triangleTrans3fv(
const float *v1, const float *v2, const float *v3,		const float *v1, const float *v2, const float *v3,
const float *n1, const float *n2, const float *n3,		const float *n1, const float *n2, const float *n3,
skipping to change at line 153		skipping to change at line 171
int Ortho;		int Ortho;
float min_box[3];		float min_box[3];
float max_box[3];		float max_box[3];
int Sampling;		int Sampling;
float PixelRatio;		float PixelRatio;
float Magnified; /* ray pixels to screen pixels */		float Magnified; /* ray pixels to screen pixels */
float FrontBackRatio;		float FrontBackRatio;
double PrimSize;		double PrimSize;
int PrimSizeCnt;		int PrimSizeCnt;
float Fov, Pos[3];		float Fov, Pos[3];
unsigned char *bkgrd_data;		std::shared_ptr<pymol::Image> bkgrd_data;
int bkgrd_width, bkgrd_height;
		private:
		int cylinder3fv(const float *v1, const float *v2, float r, const float *c1, co
		nst float *c2,
		const float alpha1, const float alpha2);
};		};
void RayGetScreenVertex(CRay * I, float *v, float *dest);		void RayGetScreenVertex(CRay * I, float *v, float *dest);
float RayGetScreenVertexScale(CRay * I, float *v1);		float RayGetScreenVertexScale(CRay * I, float *v1);
void RayAdjustZtoScreenZ(CRay * ray, float *pos, float z);		void RayAdjustZtoScreenZ(CRay * ray, float *pos, float z);
void RayAdjustZtoScreenZofPoint(CRay * ray, float *pos, float *zpoint);		void RayAdjustZtoScreenZofPoint(CRay * ray, float *pos, float *zpoint);
void RaySetPointToWorldScreenRelative(CRay * ray, float *pos, float *screenPt);		void RaySetPointToWorldScreenRelative(CRay * ray, float *pos, float *screenPt);
float RayGetScaledAllAxesAtPoint(CRay * I, float *pt, float *xn, float *yn, floa t *zn);		float RayGetScaledAllAxesAtPoint(CRay * I, float *pt, float *xn, float *yn, floa t *zn);
float* RayGetProMatrix(CRay * I);		float* RayGetProMatrix(CRay * I);
End of changes. 6 change blocks.
5 lines changed or deleted		29 lines changed or added

---