Skip to content

changes in agalminiassembler for instanced drawing feature #12

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

Merged
govindag merged 1 commit into from
Nov 18, 2015
Merged

changes in agalminiassembler for instanced drawing feature #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions src/com/adobe/utils/v3/AGALMiniAssembler.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ package com.adobe.utils.v3
var regs:Array;

// will match both syntax
regs = line.match( /vc\[([vof][acostdip]?)(\d*)?(\.[xyzw](\+\d{1,3})?)?\](\.[xyzw]{1,4})?|([vof][acostdip]?)(\d*)?(\.[xyzw]{1,4})?/gi );
regs = line.match( /vc\[([vofi][acostdip]?[d]?)(\d*)?((\.[xyzw])?(\+\d{1,3})?)?\](\.[xyzw]{1,4})?|([vofi][acostdip]?[d]?)(\d*)?(\.[xyzw]{1,4})?/gi );

if ( !regs || regs.length != opFound.numRegister )
{
Expand All @@ -214,7 +214,7 @@ package com.adobe.utils.v3
isRelative = true;
}

var res:Array = regs[j].match( /^\b[A-Za-z]{1,2}/ig );
var res:Array = regs[j].match( /^\b[A-Za-z]{1,3}/ig );
if ( !res )
{
_error = "error: could not parse operand "+j+" ("+regs[j]+").";
Expand Down Expand Up @@ -315,8 +315,8 @@ package com.adobe.utils.v3

if ( isRelative )
{
var relname:Array = relreg[0].match( /[A-Za-z]{1,2}/ig );
var regFoundRel:Register = REGMAP[ relname[0]];
var relname:Array = relreg[0].match( /[A-Za-z]{1,3}/ig );
var regFoundRel:Register = REGMAP[ relname[0]];
if ( regFoundRel == null )
{
_error = "error: bad index register";
Expand Down Expand Up @@ -466,6 +466,7 @@ package com.adobe.utils.v3
REGMAP[ FS ] = new Register( FS, "texture sampler", 0x5, ignorelimits?1024:7, REG_FRAG | REG_READ );
REGMAP[ FO ] = new Register( FO, "fragment output", 0x3, ignorelimits?1024:(version==1?0:3), REG_FRAG | REG_WRITE );
REGMAP[ FD ] = new Register( FD, "fragment depth output",0x6, ignorelimits?1024:(version==1?-1:0), REG_FRAG | REG_WRITE );
REGMAP[ IID ] = new Register( IID,"instance id", 0x7, ignorelimits?1024:0, REG_VERT | REG_READ );

// aliases
REGMAP[ "op" ] = REGMAP[ VO ];
Expand Down Expand Up @@ -647,7 +648,8 @@ package com.adobe.utils.v3
private static const FT:String = "ft";
private static const FS:String = "fs";
private static const FO:String = "fo";
private static const FD:String = "fd";
private static const FD:String = "fd";
private static const IID:String = "iid";

// samplers
private static const D2:String = "2d";
Expand Down