Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Picture Frame Model #6

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Picture Frame Model #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb114df
Picture Frame Model
jesse-stojan Nov 17, 2013
adfc658
Added Berry Bush Model
jesse-stojan Nov 17, 2013
06187c5
Hay Wagon Model
jesse-stojan Nov 18, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions gamecontent.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,9 @@ INSERT INTO `ib_meshes` (`id`, `name`, `category`, `filename`, `scale`, `transpa
INSERT INTO `ib_meshes` (`id`, `name`, `category`, `filename`, `scale`, `transparent`, `t1`, `ts1`, `t2`, `ts2`, `t3`, `ts3`, `t4`, `ts4`, `t5`, `ts5`, `t6`, `ts6`, `t7`, `ts7`, `t8`, `ts8`, `special`) VALUES (1145,'Cot', 'Decoration', 'cot.obj', '1.00', '1', 'textures/cot', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', '0');
INSERT INTO `ib_meshes` (`id`, `name`, `category`, `filename`, `scale`, `transparent`, `t1`, `ts1`, `t2`, `ts2`, `t3`, `ts3`, `t4`, `ts4`, `t5`, `ts5`, `t6`, `ts6`, `t7`, `ts7`, `t8`, `ts8`, `special`) VALUES (1146,'Corn Stalk', 'Foliage', 'corn_stalk.obj', '1.00', '1', 'textures/corn_stalk', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', '0');
INSERT INTO `ib_meshes` (`id`, `name`, `category`, `filename`, `scale`, `transparent`, `t1`, `ts1`, `t2`, `ts2`, `t3`, `ts3`, `t4`, `ts4`, `t5`, `ts5`, `t6`, `ts6`, `t7`, `ts7`, `t8`, `ts8`, `special`) VALUES (1147,'Small Dresser', 'Decoration', 'small_dresser.obj', '1.00', '0', 'textures/small_dresser', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', '0');
INSERT INTO `ib_meshes` (`id`, `name`, `category`, `filename`, `scale`, `transparent`, `t1`, `ts1`, `t2`, `ts2`, `t3`, `ts3`, `t4`, `ts4`, `t5`, `ts5`, `t6`, `ts6`, `t7`, `ts7`, `t8`, `ts8`, `special`) VALUES (1148,'Picture Frame (s)', 'Decoration', 'picture_frame_small.obj', '1.00', '0', 'textures/picture_frame_small', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', '0');
INSERT INTO `ib_meshes` (`id`, `name`, `category`, `filename`, `scale`, `transparent`, `t1`, `ts1`, `t2`, `ts2`, `t3`, `ts3`, `t4`, `ts4`, `t5`, `ts5`, `t6`, `ts6`, `t7`, `ts7`, `t8`, `ts8`, `special`) VALUES (1149,'Berry Bush', 'Foliage', 'berry_bush.obj', '1.00', '1', 'textures/berry_bush', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', '0');
INSERT INTO `ib_meshes` (`id`, `name`, `category`, `filename`, `scale`, `transparent`, `t1`, `ts1`, `t2`, `ts2`, `t3`, `ts3`, `t4`, `ts4`, `t5`, `ts5`, `t6`, `ts6`, `t7`, `ts7`, `t8`, `ts8`, `special`) VALUES (1150,'Hay Wagon', 'Decoration', 'hay_wagon.obj', '1.00', '1', 'textures/hay_wagon', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', 'tiles/1', '1.00', '0');


/*!40000 ALTER TABLE `ib_meshes` ENABLE KEYS */;
Expand Down
47 changes: 47 additions & 0 deletions images/meshes/berry_bush.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{

"metadata" :
{
"formatVersion" : 3.1,
"sourceFile" : "berry_bush.obj",
"generatedBy" : "OBJConverter",
"vertices" : 12,
"faces" : 4,
"normals" : 0,
"colors" : 0,
"uvs" : 6,
"materials" : 1
},

"scale" : 1.000000,

"materials": [ {
"DbgColor" : 15658734,
"DbgIndex" : 0,
"DbgName" : "Material",
"colorAmbient" : [0.0, 0.0, 0.0],
"colorDiffuse" : [0.8, 0.8, 0.8],
"colorSpecular" : [0.0, 0.0, 0.0],
"illumination" : 0,
"mapAlpha" : "berry_bush.png",
"mapDiffuse" : "berry_bush.png",
"opticalDensity" : 1.0,
"specularCoef" : 96.078431,
"transparency" : 0.0
}],

"vertices": [1.000000,0.000000,-0.000001,-1.000000,0.000000,-0.000001,1.000000,3.000000,0.000001,-1.000000,3.000000,0.000001,-1.500000,1.500000,0.000000,1.500000,1.500000,-0.000000,-0.000002,-0.000000,-1.000000,-0.000000,-0.000000,1.000000,0.000000,3.000000,-1.000000,0.000002,3.000000,1.000000,0.000001,1.500000,1.500000,-0.000001,1.500000,-1.500000],

"morphTargets": [],

"morphColors": [],

"normals": [],

"colors": [],

"uvs": [[0,0.5,1,0.5,0.70833,1,0.29167,1,0.29167,0,0.70833,0]],

"faces": [11,4,5,2,3,0,0,1,2,3,11,1,0,5,4,0,4,5,1,0,11,10,11,8,9,0,0,1,2,3,11,7,6,11,10,0,4,5,1,0]

}
13 changes: 13 additions & 0 deletions images/meshes/berry_bush.mtl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Blender MTL File: 'berry_bush.blend'
# Material Count: 1

newmtl Material
Ns 96.078431
Ka 0.000000 0.000000 0.000000
Kd 0.800000 0.800000 0.800000
Ks 0.000000 0.000000 0.000000
Ni 1.000000
d 0.000000
illum 0
map_Kd berry_bush.png
map_d berry_bush.png
28 changes: 28 additions & 0 deletions images/meshes/berry_bush.obj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Blender v2.69 (sub 0) OBJ File: 'berry_bush.blend'
# www.blender.org
mtllib berry_bush.mtl
o Plane.000_Plane.002
v 1.000000 0.000000 -0.000001
v -1.000000 0.000000 -0.000001
v 1.000000 3.000000 0.000001
v -1.000000 3.000000 0.000001
v -1.500000 1.500000 0.000000
v 1.500000 1.500000 -0.000000
v -0.000002 -0.000000 -1.000000
v -0.000000 -0.000000 1.000000
v 0.000000 3.000000 -1.000000
v 0.000002 3.000000 1.000000
v 0.000001 1.500000 1.500000
v -0.000001 1.500000 -1.500000
vt 0.000000 0.500000
vt 1.000000 0.500000
vt 0.708333 1.000000
vt 0.291667 1.000000
vt 0.291667 0.000000
vt 0.708333 0.000000
usemtl Material
s off
f 5/1 6/2 3/3 4/4
f 2/5 1/6 6/2 5/1
f 11/1 12/2 9/3 10/4
f 8/5 7/6 12/2 11/1
Loading