Attachment #128983 for bug #185580




DSRC=$(shell find src -name "*.d")
SOURCES=$(DSRC) import/SDL_video.d import/SDL_mixer.d
OBJS=$(SOURCES:.d=.o)
CFLAGS=
DFLAGS=-O -debug -Iimport -Isrc -I/usr/X11R6/include/
EXE=projectL


all: $(EXE)

$(EXE): import/SDL_keysym.d $(OBJS) 
	gcc $(CFLAGS) -o $@ $(OBJS) -lbulletml_d -L/usr/local/lib -L/usr/lib -lgphobos -lpthread -lGLU -lGL -lglut -lm -lstdc++ -lSDL -lSDL_mixer

$(OBJS): %.o: %.d
	gdmd -d -c -of$@ $(DFLAGS) $<

clean: 	rm src/*.o
	rm src/br/*.o
	rm src/util/*.o
	rm src/util/sdl/*.o
	rm -r import/*.o

Lines 6-13 Link Here

(-)projectL_1001/src/br/boot.d (-2 / +18 lines)
6	private Key key;	6	private Key key;
7		7
8		8
9	private:	9	version (Win32_release) {
10	import std.c.windows.windows;	10	// Boot as the Windows executable.
		11	private import std.c.windows.windows;
		12	private import std.string;
11		13
12	extern (C) void gc_init();	14	extern (C) void gc_init();
13	extern (C) void gc_term();	15	extern (C) void gc_term();
Lines 37-42 Link Here
37	gc_term();	39	gc_term();
38	return result;	40	return result;
39	}	41	}
		42	} else {
		43	// Boot as the general executable.
		44	public int main(char[][] args) {
		45	return boot(args);
		46	}
		47	}
		48
		49	public int boot(char[][] args) {
		50	double d;
		51	key = new Key();
		52	mainloop = new Mainloop(key);
		53	mainloop.loop();
		54	return 0;
		55	}
40		56
41	int user_start(){	57	int user_start(){
42	double d;	58	double d;

Lines 1-5 Link Here

(-)projectL_1001/src/br/enemy.d (-2 / +2 lines)
1	module br.enemy;	1	module br.enemy;
2	private import str = std.string;	2	private import std.string;
3	private import util.parts;	3	private import util.parts;
4	private import util.shape;	4	private import util.shape;
5	private import util.vector;	5	private import util.vector;
Lines 182-188 Link Here
182	case collisionManager.kind.SWORD:	182	case collisionManager.kind.SWORD:
183		183
184	double d;	184	double d;
185	d = 1.0;//0.5 + 0.6 * fmin(1.0 ,fmax(0.0 ,(ship.laserSpeed - ship.laserMinSpeed) / (ship.laserMaxSpeed - ship.laserMinSpeed)));	185	d = 0.5 + 0.6 * fmin(1.0 ,fmax(0.0 ,(ship.laserSpeed - ship.laserMinSpeed) / (ship.laserMaxSpeed - ship.laserMinSpeed)));
186	if(vincible){	186	if(vincible){
187	hp = hp - d;//fmax(ceil(hp-1.0) ,hp - d);	187	hp = hp - d;//fmax(ceil(hp-1.0) ,hp - d);
188	if(hp <= 0)destroy();	188	if(hp <= 0)destroy();




module br.enemyImpl;
private import std.string;
private import util.basis;
private import util.parts;
private import util.shape;

		
		
		for(int i = 0;i < 5;i ++){
			char[] rw0 = "rWing_"~std.string.toString(i)~"_"~std.string.toString(0);
			char[] rw1 = "rWing_"~std.string.toString(i)~"_"~std.string.toString(1);
			char[] rw2 = "rWing_"~std.string.toString(i)~"_"~std.string.toString(2);
			char[] rw3 = "rWing_"~std.string.toString(i)~"_"~std.string.toString(3);
			char[] lw0 = "lWing_"~std.string.toString(i)~"_"~std.string.toString(0);
			char[] lw1 = "lWing_"~std.string.toString(i)~"_"~std.string.toString(1);
			char[] lw2 = "lWing_"~std.string.toString(i)~"_"~std.string.toString(2);
			char[] lw3 = "lWing_"~std.string.toString(i)~"_"~std.string.toString(3);
			p = new EnemyAppend(Wing.getShape() ,30 ,-1);//p = new Wing();
			(cast(Enemy)p).disableBorder();
			//partsManager.add(append);

		
		
		for(int i = 1;i < 4;i ++){
			char[] t1 = "tail_"~std.string.toString(i-1);
			char[] t2 = "tail_"~std.string.toString(i);
			p = new EnemyAppend(Tail.getShape() ,30 ,-1);//p = new Tail();
			(cast(Enemy)p).disableBorder();
			childHash[t1].addChild(p ,t2 ,60 ,ENGAGED);

		
		
		for(int i = 0;i < 5;i ++){
			char[] rw0 = "rWing_"~std.string.toString(i)~"_"~std.string.toString(0);
			char[] rw1 = "rWing_"~std.string.toString(i)~"_"~std.string.toString(1);
			char[] rw2 = "rWing_"~std.string.toString(i)~"_"~std.string.toString(2);
			char[] lw0 = "lWing_"~std.string.toString(i)~"_"~std.string.toString(0);
			char[] lw1 = "lWing_"~std.string.toString(i)~"_"~std.string.toString(1);
			char[] lw2 = "lWing_"~std.string.toString(i)~"_"~std.string.toString(2);
			p = new Append(Wing.getShape() ,30);//p = new Wing();
			//partsManager.add(append);
			childHash["rWingBase"].addChild(p ,rw0 ,60 ,ENGAGED ,matRotateX(90) * matRotateZ(30 * (i - 2)) * matRotateX(-20) );

		
		
		for(int i = 1;i < 5;i ++){
			char[] t1 = "tail_"~std.string.toString(i-1);
			char[] t2 = "tail_"~std.string.toString(i);
			p = new Append(Tail.getShape() ,30);//p = new Tail();
			childHash[t1].addChild(p ,t2 ,60 ,ENGAGED);
			//append2 = append;





private import SDL_mixer;
private import opengl;
private import std.string;
private import std.math;
private import util.parts;
private import util.key;

		int reload;
		double gradient;
		int cPressed;
		double predegAim;
//		Vector3[100] rpos0;
//		Matrix[100] rpose0;
	}

		size =  20;
		collisionRange = 10;
		R = 1.0;G =0.88;B = 0.7;alpha = 1.5;
		
		
		pressing = 0;
		reload = 0;

			slow = false;
		}else slow = true;
		*/
		if(pressing > 5)speed = 5.0;
		else speed = 8.0;
		if(sword)speed = 6.8;
		else speed = 6.8;
		
		
		int dir = key.getDirState();
		int aim = 5;
		//Vector aim = new Vector(0,0);

				case 9:degAim=-45.0;	break;
				case 5:
				default:
				degAim = predegAim;
				moved = false;
				break;
		}
		
		if(childHash["laserGun"] !is null){
			(cast(Beam)childHash["laserGun"]).setAim(degAim ,moved);
		}
		
		if(pos.y < screen.GAME_DOWN + size)pos.y = screen.GAME_DOWN + size;

		length = 1000;
		drawDist = 1;
		rootLength = 10;
		minSpeed = 4.0;maxSpeed = 8.0;accSpeed = 0.4;
		collisionManager.add(this, collisionManager.kind.LASER ,1 );
	}
	public void move(){

		length = 300;
		drawDist = 1;
		rootLength = 100;
		minSpeed = 5.0;maxSpeed = 20.0;accSpeed = 1.0;
		collisionManager.add(this, collisionManager.kind.SWORD ,1 );
	}
	public void move(){

	}
	public void setColor(double R ,double G ,double B ,double alpha){}
	public override void reportCollision(int kind){
//		speed = fmax(0.0 ,speed - 1.0);
		//drawing = WIRE;
		
		

Lines 114-120 Link Here

(-)projectL_1001/src/util/ascii.d (-2 / +2 lines)
114	default:break;	114	default:break;
115	}	115	}
116	foreach(int b;bars){	116	foreach(int b;bars){
117	bar[b] = true;	117	// bar[b] = true;
118	}	118	}
119	drawCrossBar(x ,y+20*scale ,scale ,bar[0]);	119	drawCrossBar(x ,y+20*scale ,scale ,bar[0]);
120	drawVerticalBar(x-10scale ,y+10scale ,scale ,bar[1]);	120	drawVerticalBar(x-10scale ,y+10scale ,scale ,bar[1]);
Lines 304-307 Link Here
304	glEnd();	304	glEnd();
305		305
306	glPopMatrix();	306	glPopMatrix();
307	}	307	}

