Просмотр исходного кода

Changed private members to protected in non-manager classes.

Ivan Safrin 14 лет назад
Родитель
Сommit
67e5654afc

+ 1 - 1
.gitignore

@@ -30,7 +30,7 @@
 *.opensdf
 *.xcuserstate
 *.xcworkspace
-*.origxcuserdata
+*.xcuserdata
 
 Core/Build/Mac\ OS\ X/build
 IDE/Build/Mac\ OS\ X/build

+ 1 - 1
Core/Contents/Include/PolyAGLCore.h

@@ -89,7 +89,7 @@ namespace Polycode {
 		
 		vector<OSXEvent> osxEvents;
 		
-	private:
+	protected:
 		
 		
 		uint64_t initTime;

+ 1 - 1
Core/Contents/Include/PolyCamera.h

@@ -122,7 +122,7 @@ namespace Polycode {
 			Material *getScreenShaderMaterial() { return filterShaderMaterial; }
 			
 			
-		private:
+		protected:
 		
 			Number exposureLevel;
 			bool orthoMode;

+ 1 - 1
Core/Contents/Include/PolyCocoaCore.h

@@ -107,7 +107,7 @@ namespace Polycode {
 		
 		NSOpenGLContext *context;
 		
-	private:	
+	protected:	
 		PolycodeView *glView;
 		
 		uint64_t initTime;		

+ 1 - 1
Core/Contents/Include/PolyColor.h

@@ -171,7 +171,7 @@ namespace Polycode {
 			* Alpha value.
 			*/			
 			Number a;
-		private:
+		protected:
 	
 	};
 

+ 1 - 1
Core/Contents/Include/PolyEventHandler.h

@@ -50,7 +50,7 @@ namespace Polycode {
 		void *secondaryHandlerData;
 		
 		
-		private:
+		protected:
 	
 	};
 }

+ 1 - 1
Core/Contents/Include/PolyFont.h

@@ -42,7 +42,7 @@ namespace Polycode {
 			bool isValid();
 			
 			bool loaded;
-		private:
+		protected:
 			unsigned char *buffer;
 			bool valid;
 			FT_Face ftFace;

+ 1 - 1
Core/Contents/Include/PolyGLCubemap.h

@@ -51,7 +51,7 @@ namespace Polycode {
 		
 		GLuint getTextureID();		
 			
-	private:
+	protected:
 		
 		int filteringMode;
 		GLuint textureID;

+ 1 - 1
Core/Contents/Include/PolyGLES1Renderer.h

@@ -128,7 +128,7 @@ namespace Polycode {
 		void clearShader();
 		void applyMaterial(Material *material,  ShaderBinding *localOptions, unsigned int shaderIndex);
 		
-	private:
+	protected:
 				
 		GLuint defaultFramebuffer, colorRenderbuffer;		
 		

+ 1 - 1
Core/Contents/Include/PolyGLVertexBuffer.h

@@ -54,7 +54,7 @@ namespace Polycode {
 		GLuint getNormalBufferID();
 		GLuint getColorBufferID();
 		
-	private:
+	protected:
 		
 		GLuint vertexBufferID;
 		GLuint texCoordBufferID;

+ 1 - 1
Core/Contents/Include/PolyLabel.h

@@ -53,7 +53,7 @@ namespace Polycode {
 			static const int ANTIALIAS_FULL = 0;
 			static const int ANTIALIAS_NONE = 1;
 			
-		private:
+		protected:
 
 			Number currentTextWidth;
 			Number currentTextHeight;

+ 1 - 1
Core/Contents/Include/PolyMesh.h

@@ -330,7 +330,7 @@ namespace Polycode {
 			*/
 			bool useVertexColors;
 		
-		private:
+		protected:
 					
 		VertexBuffer *vertexBuffer;
 		bool meshHasVertexBuffer;

+ 1 - 1
Core/Contents/Include/PolyPerlin.h

@@ -57,7 +57,7 @@ public:
 		return perlin_noise_2D(vec);
 	};
 
-private:
+protected:
   void init_perlin(int n,Number p);
   Number perlin_noise_2D(Number vec[2]);
 

+ 1 - 1
Core/Contents/Include/PolyPolygon.h

@@ -123,7 +123,7 @@ namespace Polycode {
 			*/
 			void flipUVY();
 						
-		private:
+		protected:
 		
 			unsigned int vertexCount;
 			vector<Vertex*> vertices;

+ 1 - 1
Core/Contents/Include/PolyQuaternionCurve.h

@@ -49,7 +49,7 @@ namespace Polycode {
 			void generatePointsFromCurves(BezierCurve *wCurve, BezierCurve *xCurve, BezierCurve *yCurve, BezierCurve *zCurve);
 			void recalcTangents(void);
 		
-		private:
+		protected:
 		
 			vector<QuatTriple> tPoints;
 			vector<Quaternion> points;			

+ 1 - 1
Core/Contents/Include/PolySceneLight.h

@@ -186,7 +186,7 @@ namespace Polycode {
 		
 			SceneEntity *lightShape;
 			
-		private:
+		protected:
 		
 			Number spotlightExponent;
 			Number spotlightCutoff;

+ 1 - 1
Core/Contents/Include/PolySceneLine.h

@@ -44,7 +44,7 @@ namespace Polycode {
 			
 			void Render();
 			
-		private:		
+		protected:		
 		
 			Mesh *mesh;
 		

+ 1 - 1
Core/Contents/Include/PolyScenePrimitive.h

@@ -75,7 +75,7 @@ namespace Polycode {
 			static const int TYPE_TORUS = 6;			
 
 		
-		private:
+		protected:
 		
 	};
 	

+ 1 - 1
Core/Contents/Include/PolyScreenImage.h

@@ -73,7 +73,7 @@ namespace Polycode {
 		*/ 		
 		Number getImageHeight();
 		
-		private:
+		protected:
 
 		Number imageWidth;
 		Number imageHeight;

+ 1 - 1
Core/Contents/Include/PolyScreenSprite.h

@@ -71,7 +71,7 @@ class _PolyExport ScreenSprite : public ScreenShape
 		void playAnimation(String name, int startFrame, bool once);
 		void Update();
 		
-	private:
+	protected:
 	
 		Number spriteWidth;
 		Number spriteHeight;

+ 2 - 2
Core/Contents/Include/PolySkeleton.h

@@ -124,7 +124,7 @@ namespace Polycode {
 			*/					
 			void setSpeed(Number speed);
 			
-		private:
+		protected:
 			
 			String name;
 			Number duration;
@@ -211,7 +211,7 @@ namespace Polycode {
 			*/
 			SkeletonAnimation *getCurrentAnimation() { return currentAnimation; }
 		
-		private:
+		protected:
 		
 			SceneEntity *bonesEntity;
 		

+ 1 - 1
Core/Contents/Include/PolySound.h

@@ -110,7 +110,7 @@ namespace Polycode {
 		static unsigned long readByte32(const unsigned char buffer[4]);		
 		static unsigned short readByte16(const unsigned char buffer[2]);
 
-	private:
+	protected:
 	
 		bool isPositional;
 		ALuint soundSource;

+ 1 - 1
Core/Contents/Include/PolySoundManager.h

@@ -56,7 +56,7 @@ namespace Polycode {
 		void setGlobalVolume(Number globalVolume);
 		
 		
-	private:
+	protected:
 		
 		ALCdevice* device;
 		ALCcontext* context;		

+ 1 - 1
Core/Contents/Include/PolyString.h

@@ -229,7 +229,7 @@ namespace Polycode {
 			static const int ENCODING_UTF8 = 0; 
 			
 		
-		private:
+		protected:
 		
 	};
 

+ 1 - 1
Core/Contents/Include/PolyTimer.h

@@ -71,7 +71,7 @@ namespace Polycode {
 
 		static const int EVENT_TRIGGER = 0;
 		
-		private:
+		protected:
 			
 			int elapsed;
 			bool paused;

+ 1 - 1
Core/Contents/Include/PolyTween.h

@@ -149,7 +149,7 @@ namespace Polycode {
 							BezierCurve *zCurve, int easeType, Number time, bool repeat=false);
 			~QuaternionTween();
 			void updateCustomTween();
-		private:
+		protected:
 			Number pathValue;
 			Tween *pathTween;
 			QuaternionCurve	*quatCurve;

+ 1 - 1
Core/Contents/Include/PolyVector2.h

@@ -46,7 +46,7 @@ namespace Polycode {
 			Vector2(Number x, Number y);
 			virtual ~Vector2();
 					
-		private:
+		protected:
 
 	};
 }

+ 1 - 1
Core/Contents/Include/PolyVector3.h

@@ -180,7 +180,7 @@ namespace Polycode {
 			*/			
 			Number z;			
 			
-		private:
+		protected:
 
 	};
 }

+ 1 - 1
Core/Contents/Include/PolyVertex.h

@@ -181,7 +181,7 @@ namespace Polycode {
 			
 			bool useVertexColor;
 				
-		private:
+		protected:
 		
 			vector <BoneAssignment*> boneAssignments;
 			Vector2 texCoord;