Skip to content

Commit e5ff21a

Browse files
committed
blue items entities
1 parent 6d478f3 commit e5ff21a

File tree

6 files changed

+49
-28
lines changed

6 files changed

+49
-28
lines changed

coffee/client/module/Entities.coffee

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,28 @@ class Entities
33
constructor:(options)->
44
@scene=options.scene
55
@saved={}
6+
@nick=options.nick
7+
@TWEEN=options.TWEEN
68
update:(entities)->
9+
offset=[-0.5,16,-0.5]
710
for i of entities
8-
if entities[i].type isnt "player"
11+
if entities[i].username isnt @nick
12+
pos=[entities[i].position.x+offset[0],entities[i].position.y+offset[1],entities[i].position.z+offset[2]]
913
if @saved[entities[i].uuid] is undefined
1014
console.log entities[i]
11-
geometry = new THREE.BoxGeometry( 1, 1, 1 )
12-
material = new THREE.MeshBasicMaterial( {color: 0x00ff00} )
15+
if entities[i].name is "item"
16+
material = new THREE.MeshBasicMaterial( {color: new THREE.Color("blue")} )
17+
geometry = new THREE.BoxGeometry( 0.5, 0.5, 0.5 )
18+
else
19+
material = new THREE.MeshBasicMaterial( {color: new THREE.Color("red")} )
20+
geometry = new THREE.BoxGeometry( 1, 1, 1 )
1321
cube = new THREE.Mesh( geometry, material )
1422
@scene.add(cube)
15-
cube.position.set entities[i].position.x+0.5,entities[i].position.y+16,entities[i].position.z+0.5
1623
@saved[entities[i].uuid]=cube
24+
@saved[entities[i].uuid].position.set pos...
1725
@saved[entities[i].uuid].active=true
1826
else
19-
@saved[entities[i].uuid].position.set entities[i].position.x+0.5,entities[i].position.y+16,entities[i].position.z+0.5
27+
@saved[entities[i].uuid].position.set pos...
2028
@saved[entities[i].uuid].active=true
2129
for i of @saved
2230
if @saved[i].active is false

coffee/client/module/index.coffee

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,14 @@ init = ()->
4040
#Informacja o gpu komputera
4141
console.warn gpuInfo()
4242

43+
#Nick gracza
44+
nick=document.location.hash.substring(1,document.location.hash.length)
45+
if nick is ""
46+
nick=RandomNick()
47+
document.location.href="\##{nick}"
48+
4349
#Moby
44-
ent=new Entities {scene}
50+
ent=new Entities {scene,nick,TWEEN}
4551

4652
#FPSy
4753
stats = new Stats()
@@ -78,10 +84,6 @@ init = ()->
7884
"connect":()->
7985
console.log "Połączono z serverem!"
8086
$('.loadingText').text "Za chwilę dołączysz do gry..."
81-
nick=document.location.hash.substring(1,document.location.hash.length)
82-
if nick is ""
83-
nick=RandomNick()
84-
document.location.href="\##{nick}"
8587
console.log "User nick: #{nick}"
8688
socket.emit "initClient", {
8789
nick:nick

coffee/server.coffee

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ module.exports=(type)->
9191
emit ["inventory",bot().inventory.slots]
9292
emit ["entities",bot().entities]
9393
return
94-
,100
94+
,10
9595
socketEventMap={
9696
"move":(state,toggle)->
9797
bot().setControlState(state,toggle)

src/client/module/Entities.js

Lines changed: 19 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/client/module/index.js

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/server.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)