Return to bug 185580

Lines 1-5 Link Here

(-)projectL_1001/src/br/enemyImpl.d (-19 / +19 lines)
1	module br.enemyImpl;	1	module br.enemyImpl;
2	private import str = std.string;	2	private import std.string;
3	private import util.basis;	3	private import util.basis;
4	private import util.parts;	4	private import util.parts;
5	private import util.shape;	5	private import util.shape;
Lines 2465-2478 Link Here
2465		2465
2466		2466
2467	for(int i = 0;i < 5;i ++){	2467	for(int i = 0;i < 5;i ++){
2468	char[] rw0 = "rWing_"~str.toString(i)~"_"~str.toString(0);	2468	char[] rw0 = "rWing_"~std.string.toString(i)~"_"~std.string.toString(0);
2469	char[] rw1 = "rWing_"~str.toString(i)~"_"~str.toString(1);	2469	char[] rw1 = "rWing_"~std.string.toString(i)~"_"~std.string.toString(1);
2470	char[] rw2 = "rWing_"~str.toString(i)~"_"~str.toString(2);	2470	char[] rw2 = "rWing_"~std.string.toString(i)~"_"~std.string.toString(2);
2471	char[] rw3 = "rWing_"~str.toString(i)~"_"~str.toString(3);	2471	char[] rw3 = "rWing_"~std.string.toString(i)~"_"~std.string.toString(3);
2472	char[] lw0 = "lWing_"~str.toString(i)~"_"~str.toString(0);	2472	char[] lw0 = "lWing_"~std.string.toString(i)~"_"~std.string.toString(0);
2473	char[] lw1 = "lWing_"~str.toString(i)~"_"~str.toString(1);	2473	char[] lw1 = "lWing_"~std.string.toString(i)~"_"~std.string.toString(1);
2474	char[] lw2 = "lWing_"~str.toString(i)~"_"~str.toString(2);	2474	char[] lw2 = "lWing_"~std.string.toString(i)~"_"~std.string.toString(2);
2475	char[] lw3 = "lWing_"~str.toString(i)~"_"~str.toString(3);	2475	char[] lw3 = "lWing_"~std.string.toString(i)~"_"~std.string.toString(3);
2476	p = new EnemyAppend(Wing.getShape() ,30 ,-1);//p = new Wing();	2476	p = new EnemyAppend(Wing.getShape() ,30 ,-1);//p = new Wing();
2477	(cast(Enemy)p).disableBorder();	2477	(cast(Enemy)p).disableBorder();
2478	//partsManager.add(append);	2478	//partsManager.add(append);
Lines 2510-2517 Link Here
2510		2510
2511		2511
2512	for(int i = 1;i < 4;i ++){	2512	for(int i = 1;i < 4;i ++){
2513	char[] t1 = "tail_"~str.toString(i-1);	2513	char[] t1 = "tail_"~std.string.toString(i-1);
2514	char[] t2 = "tail_"~str.toString(i);	2514	char[] t2 = "tail_"~std.string.toString(i);
2515	p = new EnemyAppend(Tail.getShape() ,30 ,-1);//p = new Tail();	2515	p = new EnemyAppend(Tail.getShape() ,30 ,-1);//p = new Tail();
2516	(cast(Enemy)p).disableBorder();	2516	(cast(Enemy)p).disableBorder();
2517	childHash[t1].addChild(p ,t2 ,60 ,ENGAGED);	2517	childHash[t1].addChild(p ,t2 ,60 ,ENGAGED);
Lines 4553-4564 Link Here
4553		4553
4554		4554
4555	for(int i = 0;i < 5;i ++){	4555	for(int i = 0;i < 5;i ++){
4556	char[] rw0 = "rWing_"~str.toString(i)~"_"~str.toString(0);	4556	char[] rw0 = "rWing_"~std.string.toString(i)~"_"~std.string.toString(0);
4557	char[] rw1 = "rWing_"~str.toString(i)~"_"~str.toString(1);	4557	char[] rw1 = "rWing_"~std.string.toString(i)~"_"~std.string.toString(1);
4558	char[] rw2 = "rWing_"~str.toString(i)~"_"~str.toString(2);	4558	char[] rw2 = "rWing_"~std.string.toString(i)~"_"~std.string.toString(2);
4559	char[] lw0 = "lWing_"~str.toString(i)~"_"~str.toString(0);	4559	char[] lw0 = "lWing_"~std.string.toString(i)~"_"~std.string.toString(0);
4560	char[] lw1 = "lWing_"~str.toString(i)~"_"~str.toString(1);	4560	char[] lw1 = "lWing_"~std.string.toString(i)~"_"~std.string.toString(1);
4561	char[] lw2 = "lWing_"~str.toString(i)~"_"~str.toString(2);	4561	char[] lw2 = "lWing_"~std.string.toString(i)~"_"~std.string.toString(2);
4562	p = new Append(Wing.getShape() ,30);//p = new Wing();	4562	p = new Append(Wing.getShape() ,30);//p = new Wing();
4563	//partsManager.add(append);	4563	//partsManager.add(append);
4564	childHash["rWingBase"].addChild(p ,rw0 ,60 ,ENGAGED ,matRotateX(90) * matRotateZ(30 * (i - 2)) * matRotateX(-20) );	4564	childHash["rWingBase"].addChild(p ,rw0 ,60 ,ENGAGED ,matRotateX(90) * matRotateZ(30 * (i - 2)) * matRotateX(-20) );
Lines 4580-4587 Link Here
4580		4580
4581		4581
4582	for(int i = 1;i < 5;i ++){	4582	for(int i = 1;i < 5;i ++){
4583	char[] t1 = "tail_"~str.toString(i-1);	4583	char[] t1 = "tail_"~std.string.toString(i-1);
4584	char[] t2 = "tail_"~str.toString(i);	4584	char[] t2 = "tail_"~std.string.toString(i);
4585	p = new Append(Tail.getShape() ,30);//p = new Tail();	4585	p = new Append(Tail.getShape() ,30);//p = new Tail();
4586	childHash[t1].addChild(p ,t2 ,60 ,ENGAGED);	4586	childHash[t1].addChild(p ,t2 ,60 ,ENGAGED);
4587	//append2 = append;	4587	//append2 = append;

Line 0 Link Here

(-)projectL_1001/Makefile (+21 lines)
	1	DSRC=$(shell find src -name "*.d")
	2	SOURCES=$(DSRC) import/SDL_video.d import/SDL_mixer.d
	3	OBJS=$(SOURCES:.d=.o)
	4	CFLAGS=
	5	DFLAGS=-O -debug -Iimport -Isrc -I/usr/X11R6/include/
	6	EXE=projectL
	7
	8
	9	all: $(EXE)
	10
	11	$(EXE): import/SDL_keysym.d $(OBJS)
	12	gcc $(CFLAGS) -o $@ $(OBJS) -lbulletml_d -L/usr/local/lib -L/usr/lib -lgphobos -lpthread -lGLU -lGL -lglut -lm -lstdc++ -lSDL -lSDL_mixer
	13
	14	$(OBJS): %.o: %.d
	15	gdmd -d -c -of$@ $(DFLAGS) $<
	16
	17	clean: rm src/*.o
	18	rm src/br/*.o
	19	rm src/util/*.o
	20	rm src/util/sdl/*.o
	21	rm -r import/*.o

Lines 2-8 Link Here

(-)projectL_1001/src/br/ship.d (-15 / +8 lines)
2		2
3	private import SDL_mixer;	3	private import SDL_mixer;
4	private import opengl;	4	private import opengl;
5	private import str = std.string;	5	private import std.string;
6	private import std.math;	6	private import std.math;
7	private import util.parts;	7	private import util.parts;
8	private import util.key;	8	private import util.key;
Lines 34-40 Link Here
34	int reload;	34	int reload;
35	double gradient;	35	double gradient;
36	int cPressed;	36	int cPressed;
37	double predegAim;
38	// Vector3[100] rpos0;	37	// Vector3[100] rpos0;
39	// Matrix[100] rpose0;	38	// Matrix[100] rpose0;
40	}	39	}
Lines 85-91 Link Here
85	size = 20;	84	size = 20;
86	collisionRange = 10;	85	collisionRange = 10;
87	R = 1.0;G =0.88;B = 0.7;alpha = 1.5;	86	R = 1.0;G =0.88;B = 0.7;alpha = 1.5;
88	predegAim = 0.0;	87
89		88
90	pressing = 0;	89	pressing = 0;
91	reload = 0;	90	reload = 0;
Lines 209-220 Link Here
209	slow = false;	208	slow = false;
210	}else slow = true;	209	}else slow = true;
211	*/	210	*/
212	// if(pressing > 5)speed = 5.0;	211	if(pressing > 5)speed = 5.0;
213	// else speed = 8.0;	212	else speed = 8.0;
214	if(sword)speed = 6.8;
215	else speed = 6.8;
216
217
218	int dir = key.getDirState();	213	int dir = key.getDirState();
219	int aim = 5;	214	int aim = 5;
220	//Vector aim = new Vector(0,0);	215	//Vector aim = new Vector(0,0);
Lines 278-290 Link Here
278	case 9:degAim=-45.0; break;	273	case 9:degAim=-45.0; break;
279	case 5:	274	case 5:
280	default:	275	default:
281	degAim = predegAim;
282	moved = false;	276	moved = false;
283	break;	277	break;
284	}	278	}
285	predegAim = degAim;	279
286	if(childHash["laserGun"] !is null){	280	if(childHash["laserGun"] !is null){
287	(cast(Beam)childHash["laserGun"]).setAim(degAim ,true);//moved);	281	(cast(Beam)childHash["laserGun"]).setAim(degAim ,moved);
288	}	282	}
289		283
290	if(pos.y < screen.GAME_DOWN + size)pos.y = screen.GAME_DOWN + size;	284	if(pos.y < screen.GAME_DOWN + size)pos.y = screen.GAME_DOWN + size;
Lines 369-375 Link Here
369	length = 1000;	363	length = 1000;
370	drawDist = 1;	364	drawDist = 1;
371	rootLength = 10;	365	rootLength = 10;
372	minSpeed = 9.0;maxSpeed = 9.0;accSpeed = 1.0;	366	minSpeed = 4.0;maxSpeed = 8.0;accSpeed = 0.4;
373	collisionManager.add(this, collisionManager.kind.LASER ,1 );	367	collisionManager.add(this, collisionManager.kind.LASER ,1 );
374	}	368	}
375	public void move(){	369	public void move(){
Lines 445-451 Link Here
445	length = 300;	439	length = 300;
446	drawDist = 1;	440	drawDist = 1;
447	rootLength = 100;	441	rootLength = 100;
448	minSpeed = 15.0;maxSpeed = 15.0;accSpeed = 1.0;	442	minSpeed = 5.0;maxSpeed = 20.0;accSpeed = 1.0;
449	collisionManager.add(this, collisionManager.kind.SWORD ,1 );	443	collisionManager.add(this, collisionManager.kind.SWORD ,1 );
450	}	444	}
451	public void move(){	445	public void move(){
Lines 455-461 Link Here
455	}	449	}
456	public void setColor(double R ,double G ,double B ,double alpha){}	450	public void setColor(double R ,double G ,double B ,double alpha){}
457	public override void reportCollision(int kind){	451	public override void reportCollision(int kind){
458	// speed = fmax(0.0 ,speed - 1.0);
459	//drawing = WIRE;	452	//drawing = WIRE;
460		453
461		454