Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 185576 | Differences between
and this patch

Collapse All | Expand All

(-)mcd/import/ode/common.d (-5 / +6 lines)
Lines 24-30 Link Here
24
private import std.c.math;
24
private import std.c.math;
25
private import std.c.stdlib;
25
private import std.c.stdlib;
26
import ode.config;
26
import ode.config;
27
import ode.error;
27
import ode.error;
28
import ode.objects;
28
29
29
extern(C):
30
extern(C):
30
31
Lines 68-75 Link Here
68
69
69
/* floating point data type, vector, matrix and quaternion types */
70
/* floating point data type, vector, matrix and quaternion types */
70
71
71
alias double dReal;
72
//alias double dReal;
72
73
alias float dReal;
73
74
74
/* round an integer up to a multiple of 4, except that 0 and 1 are unmodified
75
/* round an integer up to a multiple of 4, except that 0 and 1 are unmodified
75
 * (used to compute matrix leading dimensions)
76
 * (used to compute matrix leading dimensions)
Lines 119-126 Link Here
119
struct dxWorld;		/* dynamics world */
120
struct dxWorld;		/* dynamics world */
120
struct dxSpace;		/* collision space */
121
struct dxSpace;		/* collision space */
121
struct dxBody;		/* rigid body (dynamics object) */
122
struct dxBody;		/* rigid body (dynamics object) */
122
struct dxGeom;		/* geometry (collision object) */
123
struct dxGeom { };
123
struct dxJoint;
124
struct dxJoint { };
124
struct dxJointNode;
125
struct dxJointNode;
125
struct dxJointGroup;
126
struct dxJointGroup;
126
127
(-)mcd/import/ode/ode.d (-16 / +16 lines)
Lines 23-43 Link Here
23
23
24
/* include *everything* here */
24
/* include *everything* here */
25
25
26
import ode.config;
26
public import ode.config;
27
import ode.compatibility;
27
public import ode.compatibility;
28
import ode.common;
28
public import ode.common;
29
import ode.contact;
29
public import ode.contact;
30
import ode.error;
30
public import ode.error;
31
import ode.memory;
31
public import ode.memory;
32
import ode.odemath;
32
public import ode.odemath;
33
import ode.matrix;
33
public import ode.matrix;
34
import ode.timer;
34
public import ode.timer;
35
import ode.rotation;
35
public import ode.rotation;
36
import ode.mass;
36
public import ode.mass;
37
import ode.misc;
37
public import ode.misc;
38
import ode.objects;
38
public import ode.objects;
39
//import ode.odecpp;
39
//import ode.odecpp;
40
import ode.collision_space;
40
public import ode.collision_space;
41
import ode.collision;
41
public import ode.collision;
42
//import ode.odecpp_collision;
42
//import ode.odecpp_collision;
43
import ode.export_dif;
43
public import ode.export_dif;
(-)mcd/import/SDL.d (-12 / +22 lines)
Lines 20-37 Link Here
20
    slouken@devolution.com
20
    slouken@devolution.com
