jax 2.0.1 → 2.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/CHANGELOG +6 -0
  2. data/lib/jax/version.rb +1 -1
  3. data/templates/shader_material.js.coffee.erb +12 -14
  4. data/templates/shader_material.js.erb +13 -15
  5. metadata +42 -42
data/CHANGELOG CHANGED
@@ -1,3 +1,9 @@
1
+ * 2.0.2 *
2
+
3
+ * Fixed the shader generator, which was generating deprecated (and not working) code.
4
+
5
+
6
+
1
7
  * 2.0.1 *
2
8
 
3
9
  * Implemented missing `Jax.Geometry.Line#contains` method.
data/lib/jax/version.rb CHANGED
@@ -2,7 +2,7 @@ module Jax
2
2
  module Version
3
3
  MAJOR = 2
4
4
  MINOR = 0
5
- PATCH = 1
5
+ PATCH = 2
6
6
  BUILD = nil
7
7
  STRING = BUILD ? [MAJOR, MINOR, PATCH, BUILD].join(".") : [MAJOR, MINOR, PATCH].join(".")
8
8
  end
data/templates/shader_material.js.coffee.erb CHANGED
@@ -6,17 +6,15 @@ Jax.Material['<%=class_name%>'] = Jax.Class.create Jax.Material,
6
6
 
7
7
  $super options
8
8
 
9
- setUniforms: ($super, context, mesh, options, uniforms) ->
10
- $super context, mesh, options, uniforms
11
-
12
- uniforms.set 'mvMatrix', context.getModelViewMatrix()
13
- uniforms.set 'nMatrix', context.getNormalMatrix()
14
- uniforms.set 'pMatrix', context.getProjectionMatrix()
15
-
16
- # uniforms.texture 'Texture', this.texture, context
17
-
18
- setAttributes: ($super, context, mesh, options, attributes) ->
19
- attributes.set 'VERTEX_POSITION', mesh.getVertexBuffer()
20
- attributes.set 'VERTEX_COLOR', mesh.getColorBuffer()
21
- attributes.set 'VERTEX_NORMAL', mesh.getNormalBuffer()
22
- attributes.set 'VERTEX_TEXCOORDS', mesh.getTextureCoordsBuffer()
9
+ setVariables: (context, mesh, options, vars) ->
10
+ # vars.texture 'Texture', this.texture, context
11
+
12
+ vars.set
13
+ mvMatrix: context.getModelViewMatrix()
14
+ nMatrix: context.getNormalMatrix()
15
+ pMatrix: context.getProjectionMatrix()
16
+
17
+ VERTEX_POSITION: mesh.getVertexBuffer()
18
+ VERTEX_COLOR: mesh.getColorBuffer()
19
+ VERTEX_NORMAL: mesh.getNormalBuffer()
20
+ VERTEX_TEXCOORDS: mesh.getTextureCoordsBuffer()
data/templates/shader_material.js.erb CHANGED
@@ -9,20 +9,18 @@ Jax.Material.<%=class_name%> = Jax.Class.create(Jax.Material, {
9
9
  $super(options);
10
10
  },
11
11
 
12
- setUniforms: function($super, context, mesh, options, uniforms) {
13
- $super(context, mesh, options, uniforms);
14
-
15
- uniforms.set('mvMatrix', context.getModelViewMatrix());
16
- uniforms.set('nMatrix', context.getNormalMatrix());
17
- uniforms.set('pMatrix', context.getProjectionMatrix());
18
-
19
- // uniforms.texture('Texture', this.texture, context);
20
- },
21
-
22
- setAttributes: function($super, context, mesh, options, attributes) {
23
- attributes.set('VERTEX_POSITION', mesh.getVertexBuffer());
24
- attributes.set('VERTEX_COLOR', mesh.getColorBuffer());
25
- attributes.set('VERTEX_NORMAL', mesh.getNormalBuffer());
26
- attributes.set('VERTEX_TEXCOORDS', mesh.getTextureCoordsBuffer());
12
+ setAttributes: function(context, mesh, options, vars) {
13
+ vars.set({
14
+ mvMatrix: context.getModelViewMatrix(),
15
+ nMatrix: context.getNormalMatrix(),
16
+ pMatrix: context.getProjectionmatrix(),
17
+
18
+ VERTEX_POSITION: mesh.getVertexBuffer(),
19
+ VERTEX_COLOR: mesh.getColorBuffer(),
20
+ VERTEX_NORMAL: mesh.getNormalBuffer(),
21
+ VERTEX_TEXCOORDS: mesh.getTextureCoordsBuffer()
22
+ });
23
+
24
+ // vars.texture('Texture', this.texture, context);
27
25
  }
28
26
  });
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jax
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.1
4
+ version: 2.0.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-11-04 00:00:00.000000000Z
12
+ date: 2011-11-05 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &2153982300 !ruby/object:Gem::Requirement
16
+ requirement: &2156544720 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 3.1.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *2153982300
24
+ version_requirements: *2156544720
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: jquery-rails
27
- requirement: &2153981800 !ruby/object:Gem::Requirement
27
+ requirement: &2156541940 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 1.0.13
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *2153981800
35
+ version_requirements: *2156541940
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: jasmine
38
- requirement: &2153981180 !ruby/object:Gem::Requirement
38
+ requirement: &2156539740 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 1.0.2.0
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *2153981180
46
+ version_requirements: *2156539740
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rest-client
49
- requirement: &2153980680 !ruby/object:Gem::Requirement
49
+ requirement: &2156527740 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 1.6.3
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *2153980680
57
+ version_requirements: *2156527740
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rspec
60
- requirement: &2153980220 !ruby/object:Gem::Requirement
60
+ requirement: &2156525900 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 2.6.0
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *2153980220
68
+ version_requirements: *2156525900
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: coffee-rails
71
- requirement: &2153979740 !ruby/object:Gem::Requirement
71
+ requirement: &2156523920 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: 3.1.0
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *2153979740
79
+ version_requirements: *2156523920
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: coderay
82
- requirement: &2153979200 !ruby/object:Gem::Requirement
82
+ requirement: &2156522600 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ~>
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: 0.9.7
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *2153979200
90
+ version_requirements: *2156522600
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: sqlite3
93
- requirement: &2153978700 !ruby/object:Gem::Requirement
93
+ requirement: &2156520320 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ~>
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: 1.3.4
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *2153978700
101
+ version_requirements: *2156520320
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: sass-rails
104
- requirement: &2153978220 !ruby/object:Gem::Requirement
104
+ requirement: &2156518140 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ~>
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: 3.1.0
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *2153978220
112
+ version_requirements: *2156518140
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: uglifier
115
- requirement: &2153977740 !ruby/object:Gem::Requirement
115
+ requirement: &2156515160 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ~>
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: 1.0.2
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *2153977740
123
+ version_requirements: *2156515160
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: genspec
126
- requirement: &2153977260 !ruby/object:Gem::Requirement
126
+ requirement: &2156511120 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ~>
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: 0.2.3
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *2153977260
134
+ version_requirements: *2156511120
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: selenium-webdriver
137
- requirement: &2153976780 !ruby/object:Gem::Requirement
137
+ requirement: &2156506180 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ~>
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: 2.9.1
143
143
  type: :development
