Changes: - fixed some bugs - improved view control - added show/hide of objects - added wireframe/rendered

Fork: 0

x-way / cg

Browse code Changes: - fixed some bugs - improved view control - added show/hide of objects - added wireframe/rendered - added fog (needs testing!!!) master
1 parent cf2787f commit 00dfdb20ed7feaed624d45c6ffe50e977ba0a677 glproj03 authored on 31 Jan 2006

Patch

Unified Split

Showing 7 changed files

                Ignore Space
               Show notes
              View
            
          
          3 ■■■■■
          include/animation.h
 		int mouseX;
		int mouseY;
		float speed;
		int current;
		int colorpt;
		std::vector<Color*> colors;
		std::vector<Thing*> things;
		int kbdlock;
		bool showNormals;
		bool showMe;
		UserAnimation();
		UserAnimation(Thing* t);
		UserAnimation(std::vector<Thing*> ths);
		void addThing(Thing* t);
		void addColor(Color* t);
		void init();
		void tick();
};
 		int mouseX;
 		int mouseY;
 		float speed;
 		int current;
+		int colorpt;
+		std::vector<Color*> colors;
 		std::vector<Thing*> things;
 		int kbdlock;
 		bool showNormals;
 		bool showMe;
 		UserAnimation();
 		UserAnimation(Thing* t);
 		UserAnimation(std::vector<Thing*> ths);
 		void addThing(Thing* t);
+		void addColor(Color* t);
 		void init();
 		void tick();
 };

                Ignore Space
               Show notes
              View
            
          
          5 ■■■■■
          include/model.h
 		Vec* position;
		Vec* rotation;
 
		float delta;
 
		bool drawMe;
 
	public:
		Model();
		Model(std::vector<Poly*> & _faces);
		float getDelta();
		void showNormals();
		void hideNormals();
		Model* clone();
		void setColor(Color* c);
		void show();
		void hide();
};
#endif
 		Vec* position;
 		Vec* rotation;
 		float delta;
+		bool drawMe;
 	public:
 		Model();
 		Model(std::vector<Poly*> & _faces);
 		float getDelta();
 		void showNormals();
 		void hideNormals();
 		Model* clone();
+		void setColor(Color* c);
+		void show();
+		void hide();
 };
 #endif

Ignore Space Show notes View include/thing.h

Ignore Space Show notes View sources/animation.cpp

Ignore Space Show notes View sources/main.cpp

Ignore Space Show notes View sources/model.cpp

Ignore Space Show notes View sources/thing.cpp

Show line notes below