Add desk and chair decor
This commit is contained in:
parent
c61a8a802b
commit
4445cca8c1
4
Makefile
4
Makefile
|
@ -235,6 +235,10 @@ MODEL_LIST = assets/models/player/chell.blend \
|
||||||
DYNAMIC_MODEL_LIST = assets/models/cube/cube.blend \
|
DYNAMIC_MODEL_LIST = assets/models/cube/cube.blend \
|
||||||
assets/models/props/autoportal_frame/autoportal_frame.blend \
|
assets/models/props/autoportal_frame/autoportal_frame.blend \
|
||||||
assets/models/props/cylinder_test.blend \
|
assets/models/props/cylinder_test.blend \
|
||||||
|
assets/models/props/lab_chair.blend \
|
||||||
|
assets/models/props/lab_desk/lab_desk01.blend \
|
||||||
|
assets/models/props/lab_desk/lab_desk03.blend \
|
||||||
|
assets/models/props/lab_desk/lab_desk04.blend \
|
||||||
assets/models/props/lab_monitor.blend \
|
assets/models/props/lab_monitor.blend \
|
||||||
assets/models/props/radio.blend \
|
assets/models/props/radio.blend \
|
||||||
assets/models/signage/clock_digits.blend \
|
assets/models/signage/clock_digits.blend \
|
||||||
|
|
1
assets/materials/models/props_c17/door01a_skin6.ims
Normal file
1
assets/materials/models/props_c17/door01a_skin6.ims
Normal file
|
@ -0,0 +1 @@
|
||||||
|
-alpha off -colorspace Gray -crop 222x509+0+65 -resize 64x128
|
|
@ -95,6 +95,37 @@ materials:
|
||||||
gDPSetCombineMode:
|
gDPSetCombineMode:
|
||||||
color: ["PRIMITIVE", "0", "SHADE", "0"]
|
color: ["PRIMITIVE", "0", "SHADE", "0"]
|
||||||
|
|
||||||
|
solid_chair_brown:
|
||||||
|
gDPSetPrimColor:
|
||||||
|
r: 154
|
||||||
|
g: 115
|
||||||
|
b: 65
|
||||||
|
gSPGeometryMode:
|
||||||
|
set: [G_LIGHTING, G_SHADE]
|
||||||
|
gDPSetCombineMode:
|
||||||
|
color: ["PRIMITIVE", "0", "SHADE", "0"]
|
||||||
|
|
||||||
|
solid_table_gray:
|
||||||
|
gDPSetPrimColor:
|
||||||
|
r: 68
|
||||||
|
g: 70
|
||||||
|
b: 70
|
||||||
|
gSPGeometryMode:
|
||||||
|
set: [G_LIGHTING, G_SHADE]
|
||||||
|
gDPSetCombineMode:
|
||||||
|
color: ["PRIMITIVE", "0", "SHADE", "0"]
|
||||||
|
|
||||||
|
solid_table_gray_two_sided:
|
||||||
|
gDPSetPrimColor:
|
||||||
|
r: 68
|
||||||
|
g: 70
|
||||||
|
b: 70
|
||||||
|
gSPGeometryMode:
|
||||||
|
set: [G_LIGHTING, G_SHADE]
|
||||||
|
clear: [G_CULL_BACK]
|
||||||
|
gDPSetCombineMode:
|
||||||
|
color: ["PRIMITIVE", "0", "SHADE", "0"]
|
||||||
|
|
||||||
blue_glow:
|
blue_glow:
|
||||||
gDPSetPrimColor:
|
gDPSetPrimColor:
|
||||||
r: 89
|
r: 89
|
||||||
|
|
|
@ -34,6 +34,33 @@ materials:
|
||||||
|
|
||||||
staticLit: true
|
staticLit: true
|
||||||
|
|
||||||
|
door01a_skin6:
|
||||||
|
gDPSetTile:
|
||||||
|
filename: ../../portal_pak_modified/materials/models/props_c17/door01a_skin6.png
|
||||||
|
siz: G_IM_SIZ_4b
|
||||||
|
gSPGeometryMode:
|
||||||
|
set: [G_SHADE]
|
||||||
|
clear: [G_LIGHTING]
|
||||||
|
|
||||||
|
gDPSetCycleType: G_CYC_2CYCLE
|
||||||
|
gDPSetCombineMode:
|
||||||
|
- color: [PRIMITIVE, "0", TEXEL0, "0"]
|
||||||
|
alpha: ["0", "0", "0", "1"]
|
||||||
|
- color: ["COMBINED", "0", "SHADE", "0"]
|
||||||
|
alpha: ["0", "0", "0", "1"]
|
||||||
|
gDPSetRenderMode:
|
||||||
|
- G_RM_PASS
|
||||||
|
- G_RM_ZB_OPA_SURF
|
||||||
|
gDPSetPrimColor:
|
||||||
|
r: 25
|
||||||
|
g: 58
|
||||||
|
b: 43
|
||||||
|
properties:
|
||||||
|
tileSizeS: 1
|
||||||
|
tileSizeT: 2
|
||||||
|
|
||||||
|
staticLit: true
|
||||||
|
|
||||||
concrete/observationwall_001a:
|
concrete/observationwall_001a:
|
||||||
gDPSetTile:
|
gDPSetTile:
|
||||||
filename: ../../portal_pak_modified/materials/concrete/observationwall_001a.png
|
filename: ../../portal_pak_modified/materials/concrete/observationwall_001a.png
|
||||||
|
|
BIN
assets/models/props/lab_chair.blend
Normal file
BIN
assets/models/props/lab_chair.blend
Normal file
Binary file not shown.
1
assets/models/props/lab_chair.flags
Normal file
1
assets/models/props/lab_chair.flags
Normal file
|
@ -0,0 +1 @@
|
||||||
|
-r 90,0,0 -m assets/materials/static.skm.yaml -m assets/materials/objects.skm.yaml --default-material default
|
BIN
assets/models/props/lab_desk/lab_desk01.blend
Normal file
BIN
assets/models/props/lab_desk/lab_desk01.blend
Normal file
Binary file not shown.
1
assets/models/props/lab_desk/lab_desk01.flags
Normal file
1
assets/models/props/lab_desk/lab_desk01.flags
Normal file
|
@ -0,0 +1 @@
|
||||||
|
-r 90,0,0 -m assets/materials/static.skm.yaml -m assets/materials/objects.skm.yaml --default-material default
|
BIN
assets/models/props/lab_desk/lab_desk03.blend
Normal file
BIN
assets/models/props/lab_desk/lab_desk03.blend
Normal file
Binary file not shown.
1
assets/models/props/lab_desk/lab_desk03.flags
Normal file
1
assets/models/props/lab_desk/lab_desk03.flags
Normal file
|
@ -0,0 +1 @@
|
||||||
|
-r 90,0,0 -m assets/materials/static.skm.yaml -m assets/materials/objects.skm.yaml --default-material default
|
BIN
assets/models/props/lab_desk/lab_desk04.blend
Normal file
BIN
assets/models/props/lab_desk/lab_desk04.blend
Normal file
Binary file not shown.
1
assets/models/props/lab_desk/lab_desk04.flags
Normal file
1
assets/models/props/lab_desk/lab_desk04.flags
Normal file
|
@ -0,0 +1 @@
|
||||||
|
-r 90,0,0 -m assets/materials/static.skm.yaml -m assets/materials/objects.skm.yaml --default-material default
|
Binary file not shown.
|
@ -143,6 +143,66 @@ struct DecorObjectDefinition gDecorObjectDefinitions[] = {
|
||||||
.soundClipId = -1,
|
.soundClipId = -1,
|
||||||
.soundFizzleId = -1,
|
.soundFizzleId = -1,
|
||||||
},
|
},
|
||||||
|
[DECOR_TYPE_LAB_CHAIR] = {
|
||||||
|
{
|
||||||
|
CollisionShapeTypeNone,
|
||||||
|
NULL,
|
||||||
|
0.0f,
|
||||||
|
0.0f,
|
||||||
|
NULL,
|
||||||
|
},
|
||||||
|
0.0f,
|
||||||
|
1.0f,
|
||||||
|
PROPS_LAB_CHAIR_DYNAMIC_MODEL,
|
||||||
|
.materialIndex = DEFAULT_INDEX,
|
||||||
|
.soundClipId = -1,
|
||||||
|
.soundFizzleId = -1,
|
||||||
|
},
|
||||||
|
[DECOR_TYPE_LAB_DESK01] = {
|
||||||
|
{
|
||||||
|
CollisionShapeTypeNone,
|
||||||
|
NULL,
|
||||||
|
0.0f,
|
||||||
|
0.0f,
|
||||||
|
NULL,
|
||||||
|
},
|
||||||
|
0.0f,
|
||||||
|
1.0f,
|
||||||
|
PROPS_LAB_DESK_LAB_DESK01_DYNAMIC_MODEL,
|
||||||
|
.materialIndex = DEFAULT_INDEX,
|
||||||
|
.soundClipId = -1,
|
||||||
|
.soundFizzleId = -1,
|
||||||
|
},
|
||||||
|
[DECOR_TYPE_LAB_DESK03] = {
|
||||||
|
{
|
||||||
|
CollisionShapeTypeNone,
|
||||||
|
NULL,
|
||||||
|
0.0f,
|
||||||
|
0.0f,
|
||||||
|
NULL,
|
||||||
|
},
|
||||||
|
0.0f,
|
||||||
|
1.0f,
|
||||||
|
PROPS_LAB_DESK_LAB_DESK03_DYNAMIC_MODEL,
|
||||||
|
.materialIndex = DEFAULT_INDEX,
|
||||||
|
.soundClipId = -1,
|
||||||
|
.soundFizzleId = -1,
|
||||||
|
},
|
||||||
|
[DECOR_TYPE_LAB_DESK04] = {
|
||||||
|
{
|
||||||
|
CollisionShapeTypeNone,
|
||||||
|
NULL,
|
||||||
|
0.0f,
|
||||||
|
0.0f,
|
||||||
|
NULL,
|
||||||
|
},
|
||||||
|
0.0f,
|
||||||
|
1.0f,
|
||||||
|
PROPS_LAB_DESK_LAB_DESK04_DYNAMIC_MODEL,
|
||||||
|
.materialIndex = DEFAULT_INDEX,
|
||||||
|
.soundClipId = -1,
|
||||||
|
.soundFizzleId = -1,
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
struct DecorObjectDefinition* decorObjectDefinitionForId(int id) {
|
struct DecorObjectDefinition* decorObjectDefinitionForId(int id) {
|
||||||
|
|
|
@ -10,6 +10,10 @@
|
||||||
#define DECOR_TYPE_AUTOPORTAL_FRAME 4
|
#define DECOR_TYPE_AUTOPORTAL_FRAME 4
|
||||||
#define DECOR_TYPE_LIGHT_RAIL_ENDCAP 5
|
#define DECOR_TYPE_LIGHT_RAIL_ENDCAP 5
|
||||||
#define DECOR_TYPE_LAB_MONITOR 6
|
#define DECOR_TYPE_LAB_MONITOR 6
|
||||||
|
#define DECOR_TYPE_LAB_CHAIR 7
|
||||||
|
#define DECOR_TYPE_LAB_DESK01 8
|
||||||
|
#define DECOR_TYPE_LAB_DESK03 9
|
||||||
|
#define DECOR_TYPE_LAB_DESK04 10
|
||||||
|
|
||||||
struct DecorObjectDefinition* decorObjectDefinitionForId(int id);
|
struct DecorObjectDefinition* decorObjectDefinitionForId(int id);
|
||||||
int decorIdForObjectDefinition(struct DecorObjectDefinition* def);
|
int decorIdForObjectDefinition(struct DecorObjectDefinition* def);
|
||||||
|
|
Loading…
Reference in a new issue