21
*/
21
*/
22
22
23
import SDL_types;
23
public import SDL_Keysym;
24
import SDL_getenv;
24
public import SDL_Version;
25
import SDL_error;
25
public import SDL_active;
26
import SDL_rwops;
26
public import SDL_audio;
27
import SDL_timer;
27
public import SDL_byteorder;
28
import SDL_audio;
28
public import SDL_cdrom;
29
import SDL_cdrom;
29
public import SDL_copying;
30
import SDL_joystick;
30
public import SDL_endian;
31
import SDL_events;
31
public import SDL_error;
32
import SDL_video;
32
public import SDL_events;
33
import SDL_byteorder;
33
public import SDL_getenv;
34
import SDL_Version;
34
public import SDL_joystick;
35
public import SDL_keyboard;
36
public import SDL_mouse;
37
public import SDL_mutex;
38
public import SDL_quit;
39
public import SDL_rwops;
40
public import SDL_syswm;
41
public import SDL_thread;
42
public import SDL_timer;
43
public import SDL_types;
44
public import SDL_video;
35
45
36
extern(C):
46
extern(C):
37
47
(-)mcd/Makefile (+26 lines)
Line 0 Link Here
1
DC=gdmd
2
#DC=gdc
3
ifeq ($(DC), gdmd)
4
DFLAGS=-O -g -debug -d -release -Iimport -Isrc
5
#DFLAGS=-g -debug -Iimport -Isrc
6
DOUT=-of
7
else
8
DFLAGS=-O -frelease -Iimport -Isrc
9
#DFLAGS=-g -fdebug -Iimport -Isrc
10
DOUT=-o
11
endif
12
13
DSRC=$(shell find src/abagames -name "*.d")
14
SOURCES=$(DSRC) import/SDL_video.d import/SDL_mixer.d $(wildcard import/ode/*.d)
15
OBJS=$(SOURCES:.d=.o)
16
EXE=mucade
17
18
all: $(EXE)
19
20
$(EXE): $(OBJS)
21
	gcc -o $@ $(OBJS) -lbulletml_d -lgphobos -lpthread -lm -lSDL -lGL -lGLU -lSDL_mixer -lstdc++ -lode
22
23
$(OBJS): %.o: %.d
24
	$(DC) -c $(DOUT)$@ $(DFLAGS) $<
25
26
(-)mcd/src/abagames/mcd/barrage.d (-2 / +3 lines)
Lines 58-68 Link Here
58
public class BarrageManager {
58
public class BarrageManager {
59
 private:
59
 private:
60
  static BulletMLParserTinyXML *parser[char[]][char[]];
60
  static BulletMLParserTinyXML *parser[char[]][char[]];
61
  static const char[] BARRAGE_DIR_NAME = "barrage";
61
  static const char[] BARRAGE_DIR_NAME = "barrage";
62
62
63
  public static void load() {
63
  public static void load() {
64
    char[][] dirs = listdir(BARRAGE_DIR_NAME);
64
    char[][] dirs = listdir(BARRAGE_DIR_NAME);
65
    foreach (char[] dirName; dirs) {
65
    foreach (char[] dirName; dirs) {
66
      parser[dirName] = null;
66
      char[][] files = listdir(BARRAGE_DIR_NAME ~ "/" ~ dirName);
67
      char[][] files = listdir(BARRAGE_DIR_NAME ~ "/" ~ dirName);
67
      foreach (char[] fileName; files) {
68
      foreach (char[] fileName; files) {
68
        if (getExt(fileName) != "xml")
69
        if (getExt(fileName) != "xml")
(-)mcd/src/abagames/mcd/enemy.d (-1 / +14 lines)
Lines 7-13 Link Here
7
7
8
private import std.math;
8
private import std.math;
9
private import opengl;
9
private import opengl;
10
private import ode.ode;
10
private import ode.ode;
11
import ode.config;
12
import ode.compatibility;
13
import ode.common;
14
import ode.contact;
15
import ode.error;
16
import ode.memory;
17
import ode.odemath;
18
import ode.matrix;
19
import ode.timer;
20
import ode.rotation;
21
import ode.mass;
22
import ode.misc;
23
import ode.objects;
11
private import abagames.util.vector;
24
private import abagames.util.vector;
12
private import abagames.util.rand;
25
private import abagames.util.rand;
13
private import abagames.util.math;
26
private import abagames.util.math;
(-)mcd/src/abagames/mcd/shape.d (-4 / +17 lines)
Lines 6-12 Link Here
6
module abagames.mcd.shape;
6
module abagames.mcd.shape;
7
7
8
private import opengl;
8
private import opengl;
9
private import ode.ode;
9
private import ode.ode;
10
import ode.config;
11
import ode.compatibility;
12
import ode.common;
13
import ode.contact;
14
import ode.error;
15
import ode.memory;
16
import ode.odemath;
17
import ode.matrix;
18
import ode.timer;
19
import ode.rotation;
20
import ode.mass;
21
import ode.misc;
22
import ode.objects;
10
private import abagames.util.vector;
23
private import abagames.util.vector;
11
private import abagames.util.sdl.displaylist;
24
private import abagames.util.sdl.displaylist;
12
private import abagames.util.ode.odeactor;
25
private import abagames.util.ode.odeactor;
Lines 34-40 Link Here
34
  }
47
  }
35
48
36
  public void setMass(OdeActor oa, Vector3 sizeScale = null, float massScale = 1) {
49
  public void setMass(OdeActor oa, Vector3 sizeScale = null, float massScale = 1) {
37
    dMass m;
50
    dMass m = void;
38
    dMassSetZero(&m);
51
    dMassSetZero(&m);
39
    addMass(&m, sizeScale, massScale);
52
    addMass(&m, sizeScale, massScale);
40
    oa.setMass(m);
53
    oa.setMass(m);
Lines 87-93 Link Here
87
  }
100
  }
88
101
89
  public void addMass(dMass* m, Vector3 sizeScale = null, float massScale = 1) {
102
  public void addMass(dMass* m, Vector3 sizeScale = null, float massScale = 1) {
90
    dMass sm;
103
    dMass sm = void;
91
    if (sizeScale) {
104
    if (sizeScale) {
92
      dMassSetBox(&sm, 1, size.x * sizeScale.x, size.y * sizeScale.y, size.z * sizeScale.z);
105
      dMassSetBox(&sm, 1, size.x * sizeScale.x, size.y * sizeScale.y, size.z * sizeScale.z);
93
      dMassTranslate(&sm, pos.x * sizeScale.x, pos.y * sizeScale.y, pos.z * sizeScale.z);
106
      dMassTranslate(&sm, pos.x * sizeScale.x, pos.y * sizeScale.y, pos.z * sizeScale.z);
Lines 436-442 Link Here
436
449
437
  public void beginRecord() {
450
  public void beginRecord() {
438
    posIdx = 0;
451
    posIdx = 0;
439
    glGetFloatv(GL_MODELVIEW_MATRIX, m);
452
    glGetFloatv(GL_MODELVIEW_MATRIX, m.ptr);
440
  }
453
  }
441
454
442
  public void setPos(Vector3 p) {
455
  public void setPos(Vector3 p) {
(-)mcd/src/abagames/mcd/ship.d (-2 / +15 lines)
Lines 7-13 Link Here
7
7
8
private import std.math;
8
private import std.math;
9
private import opengl;
9
private import opengl;
10
private import ode.ode;
10
private import ode.ode;
11
import ode.config;
12
import ode.compatibility;
13
import ode.common;
14
import ode.contact;
15
import ode.error;
16
import ode.memory;
17
import ode.odemath;
18
import ode.matrix;
19
import ode.timer;
20
import ode.rotation;
21
import ode.mass;
22
import ode.misc;
23
import ode.objects;
11
private import abagames.util.vector;
24
private import abagames.util.vector;
12
private import abagames.util.rand;
25
private import abagames.util.rand;
13
private import abagames.util.math;
26
private import abagames.util.math;
Lines 520-526 Link Here
520
  Ship ship;
533
  Ship ship;
521
  ParticlePool particles;
534
  ParticlePool particles;
522
  ConnectedParticlePool connectedParticles;
535
  ConnectedParticlePool connectedParticles;
523
  dMass m;
536
  dMass m = void;
524
  Shape shape;
537
  Shape shape;
525
  LinePoint linePoint;
538
  LinePoint linePoint;
526
  dJointID joint;
539
  dJointID joint;
(-)mcd/src/abagames/mcd/spec.d (-1 / +15 lines)
Lines 7-13 Link Here
7
7
8
private import std.math;
8
private import std.math;
9
private import opengl;
9
private import opengl;
10
private import ode.ode;
10
private import ode.ode;
11
import ode.objects;
12
import ode.config;
13
import ode.compatibility;
14
import ode.common;
15
import ode.contact;
16
import ode.error;
17
import ode.memory;
18
import ode.odemath;
19
import ode.matrix;
20
import ode.timer;
21
import ode.rotation;
22
import ode.mass;
23
import ode.misc;
24
import ode.objects;
11
private import abagames.util.vector;
25
private import abagames.util.vector;
12
private import abagames.util.math;
26
private import abagames.util.math;
13
private import abagames.util.ode.odeactor;
27
private import abagames.util.ode.odeactor;
(-)mcd/src/abagames/mcd/stagemanager.d (-1 / +14 lines)
Lines 9-15 Link Here
9
private import std.string;
9
private import std.string;
10
private import std.stream;
10
private import std.stream;
11
private import opengl;
11
private import opengl;
12
private import ode.ode;
12
private import ode.ode;
13
import ode.config;
14
import ode.compatibility;
15
import ode.common;
16
import ode.contact;
17
import ode.error;
18
import ode.memory;
19
import ode.odemath;
20
import ode.matrix;
21
import ode.timer;
22
import ode.rotation;
23
import ode.mass;
24
import ode.misc;
25
import ode.objects;
13
private import abagames.util.tokenizer;
26
private import abagames.util.tokenizer;
14
private import abagames.util.iterator;
27
private import abagames.util.iterator;
15
private import abagames.util.rand;
28
private import abagames.util.rand;
(-)mcd/src/abagames/util/ode/odeactor.d (-1 / +14 lines)
Lines 7-13 Link Here
7
7
8
private import std.math;
8
private import std.math;
9
private import opengl;
9
private import opengl;
10
private import ode.ode;
10
private import ode.ode;
11
import ode.config;
12
import ode.compatibility;
13
import ode.common;
14
import ode.contact;
15
import ode.error;
16
import ode.memory;
17
import ode.odemath;
18
import ode.matrix;
19
import ode.timer;
20
import ode.rotation;
21
import ode.mass;
22
import ode.misc;
23
import ode.objects;
11
private import abagames.util.actor;
24
private import abagames.util.actor;
12
private import abagames.util.vector;
25
private import abagames.util.vector;
13
private import abagames.util.ode.world;
26
private import abagames.util.ode.world;
(-)mcd/src/abagames/util/ode/world.d (-1 / +14 lines)
Lines 5-11 Link Here
5
 */
5
 */
6
module abagames.util.ode.world;
6
module abagames.util.ode.world;
7
7
8
private import ode.ode;
8
private import ode.ode;
9
import ode.config;
10
import ode.compatibility;
11
import ode.common;
12
import ode.contact;
13
import ode.error;
14
import ode.memory;
15
import ode.odemath;
16
import ode.matrix;
17
import ode.timer;
18
import ode.rotation;
19
import ode.mass;
20
import ode.misc;
21
import ode.objects;
9
private import abagames.util.ode.odeactor;
22
private import abagames.util.ode.odeactor;
10
23
11
/**
24
/**
(-)mcd/src/abagames/util/sdl/texture.d (-2 / +2 lines)
Lines 103-115 Link Here
103
        }
103
        }
104
        glBindTexture(GL_TEXTURE_2D, num + ti);
104
        glBindTexture(GL_TEXTURE_2D, num + ti);
105
        gluBuild2DMipmaps(GL_TEXTURE_2D, 4, panelWidth, panelHeight,
105
        gluBuild2DMipmaps(GL_TEXTURE_2D, 4, panelWidth, panelHeight,
106
                          GL_RGBA, GL_UNSIGNED_BYTE, pixels);
106
                          GL_RGBA, GL_UNSIGNED_BYTE, pixels.ptr);
107
        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_NEAREST);
107
        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_NEAREST);
108
        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
108
        glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
109
        if (maskColor != 0xffffffffu) {
109
        if (maskColor != 0xffffffffu) {
110
          glBindTexture(GL_TEXTURE_2D, maskNum + ti);
110
          glBindTexture(GL_TEXTURE_2D, maskNum + ti);
111
          gluBuild2DMipmaps(GL_TEXTURE_2D, 4, panelWidth, panelHeight,
111
          gluBuild2DMipmaps(GL_TEXTURE_2D, 4, panelWidth, panelHeight,
112
                            GL_RGBA, GL_UNSIGNED_BYTE, maskPixels);
112
                            GL_RGBA, GL_UNSIGNED_BYTE, maskPixels.ptr);
113
          glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_NEAREST);
113
          glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_NEAREST);
114
          glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
114
          glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
115
        }
115
        }
(-)mcd/src/abagames/util/sdl/twinstickpad.d (-1 / +2 lines)
Lines 8-14 Link Here
8
private import std.string;
8
private import std.string;
9
private import std.stream;
9
private import std.stream;
10
private import std.math;
10
private import std.math;
11
private import SDL;
11
private import SDL;
12
private import SDL_keyboard;
12
private import abagames.util.vector;
13
private import abagames.util.vector;
13
private import abagames.util.sdl.input;
14
private import abagames.util.sdl.input;
14
private import abagames.util.sdl.recordableinput;
15
private import abagames.util.sdl.recordableinput;

Return to bug 185576