144
144
  prerelease: false
145
- version_requirements: *2153976780
145
+ version_requirements: *2156506180
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: fakeweb
148
- requirement: &2153976320 !ruby/object:Gem::Requirement
148
+ requirement: &2156494740 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ~>
@@ -153,10 +153,10 @@ dependencies:
153
153
  version: 1.3.0
154
154
  type: :development
155
155
  prerelease: false
156
- version_requirements: *2153976320
156
+ version_requirements: *2156494740
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: ansi
159
- requirement: &2153975940 !ruby/object:Gem::Requirement
159
+ requirement: &2156492580 !ruby/object:Gem::Requirement
160
160
  none: false
161
161
  requirements:
162
162
  - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
164
164
  version: '0'
165
165
  type: :development
166
166
  prerelease: false
167
- version_requirements: *2153975940
167
+ version_requirements: *2156492580
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: cucumber-rails
170
- requirement: &2153975400 !ruby/object:Gem::Requirement
170
+ requirement: &2156475000 !ruby/object:Gem::Requirement
171
171
  none: false
172
172
  requirements:
173
173
  - - ~>
@@ -175,10 +175,10 @@ dependencies:
175
175
  version: 1.0.2
176
176
  type: :development
177
177
  prerelease: false
178
- version_requirements: *2153975400
178
+ version_requirements: *2156475000
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: RedCloth
181
- requirement: &2153974840 !ruby/object:Gem::Requirement
181
+ requirement: &2156469100 !ruby/object:Gem::Requirement
182
182
  none: false
183
183
  requirements:
184
184
  - - ~>
@@ -186,10 +186,10 @@ dependencies:
186
186
  version: '4.2'
187
187
  type: :development
188
188
  prerelease: false
189
- version_requirements: *2153974840
189
+ version_requirements: *2156469100
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: w3c_validators
192
- requirement: &2153974180 !ruby/object:Gem::Requirement
192
+ requirement: &2156467100 !ruby/object:Gem::Requirement
193
193
  none: false
194
194
  requirements:
195
195
  - - ~>
@@ -197,10 +197,10 @@ dependencies:
197
197
  version: '1.2'
198
198
  type: :development
199
199
  prerelease: false
200
- version_requirements: *2153974180
200
+ version_requirements: *2156467100
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: treetop
203
- requirement: &2153973660 !ruby/object:Gem::Requirement
203
+ requirement: &2156465220 !ruby/object:Gem::Requirement
204
204
  none: false
205
205
  requirements:
206
206
  - - ~>
@@ -208,10 +208,10 @@ dependencies:
208
208
  version: 1.4.9
209
209
  type: :development
210
210
  prerelease: false
211
- version_requirements: *2153973660
211
+ version_requirements: *2156465220
212
212
  - !ruby/object:Gem::Dependency
213
213
  name: bluecloth
214
- requirement: &2153973140 !ruby/object:Gem::Requirement
214
+ requirement: &2156462360 !ruby/object:Gem::Requirement
215
215
  none: false
216
216
  requirements:
217
217
  - - ~>
@@ -219,7 +219,7 @@ dependencies:
219
219
  version: 2.0.11
220
220
  type: :development
221
221
  prerelease: false
222
- version_requirements: *2153973140
222
+ version_requirements: *2156462360
223
223
  description: ! "\n Framework for creating rich WebGL-enabled applications using
224
224
  JavaScript and Ruby.\n Can be used stand-alone to create static JavaScript documents,
225
225
  or integrated\n seamlessly with Ruby on Rails to build dynamic WebGL applications.\n
@@ -644,7 +644,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
644
644
  version: '0'
645
645
  segments:
646
646
  - 0
647
- hash: -3170321314478077500
647
+ hash: 3281468966190002051
648
648
  required_rubygems_version: !ruby/object:Gem::Requirement
649
649
  none: false
650
650
  requirements:
@@ -653,7 +653,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
653
653
  version: '0'
654
654
  segments:
655
655
  - 0
656
- hash: -3170321314478077500
656
+ hash: 3281468966190002051
657
657
  requirements: []
658
658
  rubyforge_project: jax
659
659
  rubygems_version: 1.8.10